From 4b75f3d94dcce96a854a8bb34e83398aea83f373 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 19 Oct 2022 13:13:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FavoritesServiceImpl.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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; From 07f681fed3b7932038f616656d59e5b8121155f4 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 19 Oct 2022 13:40:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B8=85=E6=8E=89=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/UserServiceImpl.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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..ac07c453 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) { + redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); + } + Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); + if(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) { + redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); + } + Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); + if(hasKey1){ + redisTemplate.delete(CacheName.KEY_USER_SYSID + old.getSysId()); + } + } From dc784eb172e5ea68e532c6f0f7f68e7f92cd5a05 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 19 Oct 2022 13:43:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=85=E6=8E=89=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/system/user/service/impl/UserServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ac07c453..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 @@ -128,11 +128,11 @@ public class UserServiceImpl implements IUserService { dao.updateFieldById(id,"sign",sign); User old = dao.get(id); Boolean hasKey = redisTemplate.hasKey(CacheName.KEY_USER_NAME + old.getName()); - if(hasKey) { + if(hasKey!=null &&hasKey) { redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); } Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); - if(hasKey1){ + if(hasKey1!=null && hasKey1){ redisTemplate.delete(CacheName.KEY_USER_SYSID + old.getSysId()); } @@ -145,11 +145,11 @@ public class UserServiceImpl implements IUserService { dao.updateFieldById(id,"dynamic",dynamic); User old = dao.get(id); Boolean hasKey = redisTemplate.hasKey(CacheName.KEY_USER_NAME + old.getName()); - if(hasKey) { + if(hasKey!=null &&hasKey) { redisTemplate.delete(CacheName.KEY_USER_NAME + old.getName()); } Boolean hasKey1 = redisTemplate.hasKey(CacheName.KEY_USER_SYSID); - if(hasKey1){ + if(hasKey1!=null && hasKey1){ redisTemplate.delete(CacheName.KEY_USER_SYSID + old.getSysId()); } From 56871515b39052bdbe84c7ac7fd9d78629a727d9 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 19 Oct 2022 14:02:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A5=BD=E8=AF=84=E6=A6=9C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=AF=84=E8=AE=BA=E6=95=B0=E4=B8=BA0=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) 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]);