Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);

   }