Merge remote-tracking branch 'origin/test'

张志伟
2 parents 0431dda5 416b3fb9
Showing 5 changed files with 26 additions and 16 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/ipt/CustomerInitClue.kt
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/ipt/CustomerInitClueCallLog.kt
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/ipt/CustomerInitClueVO.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
 package cn.fw.valhalla.domain.db.ipt
  
 import cn.fw.common.annotation.NoArg
-import cn.fw.common.data.entity.BaseAuditableTimeEntity
+import com.baomidou.mybatisplus.annotation.*
+import com.baomidou.mybatisplus.extension.activerecord.Model
 import java.time.LocalDate
 import java.time.LocalDateTime
  
@@ -15,6 +16,8 @@ import java.time.LocalDateTime
  */
 @NoArg
 data class CustomerInitClue(
+    @TableId(type = IdType.AUTO)
+    val id: Long? = null,
     val plateNo: String?,
     val vin: String,
     val brandName: String?,
@@ -33,4 +36,8 @@ data class CustomerInitClue(
     val shopId: Long,
     val groupId: Long,
     val yn: Boolean,
-) : BaseAuditableTimeEntity<CustomerInitClue, Long>()
 \ No newline at end of file
+    @TableField(insertStrategy = FieldStrategy.NOT_NULL, fill = FieldFill.INSERT)
+    val createTime: LocalDateTime? = null,
+    @TableField(updateStrategy = FieldStrategy.NOT_NULL, fill = FieldFill.INSERT_UPDATE)
+    val updateTime: LocalDateTime? = null
+) : Model<CustomerInitClue>()
 \ No newline at end of file
 package cn.fw.valhalla.domain.db.ipt
  
 import cn.fw.common.annotation.NoArg
-import cn.fw.common.data.entity.BaseEntity
+import com.baomidou.mybatisplus.annotation.IdType
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.extension.activerecord.Model
 import java.time.LocalDateTime
  
 /**
@@ -14,9 +16,11 @@ import java.time.LocalDateTime
  */
 @NoArg
 data class CustomerInitClueCallLog(
+    @TableId(type = IdType.AUTO)
+    val id: Long? = null,
     val clueId: Long,
     val callId: String,
     val talkTime: Int,
     val recording: String?,
     val uploadTime: LocalDateTime,
-) : BaseEntity<CustomerInitClueCallLog, Long>()
+) : Model<CustomerInitClueCallLog>()
@@ -3,7 +3,6 @@ package cn.fw.valhalla.domain.vo.ipt
 import cn.fw.common.annotation.NoArg
 import java.time.LocalDate
 import java.time.LocalDateTime
-import java.util.*
  
 /**
  * 期初档案数据
@@ -58,5 +57,5 @@ data class CustomerInitClueVO(
     /** 集团id */
     val groupId: Long,
     /** 导入时间 */
-    val createTime: Date
+    val createTime: LocalDateTime?
 )
@@ -43,15 +43,13 @@ class CallHistoryTask(
     /**
      * 持久化通话记录
      */
-    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 15)
+    @Scheduled(cron = "0/10 * * * * ?")
     fun dealCallHistory() {
         val listOps = stringRedisTemplate.boundListOps(callReportKey)
         val dataList = mutableListOf<String>()
         for (i in 0..2000) {
-            val dataStr = listOps.leftPop()
-            dataStr?.let {
-                dataList.add(dataStr)
-            }
+            val dataStr = listOps.leftPop() ?: break
+            dataList.add(dataStr)
         }
         val mapper = jacksonObjectMapper()
         CoroutineScope(Dispatchers.IO).launch {
@@ -88,7 +86,7 @@ class CallHistoryTask(
     /**
      * 拉取化通话录音
      */
-    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 30)
+    @Scheduled(cron = "0/15 * * * * ?")
     fun dealCallRecordings() {
         val list = customerInitClueCallLogService.list(
             KtQueryWrapper(CustomerInitClueCallLog::class.java)
@@ -2,6 +2,7 @@ package cn.fw.valhalla.service.bus.ipt
  
 import cn.fw.common.data.mybatis.pagination.PageData
 import cn.fw.common.page.AppPage
+import cn.fw.common.util.logInfo
 import cn.fw.valhalla.domain.db.ipt.CustomerInitClue
 import cn.fw.valhalla.domain.db.ipt.CustomerInitClueCallLog
 import cn.fw.valhalla.domain.dto.CallReportDTO
@@ -76,7 +77,7 @@ class CustomerInitClueBizService(
                 .orderByAsc(CustomerInitClueCallLog::uploadTime)
         )?.map {
             InitClueCallLogVO(
-                id = it.id,
+                id = it?.id ?: -1,
                 clueId = it.clueId,
                 callId = it.callId,
                 talkTime = it.talkTime,
@@ -109,9 +110,10 @@ class CustomerInitClueBizService(
                     .eq(CustomerInitClue::senderMobile, dto.peerNo)
             }
         )
-        return list?.mapNotNull {
+        return list?.map {
+            logInfo(it.toString())
             CustomerInitClueCallLog(
-                clueId = it.id,
+                clueId = it.id ?: -1,
                 callId = dto.callId,
                 talkTime = dto.talkTime,
                 recording = null,
@@ -138,7 +140,7 @@ class CustomerInitClueBizService(
 fun CustomerInitClue.toCustomerInitClueVO(fn: Function<Long, String>): CustomerInitClueVO {
     val shopName = fn.apply(this.shopId)
     return CustomerInitClueVO(
-        id = this.id,
+        id = this.id ?: -1,
         plateNo = this.plateNo,
         vin = this.vin,
         brandName = this.brandName,