Merge remote-tracking branch 'origin/master'

yujian

2019-05-20 0a51e12c7a0a4ce201d5ba8459d702d029beea19

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -9,6 +9,7 @@


import javax.annotation.Resource;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.yeshi.utils.DateUtil;

@@ -342,11 +343,13 @@
   }



   @Override

   @Cacheable(value = "dynamicCache", key = "'count-'+#cid+'-'+#subId")

   public long count(Long cid, Long subId) {

      return dynamicInfoDao.count(cid, subId);

   }



   @Override

   @Cacheable(value = "dynamicCache", key = "'query-'+#start+'-'+#count+'-'+#cid+'-'+#subId")

   public List<DynamicInfo> query(int start, int count, Long cid, Long subId) {

      List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);