diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index aa376925..9232312d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -324,9 +324,6 @@ public class CasesServiceImpl implements ICasesService { caseRankingDto.setId((String) o[0]); caseRankingDto.setTitle((String) o[1]); caseRankingDto.setCount((Integer) o[2]); - if(caseRankingDto.getCount()==0){ - continue; - } caseRankingDto.setAuthorName((String) o[3]); caseRankingDto.setImages((String) o[4]); caseRankingDto.setSummary((String) o[5]); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java index 117e673c..47a9aa3d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java @@ -1,5 +1,6 @@ package com.xboe.module.interaction.service.impl; +import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -137,6 +138,8 @@ public class FavoritesServiceImpl implements IFavoritesService{ Set caseList = new HashSet<>(); // Map map = new HashMap<>(); + Set noteList = new HashSet<>(); + for (Favorites f: page.getList()) { FavoriteTotalDto favoriteTotalDto = new FavoriteTotalDto(); favoriteTotalDto.setFavoritesTime(f.getSysCreateTime()); @@ -158,6 +161,11 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(f.getObjType()==3){ caseList.add(f.getObjId()); } + if(f.getObjType()==6){ + noteList.add(f.getObjId()); + } + + } @@ -254,6 +262,32 @@ public class FavoritesServiceImpl implements IFavoritesService{ } } + if(!noteList.isEmpty()){ + StringBuilder ids=new StringBuilder(); + for (String s:noteList) { + ids.append("'"); + ids.append(s); + ids.append("'"); + ids.append(","); + } + ids.deleteCharAt(ids.length()-1); + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time from boe_note_info where id in("+ids+")"; + List list1 = dao.sqlFindList(sql); + for (Object[] o:list1){ + for (FavoriteTotalDto favoriteTotalDto : list.getList()) { + if(o[0].equals(favoriteTotalDto.getId())){ + favoriteTotalDto.setTitle((String) o[1]); + favoriteTotalDto.setContent((String) o[2]); + favoriteTotalDto.setAuthorId((String) o[3]); + favoriteTotalDto.setAuthorName((String) o[4]); + Timestamp time = (Timestamp)o[5]; + + favoriteTotalDto.setPublishTime(time.toLocalDateTime()); + } + } + } + } + list.setCount(page.getCount()); list.setPageSize(pageSize); return list; diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java index 7f05430c..5a70353b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,6 +57,9 @@ public class UserServiceImpl implements IUserService { @Resource OrganizationDao organizationDao; + + @Resource + RedisTemplate redisTemplate; public List findByNameOrCode(String word){ return dao.findList(FieldFilters.or(FieldFilters.eq("name", word),FieldFilters.eq("userNo", word))); @@ -120,7 +124,18 @@ public class UserServiceImpl implements IUserService { @Caching(evict = {@CacheEvict(value = CacheName.NAME_USER, key = "'" + CacheName.KEY_USER + "'+#id"), @CacheEvict(value = CacheName.NAME_USER, key = "'" + CacheName.KEY_USER_FILED + "'+#id")}) public void updateSign(String id, String sign) { + //name 清掉name 和 sysId的换成 dao.updateFieldById(id,"sign",sign); + User old = dao.get(id); + Boolean hasKey = redisTemplate.hasKey(CacheName.KEY_USER_NAME + old.getName()); + if(hasKey!=null &&hasKey) { + redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); + } + Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); + if(hasKey1!=null && hasKey1){ + redisTemplate.delete(CacheName.KEY_USER_SYSID + old.getSysId()); + } + } @Override @@ -128,6 +143,16 @@ public class UserServiceImpl implements IUserService { @CacheEvict(value = CacheName.NAME_USER, key = "'" + CacheName.KEY_USER_FILED + "'+#id")}) public void updateDynamic(String id, Integer dynamic) { dao.updateFieldById(id,"dynamic",dynamic); + User old = dao.get(id); + Boolean hasKey = redisTemplate.hasKey(CacheName.KEY_USER_NAME + old.getName()); + if(hasKey!=null &&hasKey) { + redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); + } + Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); + if(hasKey1!=null && hasKey1){ + redisTemplate.delete(CacheName.KEY_USER_SYSID + old.getSysId()); + } + }