From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java |   71 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java
index b419584..c745c3c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.user.DeviceSexDao;
@@ -16,40 +17,42 @@
 @Service
 public class DeviceSexServiceImpl implements DeviceSexService {
 
-	@Resource
-	private DeviceSexDao deviceSexDao;
-	
-	@Resource
-	private RedisManager redisManager;
-	
+    @Resource
+    private DeviceSexDao deviceSexDao;
 
-	@Override
-	public void save(String device, Integer sex) {
-		if (StringUtil.isNullOrEmpty(device) || sex == null) {
-			return;
-		}
-		DeviceSex deviceSex = new DeviceSex();
-		deviceSex.setId(device);
-		deviceSex.setSex(sex);
-		deviceSex.setCreateTime(new Date());
-		deviceSexDao.save(deviceSex);
-		
-		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.deviceSex, device);
-		redisManager.cacheCommonString(key, sex + "", 10);
-	}
+    @Resource
+    private RedisManager redisManager;
 
-	@Override
-	public int getDeviceSex(String device) {
-		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.deviceSex, device);
-		String result = redisManager.getCommonString(key);
-		if (!StringUtil.isNullOrEmpty(result)) {
-			return Integer.parseInt(result);
-		}
-		
-		DeviceSex deviceSex = deviceSexDao.get(device);
-		if (deviceSex == null || deviceSex.getSex() == null) {
-			return 0;
-		}
-		return deviceSex.getSex();
-	}
+
+    @Override
+    public void save(String device, Integer sex) {
+        if (StringUtil.isNullOrEmpty(device) || sex == null) {
+            return;
+        }
+        DeviceSex deviceSex = new DeviceSex();
+        deviceSex.setId(device);
+        deviceSex.setSex(sex);
+        deviceSex.setCreateTime(new Date());
+        deviceSexDao.save(deviceSex);
+
+        String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.deviceSex, device);
+        redisManager.cacheCommonString(key, sex + "", 10);
+    }
+
+    @Override
+    public int getDeviceSex(String device, SystemEnum system) {
+        if (system != SystemEnum.blks)
+            return 0;
+        String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.deviceSex, device);
+        String result = redisManager.getCommonString(key);
+        if (!StringUtil.isNullOrEmpty(result)) {
+            return Integer.parseInt(result);
+        }
+
+        DeviceSex deviceSex = deviceSexDao.get(device);
+        if (deviceSex == null || deviceSex.getSex() == null) {
+            return 0;
+        }
+        return deviceSex.getSex();
+    }
 }

--
Gitblit v1.8.0