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/lable/LabelServiceImpl.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
index a53eac2..5da3b12 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
@@ -10,14 +10,12 @@
 import java.util.UUID;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
-
-import jxl.Sheet;
-import jxl.Workbook;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.yeshi.utils.tencentcloud.COSManager;
 
 import com.yeshi.fanli.dao.mybatis.lable.LabelClassMapper;
 import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;
@@ -26,10 +24,11 @@
 import com.yeshi.fanli.entity.bus.lable.LabelGoods;
 import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.exception.LabelException;
-import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.lable.LabelService;
 import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
+
+import jxl.Sheet;
+import jxl.Workbook;
 
 @Service
 public class LabelServiceImpl implements LabelService {
@@ -157,14 +156,21 @@
 	
 	@Override
 	public List<Label> selectByTitle(String title) throws LabelException{
-		LogHelper.test("鏌ヨ鏍囩锛�  "+title);
 		return labelMapper.selectByTitle(title);
 	}
 
+	
 	@Override
-	@Cacheable(value = "labelCache",key="'selectByTitleCache-'+#labKey +'-'+#title")
-	public List<Label> selectByTitleCache(String labKey, String title) throws LabelException{
-		return selectByTitle(title);
+	@Cacheable(value = "labelCache",key="'getByTitleCache-'+#labKey +'-'+#title")
+	public Label getByTitleCache(String labKey, String title) throws LabelException{
+		return labelMapper.getByTitle(title);
+	}
+	
+	
+	@Override
+	@Cacheable(value = "labelCache",key="'listByTitlesCache-'+#list")
+	public List<Label> listByTitlesCache(List<String> list){
+		return labelMapper.listByTitles(list);
 	}
 	
 	

--
Gitblit v1.8.0