From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 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 353cace..d99ce29 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
@@ -27,59 +27,61 @@
if (deviceActive.getVersionCode() == null)
return;
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_ANDROID
- && StringUtil.isNullOrEmpty(deviceActive.getDevice()))
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
return;
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_IOS
- && StringUtil.isNullOrEmpty(deviceActive.getDeviceToken()))
+ // Android鐨勫敮涓�鏍囪瘑涓篸evice
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
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);
+ DeviceActive da = deviceActiveMapper.selectByDeviceAndPlatform(deviceActive.getDevice(),
+ deviceActive.getPlatform());
+ if (da == null) {
+ deviceActive.setId(null);
+ deviceActive.setUpdateTime(new Date());
+ deviceActive.setCreateTime(new Date());
+ if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
+ deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
}
- 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);
+ deviceActiveMapper.insertSelective(deviceActive);
+ } else {
+ DeviceActive updateDeviceActive = new DeviceActive();
+ updateDeviceActive.setId(da.getId());
+ updateDeviceActive.setUpdateTime(new Date());
+ updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
+ if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
+ updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
+ updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
}
-
- break;
- default:
- return;
+ 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.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);
+
+ } else if ("ios".equalsIgnoreCase(platform)) {
+
+ deviceActive = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(StringUtil.Md5(deviceToken),
+ DeviceActive.PLATFORM_IOS);
+
+ }
+
+ return deviceActive;
}
}
--
Gitblit v1.8.0