代码优化
This commit is contained in:
@@ -35,10 +35,10 @@ class BaseController extends Api
|
||||
$device = Cache::get($cacheKey);
|
||||
// 如果缓存不存在,则从数据库获取
|
||||
if (!$device) {
|
||||
$device = Db::name('device_user')
|
||||
$device = Db::table('ck_device_user')
|
||||
->alias('du')
|
||||
->join('device d', 'd.id = du.deviceId','left')
|
||||
->join('wechat_account wa', 'd.id = wa.currentDeviceId','left')
|
||||
->join('s2_device d', 'd.id = du.deviceId','left')
|
||||
->join('s2_wechat_account wa', 'd.id = wa.currentDeviceId','left')
|
||||
->where([
|
||||
'du.userId' => $this->userInfo['id'],
|
||||
'du.companyId' => $this->userInfo['companyId']
|
||||
|
||||
@@ -54,11 +54,11 @@ class CustomerController extends Api
|
||||
// }
|
||||
|
||||
// 构建查询
|
||||
$query = Db::name('device_user')
|
||||
$query = Db::table('ck_device_user')
|
||||
->alias('du')
|
||||
->join('device d', 'd.id = du.deviceId','left')
|
||||
->join('wechat_account wa', 'wa.imei = d.imei','left')
|
||||
->join('wechat_friend wf', 'wf.ownerWechatId = wa.wechatId','left')
|
||||
->join('s2_device d', 'd.id = du.deviceId','left')
|
||||
->join('s2_wechat_account wa', 'wa.imei = d.imei','left')
|
||||
->join('s2_wechat_friend wf', 'wf.ownerWechatId = wa.wechatId','left')
|
||||
->where($where)
|
||||
->field('d.id as deviceId,d.imei,wf.*')
|
||||
->group('wf.wechatId'); // 防止重复数据
|
||||
|
||||
@@ -78,7 +78,7 @@ class SystemConfigController extends BaseController
|
||||
|
||||
|
||||
// 更新数据库
|
||||
$result = Db::name('device')
|
||||
$result = Db::table('s2_device')
|
||||
->where('id', $deviceId)
|
||||
->update([
|
||||
'taskConfig' => $taskConfig,
|
||||
|
||||
Reference in New Issue
Block a user