feat(*): bug修复

- bug修复

feat(*): bug修复
- bug修复
张志伟
1 parent 9ee03e07
Showing 5 changed files with 80 additions and 2 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/CustomerInitClueMapper.kt
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallHistoryTask.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/ipt/CustomerInitClueBizService.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/CustomerInitClueService.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/CustomerInitClueServiceImpl.kt
@@ -2,6 +2,8 @@ package cn.fw.valhalla.dao.mapper
  
 import cn.fw.valhalla.domain.db.ipt.CustomerInitClue
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Param
+import org.apache.ibatis.annotations.Select
 import org.springframework.stereotype.Repository
  
 /**
@@ -13,4 +15,12 @@ import org.springframework.stereotype.Repository
  * @date : 2024-03-27 17:01
  */
 @Repository
-interface CustomerInitClueMapper : BaseMapper<CustomerInitClue>
 \ No newline at end of file
+interface CustomerInitClueMapper : BaseMapper<CustomerInitClue> {
+    @Select(
+        "SELECT t1.id FROM customer_init_clue t1" +
+                " inner join customer t2 on t1.vin = t2.frame_no " +
+                " where t2.group_id=#{groupId}" +
+                " and t1.yn=1 and t2.yn=1"
+    )
+    fun queryTransferredCustomer(@Param("groupId") groupId: Long): List<Long>
+}
 \ No newline at end of file
@@ -106,4 +106,15 @@ class CallHistoryTask(
             }
         }
     }
+
+
+    @Scheduled(initialDelay = 1000 * 30, fixedRate = 1000 * 60 * 5)
+    fun cacheTransferInitClue() {
+        customerInitClueBizService.queryTransferredCustomer()
+    }
+
+    @Scheduled(initialDelay = 1000 * 30, fixedRate = 1000 * 60)
+    fun dealTransferInitClue() {
+        customerInitClueBizService.dealClue()
+    }
 }
 \ No newline at end of file
@@ -15,6 +15,9 @@ import cn.fw.valhalla.rpc.pstn.PstnRpcService
 import cn.fw.valhalla.service.data.CustomerInitClueCallLogService
 import cn.fw.valhalla.service.data.CustomerInitClueService
 import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
+import kotlinx.coroutines.*
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.redis.core.StringRedisTemplate
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.util.*
@@ -34,7 +37,10 @@ class CustomerInitClueBizService(
     private val customerInitClueCallLogService: CustomerInitClueCallLogService,
     private val oopService: OopService,
     private val memberRpcService: MemberRpcService,
-    private val pstnRpcService: PstnRpcService
+    private val pstnRpcService: PstnRpcService,
+    private val stringRedisTemplate: StringRedisTemplate,
+    @Value("\${spring.cache.custom.global-prefix}:init-clue:transferred")
+    private val initTransferredKey: String
 ) {
     /**
      * 查询池子数据
@@ -135,6 +141,45 @@ class CustomerInitClueBizService(
             customerInitClueCallLogService.updateById(callLog.copy(recording = it))
         }
     }
+
+    /**
+     * 缓存已转移线索id
+     */
+    fun queryTransferredCustomer() {
+        val groupIds = oopService.allGroup()
+        if (groupIds.isNullOrEmpty()) {
+            return
+        }
+        groupIds.forEach {
+            CoroutineScope(Dispatchers.IO).launch {
+                val clueIds = customerInitClueService.queryTransferredCustomer(it.id)
+                if (clueIds.isNotEmpty()) {
+                    val key = "$initTransferredKey:${it.id}"
+                    stringRedisTemplate.opsForSet().add(key, *clueIds.map { c -> c.toString() }.toTypedArray())
+                }
+            }
+        }
+    }
+
+    fun dealClue() {
+        val groupIds = oopService.allGroup()
+        if (groupIds.isNullOrEmpty()) {
+            return
+        }
+        groupIds.forEach {
+            CoroutineScope(Dispatchers.IO).launch {
+                val key = "$initTransferredKey:${it.id}"
+                val idList = mutableSetOf<Long>()
+                val idStr = stringRedisTemplate.opsForSet().pop(key)
+                while (idStr != null) {
+                    idList.add(idStr.toLong())
+                }
+                if (idList.isNotEmpty()) {
+                    customerInitClueService.removeByIds(idList)
+                }
+            }
+        }
+    }
 }
  
  
@@ -12,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService
  * @date : 2024-03-27 17:03
  */
 interface CustomerInitClueService : IService<CustomerInitClue> {
+    /**
+     * 查询已转移线索
+     */
+    fun queryTransferredCustomer(groupId: Long?): List<Long>
 }
 \ No newline at end of file
@@ -16,4 +16,12 @@ import org.springframework.stereotype.Service
  */
 @Service
 class CustomerInitClueServiceImpl : ServiceImpl<CustomerInitClueMapper, CustomerInitClue>(), CustomerInitClueService {
+    /**
+     * 查询已转移线索
+     */
+    override fun queryTransferredCustomer(groupId: Long?): List<Long> {
+        return groupId?.let {
+            baseMapper.queryTransferredCustomer(groupId)
+        } ?: listOf()
+    }
 }
 \ No newline at end of file