Merge remote-tracking branch 'origin/master' into 2.0

# Conflicts: # fw-valhalla-server/src/main/resources/application.yml

Merge remote-tracking branch 'origin/master' into 2.0
# Conflicts: # fw-valhalla-server/src/main/resources/application.yml
张志伟
2 parents 9de0e2d7 bfc3047a
Showing 7 changed files with 113 additions and 4 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-sdk/pom.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/CustomerDistributedMQ.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/CustAfterDistProducer.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
pom.xml
@@ -211,7 +211,8 @@
                 </foreach>
             </if>
             <if test="condition.userId !=null">
-                and t1.follow_user = #{condition.userId}
+                and (t1.follow_user = #{condition.userId}
+                or t1.finish_user = #{condition.userId})
             </if>
             and DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND
             DATE(from_unixtime(#{condition.endTime}))
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-valhalla-sdk</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
     <packaging>jar</packaging>
     <name>fw-valhalla-sdk</name>
  
+package cn.fw.valhalla.sdk.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.lang.Nullable;
+
+import java.util.ArrayDeque;
+import java.util.Date;
+
+/**
+ * 档案分配后的mq通知
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : CustomerDistributedMQ
+ * @description : 档案分配后的mq通知
+ * @date : 2023-03-15 15:39
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CustomerDistributedMQ {
+    public final static String TOPIC = "valhalla_customer_distribute";
+    /**
+     * 被分配的服务顾问id
+     */
+    private ArrayDeque<Long> staffIds;
+    /**
+     * 分配时间
+     */
+    private Date distributeTime;
+    /**
+     * 离职分配
+     * <p>为false的时候为管理者主动分配</p>
+     */
+    private boolean resign;
+
+    /**
+     * 获取第一个staff
+     *
+     * @return
+     */
+    @Nullable
+    public Long getStaffId() {
+        return staffIds.pollFirst();
+    }
+
+    /**
+     * 获取最后一个staff
+     *
+     * @return
+     */
+    @Nullable
+    public Long getLastStaffId() {
+        return staffIds.pollFirst();
+    }
+
+}
+package cn.fw.valhalla.component
+
+import cn.fw.valhalla.sdk.result.CustomerDistributedMQ
+import org.apache.rocketmq.spring.core.RocketMQTemplate
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import org.springframework.web.bind.annotation.RequestMapping
+import java.util.*
+
+/**
+ * 保有客分配后的mq生产者
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : CustAfterDistProducer
+ * @description : 保有客分配后的mq生产者
+ * @date : 2023-03-15 15:37
+ */
+@Component
+class CustAfterDistProducer(private val rocketMQTemplate: RocketMQTemplate) {
+    private val log: Logger = LoggerFactory.getLogger(CustAfterDistProducer::class.java)
+
+    @RequestMapping(value = ["send"])
+    fun send(resign: Boolean, staffIds: List<Long>?) {
+        log.info("发送保有客分配结束mq消息。staffIds:{}", staffIds)
+        try {
+            when {
+                staffIds.isNullOrEmpty() -> return
+                else -> {
+                    val distributedMQ = CustomerDistributedMQ(ArrayDeque(staffIds), Date(), resign)
+                    rocketMQTemplate.syncSend(CustomerDistributedMQ.TOPIC + ":*", distributedMQ)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("发送保有客分配结束mq消息失败！", e)
+        }
+    }
+}
@@ -9,6 +9,7 @@ import cn.fw.hermes.sdk.api.ImSendMessage;
 import cn.fw.hermes.sdk.api.para.MsgParamCondition;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.DateUtil;
+import cn.fw.valhalla.component.CustAfterDistProducer;
 import cn.fw.valhalla.domain.db.LeaveNeedDo;
 import cn.fw.valhalla.domain.db.customer.Customer;
 import cn.fw.valhalla.domain.db.follow.ClueTask;
@@ -73,6 +74,7 @@ public class LeaveNeedDoBizService {
     private final StammkundePoolService stammkundePoolService;
     private final FollowClueService followClueService;
     private final ClueTaskService clueTaskService;
+    private final CustAfterDistProducer custAfterDistProducer;
  
     /**
      * Redis工具
@@ -172,6 +174,7 @@ public class LeaveNeedDoBizService {
             doAllocation(dto, key);
             //完成分配发送消息提醒等
             finish(user, dto.getId(), key);
+            custAfterDistProducer.send(Boolean.TRUE, Collections.singletonList(dto.getAdviserId()));
         } finally {
             clearKey(key);
         }
@@ -280,6 +283,9 @@ public class LeaveNeedDoBizService {
             return;
         }
         try {
+            List<Long> longList = dto.getBeAssignedList().stream().map(DistributableDTO.BeAssignedDTO::getUserId).collect(Collectors.toList());
+            custAfterDistProducer.send(Boolean.FALSE, longList);
+
             String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), size);
             final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配",
                     "保有客分配", null, dto.getAdviserId()).build();
@@ -83,7 +83,7 @@ class FollowApiBizService(
             followTypeEnum.value
         )
         val dtoList = clueTaskService.queryShouldBeCompleted(search)
-        return dtoList.map {
+        val resultList = dtoList.map {
             ShouldBeCompletedResult(
                 it.vin,
                 it.userId,
@@ -92,6 +92,10 @@ class FollowApiBizService(
                 it.state
             )
         }
+        if (Objects.nonNull(query.userId)) {
+            return resultList.filter { it.userId == query.userId }
+        }
+        return resultList
     }
  
     fun queryAccidentFollowerByPlate(plateNo: String, groupId: Long): ClueTask? {
@@ -123,7 +123,7 @@
             <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.6</version>
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>