Merge branch 'master' into 20250905-wyp-contentPlatformGzhPush

# Conflicts:
#	api-module/src/main/java/com/tzld/piaoquan/api/dao/generator/MybatisGeneratorMain.java

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/SecretEnum.java

@@ -18,7 +18,8 @@ public enum SecretEnum {
     SECRET_ENUM_10("57a1c09a209445fc83a5fba81b0194bc", "博虎", "bh"),
     SECRET_ENUM_11("232bab5faeb54acfbbcef3dc693c4639", "守望", "sw"),
     SECRET_ENUM_12("41512383ac8543239dc539306f72b8bc", "令视", "ls"),
-    SECRET_ENUM_13("17fe375058184fdcb2aed35678aeb4d4", "杭州奇风", "hzqf");
+    SECRET_ENUM_13("17fe375058184fdcb2aed35678aeb4d4", "杭州奇风", "hzqf"),
+    SECRET_ENUM_14("d8694855dec94945acb8b2b08ffe72d4", "云誉高质", "yygz");
 
 
     SecretEnum(String secret, String desc, String channel) {

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComUserDetailJob.java

@@ -197,7 +197,7 @@ public class WeComUserDetailJob {
                 roomDetail.setMemberCount(roomInfo.getTotal());
                 roomDetail.setName(roomInfo.getNickname());
                 roomDetail.setAddUserStatus(0);
-                roomDetail.setSendStatus(1);
+                roomDetail.setSendStatus(0);
                 roomDetail.setCreateTime(new Date());
                 roomDetail.setUpdateTime(new Date());
                 roomMapper.insertSelective(roomDetail);

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

@@ -63,7 +63,7 @@
 <!--        <table tableName="we_com_moment_send_message" domainObjectName="MomentSendMessage" alias=""/>-->
 <!--        <table tableName="we_com_staff_with_user" domainObjectName="StaffWithUser" alias=""/>-->
 <!--        <table tableName="we_com_corp_statistics_total" domainObjectName="CorpStatisticsTotal" alias=""/>-->
-<!--        <table tableName="we_com_staff_statistics_total" domainObjectName="StaffStatisticsTotal" alias=""/>-->
+        <table tableName="we_com_staff_statistics_total" domainObjectName="StaffStatisticsTotal" alias=""/>
         <table tableName="we_com_staff_group_statistics_total" domainObjectName="StaffGroupStatisticsTotal" alias=""/>
 
 

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

@@ -11,6 +11,8 @@ public class StaffGroupStatisticsTotal {
 
     private Long staffId;
 
+    private String userId;
+
     private Long statTime;
 
     private Integer newChatCnt;
@@ -65,6 +67,14 @@ public class StaffGroupStatisticsTotal {
         this.staffId = staffId;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public Long getStatTime() {
         return statTime;
     }
@@ -163,6 +173,7 @@ public class StaffGroupStatisticsTotal {
         sb.append(", date=").append(date);
         sb.append(", corpId=").append(corpId);
         sb.append(", staffId=").append(staffId);
+        sb.append(", userId=").append(userId);
         sb.append(", statTime=").append(statTime);
         sb.append(", newChatCnt=").append(newChatCnt);
         sb.append(", chatTotal=").append(chatTotal);

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

@@ -366,6 +366,76 @@ public class StaffGroupStatisticsTotalExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andStatTimeIsNull() {
             addCriterion("stat_time is null");
             return (Criteria) this;

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

@@ -11,6 +11,8 @@ public class StaffStatisticsTotal {
 
     private Long staffId;
 
+    private String userId;
+
     private Long statTime;
 
     private Integer chatCnt;
@@ -59,6 +61,14 @@ public class StaffStatisticsTotal {
         this.staffId = staffId;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public Long getStatTime() {
         return statTime;
     }
@@ -133,6 +143,7 @@ public class StaffStatisticsTotal {
         sb.append(", date=").append(date);
         sb.append(", corpId=").append(corpId);
         sb.append(", staffId=").append(staffId);
+        sb.append(", userId=").append(userId);
         sb.append(", statTime=").append(statTime);
         sb.append(", chatCnt=").append(chatCnt);
         sb.append(", messageCnt=").append(messageCnt);

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

@@ -366,6 +366,76 @@ public class StaffStatisticsTotalExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andStatTimeIsNull() {
             addCriterion("stat_time is null");
             return (Criteria) this;

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

@@ -6,6 +6,7 @@
     <result column="date" jdbcType="VARCHAR" property="date" />
     <result column="corp_id" jdbcType="BIGINT" property="corpId" />
     <result column="staff_id" jdbcType="BIGINT" property="staffId" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
     <result column="stat_time" jdbcType="BIGINT" property="statTime" />
     <result column="new_chat_cnt" jdbcType="INTEGER" property="newChatCnt" />
     <result column="chat_total" jdbcType="INTEGER" property="chatTotal" />
@@ -77,7 +78,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `date`, corp_id, staff_id, stat_time, new_chat_cnt, chat_total, chat_has_msg, 
+    id, `date`, corp_id, staff_id, user_id, stat_time, new_chat_cnt, chat_total, chat_has_msg, 
     new_member_cnt, member_total, member_has_msg, msg_total, migrate_trainee_chat_cnt, 
     create_time, update_time
   </sql>
@@ -116,17 +117,17 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffGroupStatisticsTotal">
     insert into we_com_staff_group_statistics_total (id, `date`, corp_id, 
-      staff_id, stat_time, new_chat_cnt, 
-      chat_total, chat_has_msg, new_member_cnt, 
-      member_total, member_has_msg, msg_total, 
-      migrate_trainee_chat_cnt, create_time, update_time
-      )
+      staff_id, user_id, stat_time, 
+      new_chat_cnt, chat_total, chat_has_msg, 
+      new_member_cnt, member_total, member_has_msg, 
+      msg_total, migrate_trainee_chat_cnt, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{date,jdbcType=VARCHAR}, #{corpId,jdbcType=BIGINT}, 
-      #{staffId,jdbcType=BIGINT}, #{statTime,jdbcType=BIGINT}, #{newChatCnt,jdbcType=INTEGER}, 
-      #{chatTotal,jdbcType=INTEGER}, #{chatHasMsg,jdbcType=INTEGER}, #{newMemberCnt,jdbcType=INTEGER}, 
-      #{memberTotal,jdbcType=INTEGER}, #{memberHasMsg,jdbcType=INTEGER}, #{msgTotal,jdbcType=INTEGER}, 
-      #{migrateTraineeChatCnt,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{staffId,jdbcType=BIGINT}, #{userId,jdbcType=VARCHAR}, #{statTime,jdbcType=BIGINT}, 
+      #{newChatCnt,jdbcType=INTEGER}, #{chatTotal,jdbcType=INTEGER}, #{chatHasMsg,jdbcType=INTEGER}, 
+      #{newMemberCnt,jdbcType=INTEGER}, #{memberTotal,jdbcType=INTEGER}, #{memberHasMsg,jdbcType=INTEGER}, 
+      #{msgTotal,jdbcType=INTEGER}, #{migrateTraineeChatCnt,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffGroupStatisticsTotal">
     insert into we_com_staff_group_statistics_total
@@ -143,6 +144,9 @@
       <if test="staffId != null">
         staff_id,
       </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="statTime != null">
         stat_time,
       </if>
@@ -190,6 +194,9 @@
       <if test="staffId != null">
         #{staffId,jdbcType=BIGINT},
       </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="statTime != null">
         #{statTime,jdbcType=BIGINT},
       </if>
@@ -246,6 +253,9 @@
       <if test="record.staffId != null">
         staff_id = #{record.staffId,jdbcType=BIGINT},
       </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
       <if test="record.statTime != null">
         stat_time = #{record.statTime,jdbcType=BIGINT},
       </if>
@@ -290,6 +300,7 @@
       `date` = #{record.date,jdbcType=VARCHAR},
       corp_id = #{record.corpId,jdbcType=BIGINT},
       staff_id = #{record.staffId,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=VARCHAR},
       stat_time = #{record.statTime,jdbcType=BIGINT},
       new_chat_cnt = #{record.newChatCnt,jdbcType=INTEGER},
       chat_total = #{record.chatTotal,jdbcType=INTEGER},
@@ -317,6 +328,9 @@
       <if test="staffId != null">
         staff_id = #{staffId,jdbcType=BIGINT},
       </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="statTime != null">
         stat_time = #{statTime,jdbcType=BIGINT},
       </if>
@@ -358,6 +372,7 @@
     set `date` = #{date,jdbcType=VARCHAR},
       corp_id = #{corpId,jdbcType=BIGINT},
       staff_id = #{staffId,jdbcType=BIGINT},
+      user_id = #{userId,jdbcType=VARCHAR},
       stat_time = #{statTime,jdbcType=BIGINT},
       new_chat_cnt = #{newChatCnt,jdbcType=INTEGER},
       chat_total = #{chatTotal,jdbcType=INTEGER},

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

@@ -6,6 +6,7 @@
     <result column="date" jdbcType="VARCHAR" property="date" />
     <result column="corp_id" jdbcType="BIGINT" property="corpId" />
     <result column="staff_id" jdbcType="BIGINT" property="staffId" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
     <result column="stat_time" jdbcType="BIGINT" property="statTime" />
     <result column="chat_cnt" jdbcType="INTEGER" property="chatCnt" />
     <result column="message_cnt" jdbcType="INTEGER" property="messageCnt" />
@@ -74,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `date`, corp_id, staff_id, stat_time, chat_cnt, message_cnt, negative_feedback_cnt, 
+    id, `date`, corp_id, staff_id, user_id, stat_time, chat_cnt, message_cnt, negative_feedback_cnt, 
     new_apply_cnt, new_contact_cnt, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffStatisticsTotalExample" resultMap="BaseResultMap">
@@ -112,15 +113,15 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffStatisticsTotal">
     insert into we_com_staff_statistics_total (id, `date`, corp_id, 
-      staff_id, stat_time, chat_cnt, 
-      message_cnt, negative_feedback_cnt, new_apply_cnt, 
-      new_contact_cnt, create_time, update_time
-      )
+      staff_id, user_id, stat_time, 
+      chat_cnt, message_cnt, negative_feedback_cnt, 
+      new_apply_cnt, new_contact_cnt, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{date,jdbcType=VARCHAR}, #{corpId,jdbcType=BIGINT}, 
-      #{staffId,jdbcType=BIGINT}, #{statTime,jdbcType=BIGINT}, #{chatCnt,jdbcType=INTEGER}, 
-      #{messageCnt,jdbcType=INTEGER}, #{negativeFeedbackCnt,jdbcType=INTEGER}, #{newApplyCnt,jdbcType=INTEGER}, 
-      #{newContactCnt,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{staffId,jdbcType=BIGINT}, #{userId,jdbcType=VARCHAR}, #{statTime,jdbcType=BIGINT}, 
+      #{chatCnt,jdbcType=INTEGER}, #{messageCnt,jdbcType=INTEGER}, #{negativeFeedbackCnt,jdbcType=INTEGER}, 
+      #{newApplyCnt,jdbcType=INTEGER}, #{newContactCnt,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffStatisticsTotal">
     insert into we_com_staff_statistics_total
@@ -137,6 +138,9 @@
       <if test="staffId != null">
         staff_id,
       </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="statTime != null">
         stat_time,
       </if>
@@ -175,6 +179,9 @@
       <if test="staffId != null">
         #{staffId,jdbcType=BIGINT},
       </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="statTime != null">
         #{statTime,jdbcType=BIGINT},
       </if>
@@ -222,6 +229,9 @@
       <if test="record.staffId != null">
         staff_id = #{record.staffId,jdbcType=BIGINT},
       </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
       <if test="record.statTime != null">
         stat_time = #{record.statTime,jdbcType=BIGINT},
       </if>
@@ -257,6 +267,7 @@
       `date` = #{record.date,jdbcType=VARCHAR},
       corp_id = #{record.corpId,jdbcType=BIGINT},
       staff_id = #{record.staffId,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=VARCHAR},
       stat_time = #{record.statTime,jdbcType=BIGINT},
       chat_cnt = #{record.chatCnt,jdbcType=INTEGER},
       message_cnt = #{record.messageCnt,jdbcType=INTEGER},
@@ -281,6 +292,9 @@
       <if test="staffId != null">
         staff_id = #{staffId,jdbcType=BIGINT},
       </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="statTime != null">
         stat_time = #{statTime,jdbcType=BIGINT},
       </if>
@@ -313,6 +327,7 @@
     set `date` = #{date,jdbcType=VARCHAR},
       corp_id = #{corpId,jdbcType=BIGINT},
       staff_id = #{staffId,jdbcType=BIGINT},
+      user_id = #{userId,jdbcType=VARCHAR},
       stat_time = #{statTime,jdbcType=BIGINT},
       chat_cnt = #{chatCnt,jdbcType=INTEGER},
       message_cnt = #{messageCnt,jdbcType=INTEGER},

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

@@ -225,6 +225,7 @@ public class WeComStaffDataJob {
                     statisticsTotal.setDate(date);
                     statisticsTotal.setCorpId(corpId);
                     statisticsTotal.setStaffId(staff.getId());
+                    statisticsTotal.setUserId(staff.getCarrierId());
                     staffStatisticsTotalMapper.insertSelective(statisticsTotal);
                 }
             }
@@ -277,6 +278,7 @@ public class WeComStaffDataJob {
                     statisticsTotal.setDate(date);
                     statisticsTotal.setCorpId(corpId);
                     statisticsTotal.setStaffId(staff.getId());
+                    statisticsTotal.setUserId(staff.getCarrierId());
                     staffGroupStatisticsTotalMapper.insertSelective(statisticsTotal);
                 }
             }