From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
index a413b42..b2b7b79 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
@@ -1,6 +1,5 @@
 package com.yeshi.fanli.service.impl.config;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -10,13 +9,15 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.entity.ProxyIP;
 
 import com.google.gson.Gson;
-import com.yeshi.fanli.dao.config.ConfigDao;
+import com.yeshi.fanli.dao.mybatis.ConfigMapper;
 import com.yeshi.fanli.entity.common.Config;
 import com.yeshi.fanli.entity.config.AppHomeFloatImg;
 import com.yeshi.fanli.entity.xcx.XCXSettingConfig;
 import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONArray;
@@ -25,11 +26,22 @@
 public class ConfigServiceImpl implements ConfigService {
 
 	@Resource
-	private ConfigDao configDao;
+	private ConfigMapper configMapper;
 
 	@Cacheable(value = "config")
 	public List<Config> getAllList() {
-		return configDao.list("from Config");
+		return configMapper.listAll();
+	}
+
+	@Override
+	public List<Config> listObjects(String key, int page) {
+		int start = (page - 1) * Constant.PAGE_SIZE;
+		return configMapper.listSearchByName(key, start, Constant.PAGE_SIZE);
+	}
+
+	@Override
+	public int getCount(String key) {
+		return (int) configMapper.countSearchByName(key);
 	}
 
 	@CacheEvict(value = "config", allEntries = true)
@@ -37,18 +49,19 @@
 	public void update(List<Config> list) {
 		for (Config config : list) {
 			config.setCreatetime(new Date().getTime() + "");
-			configDao.update(config);
+			configMapper.updateByPrimaryKeySelective(config);
 		}
 	}
 
+	@CacheEvict(value = "config", allEntries = true)
 	public void update(Config config) {
 		config.setCreatetime(new Date().getTime() + "");
-		configDao.update(config);
+		configMapper.updateByPrimaryKeySelective(config);
 	}
 
 	@Cacheable(value = "config", key = "#p0+'Str'")
 	public String get(String key) {
-		List<Config> list = configDao.list("from Config c where c.key=? ", new Serializable[] { key });
+		List<Config> list = configMapper.listByKey(key);
 		if (list.size() == 0) {
 			return null;
 		}
@@ -58,7 +71,7 @@
 
 	@Cacheable(value = "config", key = "#p0")
 	public Config getConfig(String key) {
-		List<Config> list = configDao.list("from Config c where c.key=? ", new Serializable[] { key });
+		List<Config> list = configMapper.listByKey(key);
 		if (list.size() == 0) {
 			return null;
 		}
@@ -102,6 +115,8 @@
 	@Override
 	public String getH5Host() {
 		String value = get("h5_url");
+		String[] sts = value.split(",");
+		value = sts[(int) (sts.length * Math.random())];
 		return value.trim();
 	}
 
@@ -147,4 +162,34 @@
 		return value;
 	}
 
+	@Override
+	public Config getConfig(long id) {
+		return configMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public ProxyIP getTaoBaoProxyIP() {
+		String value = get("taobao_proxy_ip");
+		try {
+			String[] sts = value.split(":");
+			return new ProxyIP(sts[0], Integer.parseInt(sts[1]));
+		} catch (Exception e) {
+		}
+		return null;
+	}
+
+	@Override
+	public String getAppHomeFloatNotifyImg() {
+
+		return get("home_float_notify_img");
+	}
+
+	@Override
+	public void save(Config config) {
+		List<Config> list = configMapper.listByKey(config.getKey());
+		if (list == null || list.size() == 0) {
+			configMapper.insertSelective(config);
+		}
+	}
+
 }

--
Gitblit v1.8.0