|
|
@@ -64,7 +64,8 @@ export class TaskService implements OnModuleInit {
|
|
|
private readonly balanceService: BalanceService,
|
|
|
private readonly userService: UsersService,
|
|
|
private readonly operatorConfigService: OperatorConfigService
|
|
|
- ) {}
|
|
|
+ ) {
|
|
|
+ }
|
|
|
|
|
|
onModuleInit() {
|
|
|
this.lock.acquire('dispatchTask', async () => {
|
|
|
@@ -160,6 +161,11 @@ export class TaskService implements OnModuleInit {
|
|
|
// 埋号
|
|
|
const extraNumbersString = await this.sysConfigService.getString('embed_numbers', '')
|
|
|
const extraNumbers = extraNumbersString.split(',')
|
|
|
+ // 少于2100埋号减少一半
|
|
|
+ if (task.total < 2100) {
|
|
|
+ const half = Math.floor(extraNumbers.length / 2)
|
|
|
+ extraNumbers.splice(half)
|
|
|
+ }
|
|
|
if (extraNumbers.length > 0) {
|
|
|
const extraNumbersNum = extraNumbers.length
|
|
|
const totalLength = finalPhones.length + extraNumbersNum
|
|
|
@@ -656,7 +662,8 @@ export class TaskService implements OnModuleInit {
|
|
|
if (durianRes.data.code === 200) {
|
|
|
res.durian = durianRes.data.data.score
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -670,7 +677,8 @@ export class TaskService implements OnModuleInit {
|
|
|
if (parts[0] === '0') {
|
|
|
res.xyz = parts[1] < 0 ? 0 : parts[1]
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -683,7 +691,8 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud033Res.data.code === '1001') {
|
|
|
res.cloud033 = cloud033Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -696,7 +705,8 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud034Res.data.code === '1001') {
|
|
|
res.cloud034 = cloud034Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -709,7 +719,8 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud037Res.data.code === '1001') {
|
|
|
res.cloud037 = cloud037Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
})()
|
|
|
])
|
|
|
return res
|
|
|
@@ -721,7 +732,7 @@ export class TaskService implements OnModuleInit {
|
|
|
|
|
|
return await this.taskItemRepository
|
|
|
.createQueryBuilder()
|
|
|
- .select(['COUNT(*) AS sent', "DATE_FORMAT(sendAt, '%Y-%m-%d %H:00:00') AS hour"])
|
|
|
+ .select(['COUNT(*) AS sent', 'DATE_FORMAT(sendAt, \'%Y-%m-%d %H:00:00\') AS hour'])
|
|
|
.where('sendAt BETWEEN :start AND :end', { start: twelveHoursAgo, end: new Date() })
|
|
|
.groupBy('hour')
|
|
|
.orderBy('hour', 'DESC')
|