Merge branch '20251119-wyp-weCom' into test

api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/thirdpart/WeComThirdPartyRoomController.java

@@ -46,7 +46,7 @@ public class WeComThirdPartyRoomController {
     @ApiOperation(value = "保存群配置")
     @PostMapping("/saveRoomConfig")
     public CommonResponse<Void> saveRoomConfig(@RequestBody ThirdPartyRoomConfigParam param) {
-        service.saveRoomConfig(param);
+        service.saveRoomConfig(param, null);
         return CommonResponse.success();
     }
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/po/wecom/thirdpart/ThirdPartWeComRoomConfig.java

@@ -7,7 +7,7 @@ public class ThirdPartWeComRoomConfig {
 
     private Long roomId;
 
-    private Integer accountConfigId;
+    private String accountConfigId;
 
     private String putScene;
 
@@ -39,11 +39,11 @@ public class ThirdPartWeComRoomConfig {
         this.roomId = roomId;
     }
 
-    public Integer getAccountConfigId() {
+    public String getAccountConfigId() {
         return accountConfigId;
     }
 
-    public void setAccountConfigId(Integer accountConfigId) {
+    public void setAccountConfigId(String accountConfigId) {
         this.accountConfigId = accountConfigId;
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/model/po/wecom/thirdpart/ThirdPartWeComRoomConfigExample.java

@@ -256,52 +256,62 @@ public class ThirdPartWeComRoomConfigExample {
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdEqualTo(Integer value) {
+        public Criteria andAccountConfigIdEqualTo(String value) {
             addCriterion("account_config_id =", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdNotEqualTo(Integer value) {
+        public Criteria andAccountConfigIdNotEqualTo(String value) {
             addCriterion("account_config_id <>", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdGreaterThan(Integer value) {
+        public Criteria andAccountConfigIdGreaterThan(String value) {
             addCriterion("account_config_id >", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andAccountConfigIdGreaterThanOrEqualTo(String value) {
             addCriterion("account_config_id >=", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdLessThan(Integer value) {
+        public Criteria andAccountConfigIdLessThan(String value) {
             addCriterion("account_config_id <", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdLessThanOrEqualTo(Integer value) {
+        public Criteria andAccountConfigIdLessThanOrEqualTo(String value) {
             addCriterion("account_config_id <=", value, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdIn(List<Integer> values) {
+        public Criteria andAccountConfigIdLike(String value) {
+            addCriterion("account_config_id like", value, "accountConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountConfigIdNotLike(String value) {
+            addCriterion("account_config_id not like", value, "accountConfigId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountConfigIdIn(List<String> values) {
             addCriterion("account_config_id in", values, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdNotIn(List<Integer> values) {
+        public Criteria andAccountConfigIdNotIn(List<String> values) {
             addCriterion("account_config_id not in", values, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdBetween(Integer value1, Integer value2) {
+        public Criteria andAccountConfigIdBetween(String value1, String value2) {
             addCriterion("account_config_id between", value1, value2, "accountConfigId");
             return (Criteria) this;
         }
 
-        public Criteria andAccountConfigIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andAccountConfigIdNotBetween(String value1, String value2) {
             addCriterion("account_config_id not between", value1, value2, "accountConfigId");
             return (Criteria) this;
         }

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/WeComThirdPartyRoomService.java

@@ -20,7 +20,7 @@ public interface WeComThirdPartyRoomService {
 
     ThirdPartyRoomConfigVO getRoomConfig(ThirdPartyConfigGetParam param);
 
-    void saveRoomConfig(ThirdPartyRoomConfigParam param);
+    void saveRoomConfig(ThirdPartyRoomConfigParam param, String accountConfigId);
 
-    void saveRoomConfig(ThirdPartWeComRoom room, ThirdPartyAccountConfigParam param);
+    void saveRoomConfig(ThirdPartWeComRoom room, String accountConfigId, ThirdPartyAccountConfigParam param);
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyAccountServiceImpl.java

@@ -270,6 +270,7 @@ public class WeComThirdPartyAccountServiceImpl implements WeComThirdPartyAccount
         staffConfigMapper.insert(newConfig);
         for (ThirdPartyAccountConfigTaskParam taskParam : param.getTaskList()) {
             ThirdPartWeComStaffConfigTask newTask = new ThirdPartWeComStaffConfigTask();
+            newTask.setId(DistributedIdGenerator.generate());
             newTask.setConfigId(newConfig.getId());
             newTask.setSwitchFlag(taskParam.getSwitchFlag());
             newTask.setSendTime(JSONObject.toJSONString(taskParam.getSendTime()));
@@ -280,6 +281,7 @@ public class WeComThirdPartyAccountServiceImpl implements WeComThirdPartyAccount
             staffConfigTaskMapper.insert(newTask);
             for (ThirdPartyAccountConfigTaskContentParam taskContentParam : taskParam.getContentList()) {
                 ThirdPartWeComStaffConfigTaskContent newContent = new ThirdPartWeComStaffConfigTaskContent();
+                newContent.setId(DistributedIdGenerator.generate());
                 newContent.setTaskId(newTask.getId());
                 newContent.setType(taskContentParam.getType());
                 newContent.setContent(taskContentParam.getContent());
@@ -294,10 +296,10 @@ public class WeComThirdPartyAccountServiceImpl implements WeComThirdPartyAccount
 
         }
         // 配置同步
-        new Thread(() -> syncStaffConfigToRoom(param)).start();
+        new Thread(() -> syncStaffConfigToRoom(param, newConfig.getId())).start();
     }
 
-    private void syncStaffConfigToRoom(ThirdPartyAccountConfigParam param) {
+    private void syncStaffConfigToRoom(ThirdPartyAccountConfigParam param, String accountConfigId) {
         List<ThirdPartWeComRoom> roomList;
         if (param.getConfigSync() == ConfigSyncEnum.ALL.getVal()) {
             // 所有群
@@ -308,15 +310,15 @@ public class WeComThirdPartyAccountServiceImpl implements WeComThirdPartyAccount
         } else {
             roomList = new ArrayList<>();
         }
-        syncConfig(param, roomList);
+        syncConfig(param, accountConfigId, roomList);
     }
 
-    private void syncConfig(ThirdPartyAccountConfigParam param, List<ThirdPartWeComRoom> roomList) {
+    private void syncConfig(ThirdPartyAccountConfigParam param, String accountConfigId, List<ThirdPartWeComRoom> roomList) {
         if (CollectionUtils.isEmpty(roomList)) {
             return;
         }
         for (ThirdPartWeComRoom room : roomList) {
-            roomService.saveRoomConfig(room, param);
+            roomService.saveRoomConfig(room, accountConfigId, param);
         }
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyRoomServiceImpl.java

@@ -204,7 +204,7 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
     }
 
     @Override
-    public void saveRoomConfig(ThirdPartyRoomConfigParam param) {
+    public void saveRoomConfig(ThirdPartyRoomConfigParam param, String accountConfigId) {
         // check param
         checkRoomConfigParam(param);
         ThirdPartWeComRoomConfig config = getRoomConfig(param.getRoomId());
@@ -215,6 +215,7 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
         }
         ThirdPartWeComRoomConfig newConfig = new ThirdPartWeComRoomConfig();
         newConfig.setId(DistributedIdGenerator.generate());
+        newConfig.setAccountConfigId(accountConfigId);
         newConfig.setRoomId(param.getRoomId());
         newConfig.setPutScene(param.getPutScene());
         newConfig.setChannel(param.getChannel());
@@ -226,6 +227,7 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
         roomConfigMapper.insert(newConfig);
         for (ThirdPartyRoomConfigTaskParam taskParam : param.getTaskList()) {
             ThirdPartWeComRoomConfigTask newTask = new ThirdPartWeComRoomConfigTask();
+            newTask.setId(DistributedIdGenerator.generate());
             newTask.setConfigId(newConfig.getId());
             newTask.setSwitchFlag(taskParam.getSwitchFlag());
             newTask.setSendTime(JSONObject.toJSONString(taskParam.getSendTime()));
@@ -236,6 +238,7 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
             roomConfigTaskMapper.insert(newTask);
             for (ThirdPartyRoomConfigTaskContentParam taskContentParam : taskParam.getContentList()) {
                 ThirdPartWeComRoomConfigTaskContent newContent = new ThirdPartWeComRoomConfigTaskContent();
+                newContent.setId(DistributedIdGenerator.generate());
                 newContent.setTaskId(newTask.getId());
                 newContent.setType(taskContentParam.getType());
                 newContent.setContent(taskContentParam.getContent());
@@ -290,9 +293,9 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
     }
 
     @Override
-    public void saveRoomConfig(ThirdPartWeComRoom room, ThirdPartyAccountConfigParam param) {
+    public void saveRoomConfig(ThirdPartWeComRoom room, String accountConfigId, ThirdPartyAccountConfigParam param) {
         ThirdPartyRoomConfigParam roomConfigParam = buildRoomConfigParam(room, param);
-        saveRoomConfig(roomConfigParam);
+        saveRoomConfig(roomConfigParam, accountConfigId);
     }
 
     private ThirdPartyRoomConfigParam buildRoomConfigParam(ThirdPartWeComRoom room, ThirdPartyAccountConfigParam param) {
@@ -314,7 +317,7 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
             task.setRandomMin(taskParam.getRandomMin());
             task.setSeq(taskParam.getSeq());
             List<ThirdPartyRoomConfigTaskContentParam> contentList = new ArrayList<>();
-            for (ThirdPartyRoomConfigTaskContentParam taskContentParam : task.getContentList()) {
+            for (ThirdPartyAccountConfigTaskContentParam taskContentParam : taskParam.getContentList()) {
                 ThirdPartyRoomConfigTaskContentParam content = new ThirdPartyRoomConfigTaskContentParam();
                 content.setType(taskContentParam.getType());
                 content.setContent(taskContentParam.getContent());

api-module/src/main/resources/mapper/wecom/thirdpart/ThirdPartWeComRoomConfigMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoomConfig">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="room_id" jdbcType="BIGINT" property="roomId" />
-    <result column="account_config_id" jdbcType="INTEGER" property="accountConfigId" />
+    <result column="account_config_id" jdbcType="VARCHAR" property="accountConfigId" />
     <result column="put_scene" jdbcType="VARCHAR" property="putScene" />
     <result column="channel" jdbcType="VARCHAR" property="channel" />
     <result column="primary_third_staff_id" jdbcType="BIGINT" property="primaryThirdStaffId" />
@@ -113,7 +113,7 @@
       put_scene, channel, primary_third_staff_id, 
       second_third_staff_id, `status`, create_time, 
       update_time)
-    values (#{id,jdbcType=VARCHAR}, #{roomId,jdbcType=BIGINT}, #{accountConfigId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=VARCHAR}, #{roomId,jdbcType=BIGINT}, #{accountConfigId,jdbcType=VARCHAR}, 
       #{putScene,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{primaryThirdStaffId,jdbcType=BIGINT}, 
       #{secondThirdStaffId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
@@ -160,7 +160,7 @@
         #{roomId,jdbcType=BIGINT},
       </if>
       <if test="accountConfigId != null">
-        #{accountConfigId,jdbcType=INTEGER},
+        #{accountConfigId,jdbcType=VARCHAR},
       </if>
       <if test="putScene != null">
         #{putScene,jdbcType=VARCHAR},
@@ -201,7 +201,7 @@
         room_id = #{record.roomId,jdbcType=BIGINT},
       </if>
       <if test="record.accountConfigId != null">
-        account_config_id = #{record.accountConfigId,jdbcType=INTEGER},
+        account_config_id = #{record.accountConfigId,jdbcType=VARCHAR},
       </if>
       <if test="record.putScene != null">
         put_scene = #{record.putScene,jdbcType=VARCHAR},
@@ -233,7 +233,7 @@
     update third_part_we_com_room_config
     set id = #{record.id,jdbcType=VARCHAR},
       room_id = #{record.roomId,jdbcType=BIGINT},
-      account_config_id = #{record.accountConfigId,jdbcType=INTEGER},
+      account_config_id = #{record.accountConfigId,jdbcType=VARCHAR},
       put_scene = #{record.putScene,jdbcType=VARCHAR},
       channel = #{record.channel,jdbcType=VARCHAR},
       primary_third_staff_id = #{record.primaryThirdStaffId,jdbcType=BIGINT},
@@ -252,7 +252,7 @@
         room_id = #{roomId,jdbcType=BIGINT},
       </if>
       <if test="accountConfigId != null">
-        account_config_id = #{accountConfigId,jdbcType=INTEGER},
+        account_config_id = #{accountConfigId,jdbcType=VARCHAR},
       </if>
       <if test="putScene != null">
         put_scene = #{putScene,jdbcType=VARCHAR},
@@ -281,7 +281,7 @@
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoomConfig">
     update third_part_we_com_room_config
     set room_id = #{roomId,jdbcType=BIGINT},
-      account_config_id = #{accountConfigId,jdbcType=INTEGER},
+      account_config_id = #{accountConfigId,jdbcType=VARCHAR},
       put_scene = #{putScene,jdbcType=VARCHAR},
       channel = #{channel,jdbcType=VARCHAR},
       primary_third_staff_id = #{primaryThirdStaffId,jdbcType=BIGINT},

api-module/src/main/resources/mapper/wecom/thirdpart/ext/ThirdPartWeComRoomMapperExt.xml

@@ -8,19 +8,18 @@
         join third_part_we_com_staff staff on room.staff_id = staff.id
         join third_part_we_com_corp corp on staff.corp_id = corp.id
         left join third_part_we_com_room_config room_config on room.id = room_config.room_id and room_config.status = 1
-        <where>
-            <trim prefixOverrides="and">
-                <if test="param.corpName != null">
-                    and corp.name = #{param.corpName}
-                </if>
-                <if test="param.groupLeaderName != null">
-                    and staff.name = #{param.groupLeaderName}
-                </if>
-                <if test="param.pushAccountName != null">
-                    and (room_config.primary_push_account_id = #{pushAccountId} or room_config.secondary_push_account_id = #{pushAccountId})
-                </if>
-            </trim>
-        </where>
+        where room.is_deleted = 0
+        <trim prefixOverrides="and">
+            <if test="param.corpName != null">
+                and corp.name = #{param.corpName}
+            </if>
+            <if test="param.groupLeaderName != null">
+                and staff.name = #{param.groupLeaderName}
+            </if>
+            <if test="param.pushAccountName != null">
+                and (room_config.primary_push_account_id = #{pushAccountId} or room_config.secondary_push_account_id = #{pushAccountId})
+            </if>
+        </trim>
     </select>
 
     <select id="getRoomList"
@@ -30,19 +29,19 @@
         join third_part_we_com_staff staff on room.staff_id = staff.id
         join third_part_we_com_corp corp on staff.corp_id = corp.id
         left join third_part_we_com_room_config room_config on room.id = room_config.room_id and room_config.status = 1
-        <where>
-            <trim prefixOverrides="and">
-                <if test="param.corpName != null">
-                    and corp.name = #{param.corpName}
-                </if>
-                <if test="param.groupLeaderName!= null">
-                    and staff.name = #{param.groupLeaderName}
-                </if>
-                <if test="param.pushAccountName != null">
-                    and (room_config.primary_push_account_id = #{pushAccountId} or room_config.secondary_push_account_id = #{pushAccountId})
-                </if>
-            </trim>
-        </where>
+        where room.is_deleted = 0
+        <trim prefixOverrides="and">
+            <if test="param.corpName != null">
+                and corp.name = #{param.corpName}
+            </if>
+            <if test="param.groupLeaderName!= null">
+                and staff.name = #{param.groupLeaderName}
+            </if>
+            <if test="param.pushAccountName != null">
+                and (room_config.primary_push_account_id = #{pushAccountId} or room_config.secondary_push_account_id =
+                #{pushAccountId})
+            </if>
+        </trim>
         order by staff.id desc
         limit #{offset}, #{pageSize}
     </select>

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

@@ -53,10 +53,10 @@
 <!--        <table tableName="third_part_we_com_corp" domainObjectName="ThirdPartWeComCorp" alias=""/>-->
 <!--        <table tableName="third_part_we_com_room" domainObjectName="ThirdPartWeComRoom" alias=""/>-->
 <!--        <table tableName="third_part_we_com_room_user" domainObjectName="ThirdPartWeComRoomUser" alias=""/>-->
-<!--        <table tableName="third_part_we_com_room_config" domainObjectName="ThirdPartWeComRoomConfig" alias=""/>-->
+        <table tableName="third_part_we_com_room_config" domainObjectName="ThirdPartWeComRoomConfig" alias=""/>
 <!--        <table tableName="third_part_we_com_room_config_task" domainObjectName="ThirdPartWeComRoomConfigTask" alias=""/>-->
 <!--        <table tableName="third_part_we_com_room_config_task_content" domainObjectName="ThirdPartWeComRoomConfigTaskContent" alias=""/>-->
-        <table tableName="third_part_we_com_staff" domainObjectName="ThirdPartWeComStaff" alias=""/>
+<!--        <table tableName="third_part_we_com_staff" domainObjectName="ThirdPartWeComStaff" alias=""/>-->
 <!--        <table tableName="third_part_we_com_staff_user" domainObjectName="ThirdPartWeComStaffUser" alias=""/>-->
 <!--        <table tableName="third_part_we_com_staff_config" domainObjectName="ThirdPartWeComStaffConfig" alias=""/>-->
 <!--        <table tableName="third_part_we_com_staff_config_task" domainObjectName="ThirdPartWeComStaffConfigTask" alias=""/>-->