From edcc11161a736847326a12bac414aabfc5722725 Mon Sep 17 00:00:00 2001 From: zhuangqian Date: Tue, 13 Sep 2016 09:48:55 +0800 Subject: [PATCH] update --- .../core/base/controller/CurdController.java | 3 +- .../com/smallchill/core/plugins/dao/Db.java | 24 ++++ .../core/plugins/dao/DbManager.java | 38 ++++++ .../smallchill/core/service/CacheService.java | 22 ---- .../core/service/impl/CacheServiceImpl.java | 111 ------------------ .../{core => system}/service/CurdService.java | 2 +- .../service/impl/CurdServiceImpl.java | 4 +- 7 files changed, 67 insertions(+), 137 deletions(-) delete mode 100644 src/main/java/com/smallchill/core/service/CacheService.java delete mode 100644 src/main/java/com/smallchill/core/service/impl/CacheServiceImpl.java rename src/main/java/com/smallchill/{core => system}/service/CurdService.java (98%) rename src/main/java/com/smallchill/{core => system}/service/impl/CurdServiceImpl.java (97%) diff --git a/src/main/java/com/smallchill/core/base/controller/CurdController.java b/src/main/java/com/smallchill/core/base/controller/CurdController.java index 37b4218b..af318d2a 100644 --- a/src/main/java/com/smallchill/core/base/controller/CurdController.java +++ b/src/main/java/com/smallchill/core/base/controller/CurdController.java @@ -32,15 +32,16 @@ import com.smallchill.core.interfaces.IMeta; import com.smallchill.core.meta.MetaIntercept; import com.smallchill.core.plugins.dao.Blade; import com.smallchill.core.plugins.dao.Db; -import com.smallchill.core.service.CurdService; import com.smallchill.core.toolbox.Func; import com.smallchill.core.toolbox.Paras; import com.smallchill.core.toolbox.ajax.AjaxResult; import com.smallchill.core.toolbox.kit.JsonKit; import com.smallchill.core.toolbox.kit.StrKit; import com.smallchill.core.toolbox.support.Singleton; +import com.smallchill.system.service.CurdService; public abstract class CurdController extends BaseController { + @Autowired CurdService service; diff --git a/src/main/java/com/smallchill/core/plugins/dao/Db.java b/src/main/java/com/smallchill/core/plugins/dao/Db.java index ca355042..c334c493 100644 --- a/src/main/java/com/smallchill/core/plugins/dao/Db.java +++ b/src/main/java/com/smallchill/core/plugins/dao/Db.java @@ -238,6 +238,30 @@ public class Db { return getDbManager().selectList(sqlTemplate, param, ac, intercept); } + /** + * 根据缓存找一条数据 + * @param cacheName + * @param key + * @param sqlTemplate + * @param paras + * @return Map + */ + public static Map selectOneByCache(String cacheName, String key, String sqlTemplate, Object paras){ + return getDbManager().selectOneByCache(cacheName, key, sqlTemplate, paras); + } + + /** + * 根据缓存找多条数据 + * @param cacheName + * @param key + * @param sqlTemplate + * @param paras + * @return List + */ + public static List selectListByCache(String cacheName, String key, String sqlTemplate, Object paras){ + return getDbManager().selectListByCache(cacheName, key, sqlTemplate, paras); + } + /************ ↑↑↑ ******** 通用 ********* ↑↑↑ ****************/ /** diff --git a/src/main/java/com/smallchill/core/plugins/dao/DbManager.java b/src/main/java/com/smallchill/core/plugins/dao/DbManager.java index e890991e..b70eaef1 100644 --- a/src/main/java/com/smallchill/core/plugins/dao/DbManager.java +++ b/src/main/java/com/smallchill/core/plugins/dao/DbManager.java @@ -25,10 +25,12 @@ import org.beetl.sql.core.SQLResult; import com.smallchill.core.aop.AopContext; import com.smallchill.core.constant.Cst; +import com.smallchill.core.interfaces.ILoader; import com.smallchill.core.interfaces.IQuery; import com.smallchill.core.plugins.connection.ConnectionPlugin; import com.smallchill.core.toolbox.Func; import com.smallchill.core.toolbox.Paras; +import com.smallchill.core.toolbox.kit.CacheKit; import com.smallchill.core.toolbox.kit.StrKit; import com.smallchill.core.toolbox.support.BladePage; @@ -337,6 +339,42 @@ public class DbManager { return rst; } + /** + * 根据缓存找一条数据 + * @param cacheName + * @param key + * @param sqlTemplate + * @param paras + * @return Map + */ + public Map selectOneByCache(String cacheName, String key, String sqlTemplate, Object paras){ + final String _sqlTemplate = sqlTemplate; + final Object _paras = paras; + return CacheKit.get(cacheName, key, new ILoader() { + public Object load() { + return selectOne(_sqlTemplate, _paras); + } + }); + } + + /** + * 根据缓存找多条数据 + * @param cacheName + * @param key + * @param sqlTemplate + * @param paras + * @return List + */ + public List selectListByCache(String cacheName, String key, String sqlTemplate, Object paras){ + final String _sqlTemplate = sqlTemplate; + final Object _paras = paras; + return CacheKit.get(cacheName, key, new ILoader() { + public Object load() { + return selectList(_sqlTemplate, _paras); + } + }); + } + /************ ↑↑↑ ******** 通用 ********* ↑↑↑ ****************/ /** diff --git a/src/main/java/com/smallchill/core/service/CacheService.java b/src/main/java/com/smallchill/core/service/CacheService.java deleted file mode 100644 index 5d0b480f..00000000 --- a/src/main/java/com/smallchill/core/service/CacheService.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.smallchill.core.service; - -import com.smallchill.core.interfaces.ICache; - -public interface CacheService extends ICache{ - -} diff --git a/src/main/java/com/smallchill/core/service/impl/CacheServiceImpl.java b/src/main/java/com/smallchill/core/service/impl/CacheServiceImpl.java deleted file mode 100644 index e4128557..00000000 --- a/src/main/java/com/smallchill/core/service/impl/CacheServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.smallchill.core.service.impl; - -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Service; - -import com.smallchill.core.interfaces.ILoader; -import com.smallchill.core.plugins.dao.Blade; -import com.smallchill.core.plugins.dao.Db; -import com.smallchill.core.service.CacheService; -import com.smallchill.core.toolbox.kit.CacheKit; - -@Service -public class CacheServiceImpl implements CacheService{ - - public Map findOne(String cacheName, String key, final String sql) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Db.selectOne(sql); - } - }); - } - - public Map findOne(String cacheName, String key, - final String sql, final Object modelOrMap) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Db.selectOne(sql, modelOrMap); - } - }); - } - - public Map findOneBySqlId(String cacheName, String key, - final String sqlId) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Blade.dao().select(sqlId, Map.class, null);//selectOneBySqlId(sqlId, null); - } - }); - } - - public Map findOneBySqlId(String cacheName, String key, - final String sqlId, final Object modelOrMap) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Blade.dao().select(sqlId, Map.class, modelOrMap); - } - }); - } - - public List> find(String cacheName, String key, - final String sql) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Db.selectList(sql); - } - }); - } - - public List> find(String cacheName, String key, - final String sql, final Object modelOrMap) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Db.selectList(sql, modelOrMap); - } - }); - } - - public List> findBySqlId(String cacheName, String key, - final String sqlId) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Blade.dao().select(sqlId, Map.class, null); - } - }); - } - - public List> findBySqlId(String cacheName, String key, - final String sqlId, final Object modelOrMap) { - return CacheKit.get(cacheName, key, new ILoader() { - @Override - public Object load() { - return Blade.dao().select(sqlId, Map.class, modelOrMap); - } - }); - } - -} diff --git a/src/main/java/com/smallchill/core/service/CurdService.java b/src/main/java/com/smallchill/system/service/CurdService.java similarity index 98% rename from src/main/java/com/smallchill/core/service/CurdService.java rename to src/main/java/com/smallchill/system/service/CurdService.java index d0b64338..29f8346f 100644 --- a/src/main/java/com/smallchill/core/service/CurdService.java +++ b/src/main/java/com/smallchill/system/service/CurdService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.smallchill.core.service; +package com.smallchill.system.service; import com.smallchill.core.base.controller.BladeController; import com.smallchill.core.meta.MetaIntercept; diff --git a/src/main/java/com/smallchill/core/service/impl/CurdServiceImpl.java b/src/main/java/com/smallchill/system/service/impl/CurdServiceImpl.java similarity index 97% rename from src/main/java/com/smallchill/core/service/impl/CurdServiceImpl.java rename to src/main/java/com/smallchill/system/service/impl/CurdServiceImpl.java index 9f3d0f96..3e85da5b 100644 --- a/src/main/java/com/smallchill/core/service/impl/CurdServiceImpl.java +++ b/src/main/java/com/smallchill/system/service/impl/CurdServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.smallchill.core.service.impl; +package com.smallchill.system.service.impl; import org.springframework.stereotype.Service; @@ -21,9 +21,9 @@ import com.smallchill.core.aop.AopContext; import com.smallchill.core.base.controller.BladeController; import com.smallchill.core.meta.MetaIntercept; import com.smallchill.core.plugins.dao.Blade; -import com.smallchill.core.service.CurdService; import com.smallchill.core.toolbox.Paras; import com.smallchill.core.toolbox.grid.GridManager; +import com.smallchill.system.service.CurdService; @Service public class CurdServiceImpl implements CurdService { -- GitLab