From 190d6bc6aa7e4ca33c281bd9785339f3bddaf11e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 08 五月 2021 12:43:37 +0800
Subject: [PATCH] bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 217 ++++++++++++++++++++++++++---------------------------
1 files changed, 107 insertions(+), 110 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
index ccbce8a..b418584 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
@@ -1,110 +1,107 @@
-package com.yeshi.fanli.service.impl.push;
-
-import java.util.Date;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.yeshi.fanli.dao.mybatis.push.DeviceActiveMapper;
-import com.yeshi.fanli.entity.push.DeviceActive;
-import com.yeshi.fanli.service.inter.push.DeviceActiveService;
-import com.yeshi.fanli.util.StringUtil;
-
-@Service
-public class DeviceActiveServiceImpl implements DeviceActiveService {
- @Resource
- private DeviceActiveMapper deviceActiveMapper;
-
- @Override
- public void addDeviceActive(DeviceActive deviceActive) {
- // 娣诲姞璁板綍
- if (deviceActive == null)
- return;
- if (deviceActive.getPlatform() == null)
- return;
-
- if (deviceActive.getVersionCode() == null)
- return;
-
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_ANDROID
- && StringUtil.isNullOrEmpty(deviceActive.getDevice()))
- return;
-
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_IOS
- && StringUtil.isNullOrEmpty(deviceActive.getDeviceToken()))
- return;
-
- switch (deviceActive.getPlatform()) {
- case DeviceActive.PLATFORM_ANDROID:
- // Android鐨勫敮涓�鏍囪瘑涓篸evice
- if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
- return;
- DeviceActive da = deviceActiveMapper.selectByDeviceAndPlatform(deviceActive.getDevice(),
- deviceActive.getPlatform());
- if (da == null) {
- deviceActive.setId(null);
- deviceActive.setUpdateTime(new Date());
- deviceActive.setCreateTime(new Date());
- deviceActiveMapper.insertSelective(deviceActive);
- } else {
- DeviceActive updateDeviceActive = new DeviceActive();
- updateDeviceActive.setId(da.getId());
- updateDeviceActive.setUpdateTime(new Date());
- updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
- deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
- }
-
- break;
- case DeviceActive.PLATFORM_IOS:
- // IOS鐨勮澶囨爣璇嗕负deviceToken
- if (StringUtil.isNullOrEmpty(deviceActive.getDeviceToken()))
- return;
- deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
- DeviceActive da1 = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(deviceActive.getDeviceTokenMd5(),
- deviceActive.getPlatform());
- if (da1 == null) {
- deviceActive.setId(null);
- deviceActive.setUpdateTime(new Date());
- deviceActive.setCreateTime(new Date());
- deviceActiveMapper.insertSelective(deviceActive);
- } else {
- DeviceActive updateDeviceActive = new DeviceActive();
- updateDeviceActive.setId(da1.getId());
- updateDeviceActive.setUpdateTime(new Date());
- updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
- deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
- }
-
- break;
- default:
- return;
- }
- }
-
-
- /**
- *
- * @param device 璁惧鍙�
- * @param platform 骞冲彴绫诲瀷
- * @return
- */
- @Override
- public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform) {
-
- DeviceActive deviceActive = null;
- if ("android".equalsIgnoreCase(platform)) {
-
- deviceActive = deviceActiveMapper.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);
-
- } else if ("ios".equalsIgnoreCase(platform)) {
-
- deviceActive = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(StringUtil.Md5(deviceToken),
- DeviceActive.PLATFORM_IOS);
-
- }
-
- return deviceActive;
- }
-
-}
+package com.yeshi.fanli.service.impl.push;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.yeshi.fanli.dao.mybatis.push.DeviceActiveMapper;
+import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
+
+@Service
+public class DeviceActiveServiceImpl implements DeviceActiveService {
+ @Resource
+ private DeviceActiveMapper deviceActiveMapper;
+
+ @Override
+ public void addDeviceActive(DeviceActive deviceActive) {
+ // 娣诲姞璁板綍
+ if (deviceActive == null)
+ return;
+ if (deviceActive.getPlatform() == null)
+ return;
+
+ if (deviceActive.getVersionCode() == null)
+ return;
+
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
+ return;
+
+ // Android鐨勫敮涓�鏍囪瘑涓篸evice
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
+ return;
+ DeviceActive da = deviceActiveMapper.selectByDeviceAndPlatform(deviceActive.getDevice(),
+ deviceActive.getPlatform());
+ if (da == null) {
+ deviceActive.setId(null);
+ if (deviceActive.getUpdateTime() == null)
+ deviceActive.setUpdateTime(new Date());
+ if (deviceActive.getCreateTime() == null)
+ deviceActive.setCreateTime(new Date());
+ if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
+ deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
+ }
+
+ deviceActiveMapper.insertSelective(deviceActive);
+ DouYinDeviceActiveCMQManager.getInstance().addDeviceActive(deviceActive.getDevice(),
+ deviceActive.getPlatform());
+ } else {
+ DeviceActive updateDeviceActive = new DeviceActive();
+ updateDeviceActive.setId(da.getId());
+ updateDeviceActive.setUpdateTime(new Date());
+ updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
+ if (StringUtil.isNullOrEmpty(da.getImei()))
+ updateDeviceActive.setImei(deviceActive.getImei());
+ if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
+ updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
+ updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
+ }
+
+ if (StringUtil.isNullOrEmpty(da.getMac()))
+ updateDeviceActive.setMac(deviceActive.getMac());
+
+ deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
+ }
+
+ }
+
+ /**
+ *
+ * @param device
+ * 璁惧鍙�
+ * @param platform
+ * 骞冲彴绫诲瀷
+ * @return
+ */
+ @Override
+ public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform) {
+
+ DeviceActive deviceActive = null;
+ if ("android".equalsIgnoreCase(platform)) {
+
+ deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);
+
+ } else if ("ios".equalsIgnoreCase(platform)) {
+
+ deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_IOS);
+
+ }
+
+ return deviceActive;
+ }
+
+ @Override
+ public DeviceActive getFirstActiveInfo(String device) {
+ return deviceActiveMapper.selectFirst(device);
+ }
+
+ @Override
+ public DeviceActive getFirstActiveInfoByImei(String imei) {
+ return deviceActiveMapper.selectFirstByImei(imei);
+ }
+
+}
--
Gitblit v1.8.0