From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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..47776f8 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
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
+import net.sf.json.JSONArray;
+
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -17,9 +19,8 @@
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;
@Service
public class ConfigServiceImpl implements ConfigService {
@@ -32,6 +33,44 @@
return configDao.list("from Config");
}
+ @Override
+ public List<Config> listObjects(String key, int page) {
+ int start = (page-1) * Constant.PAGE_SIZE;
+ StringBuffer hqlBuf=new StringBuffer("from Config pr where 1=1 ");
+
+ if(key !=null && !"".equals(key.trim())){
+ hqlBuf.append(" and (pr.name like ? )");
+ }
+
+ hqlBuf.append(" order by pr.id desc ");
+ String hql = hqlBuf.toString();
+ if(hql.contains("pr.name")){
+ return configDao.list(hqlBuf.toString(), start, Constant.PAGE_SIZE, new Serializable[]{"%"+key+"%"});
+ } else {
+ return configDao.list(hqlBuf.toString(), start, Constant.PAGE_SIZE, new Serializable[]{});
+ }
+
+ }
+
+ @Override
+ public int getCount(String key, int page) {
+
+ StringBuffer hqlBuf=new StringBuffer("select count(*) from Config pr where 1=1 ");
+
+ if(key !=null && !"".equals(key.trim())){
+ hqlBuf.append(" and (pr.name like ? )");
+ }
+
+ String hql = hqlBuf.toString();
+
+ if(hql.contains("pr.name")){
+ return (int) configDao.getCount(hqlBuf.toString(),new Serializable[]{"%"+key+"%"});
+ } else {
+ return (int) configDao.getCount(hqlBuf.toString(), new Serializable[]{});
+ }
+ }
+
+
@CacheEvict(value = "config", allEntries = true)
@Transactional
public void update(List<Config> list) {
@@ -41,6 +80,7 @@
}
}
+ @CacheEvict(value = "config", allEntries = true)
public void update(Config config) {
config.setCreatetime(new Date().getTime() + "");
configDao.update(config);
@@ -146,5 +186,10 @@
String value = get("home_weex_url");
return value;
}
-
+
+ @Override
+ public Config getConfig(long id) {
+ return configDao.find(Config.class, id);
+ }
+
}
--
Gitblit v1.8.0