Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java

@@ -24,7 +24,6 @@
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;



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

   }