From 8d3eff35f86f969e3a412d93e5c9de296857510d Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:16:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 578926d1..76aa62af 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ ids.append(","); } ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in("+ids.toString()+")"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(concat("+ids.toString()+"))"; List list1 = dao.sqlFindList(sql); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From 31f7eea90589d83eef85e9ca52cbe0dd5f217576 Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:25:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 76aa62af..a667ff51 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ ids.append(","); } ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(concat("+ids.toString()+"))"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id cast(expression as VARCHAR) in("+ids.toString()+")"; List list1 = dao.sqlFindList(sql); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From 5c13764ab2ae1492587d93b72483297cabd037d9 Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:30:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a667ff51..3768262c 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ ids.append(","); } ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id cast(expression as VARCHAR) in("+ids.toString()+")"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(CAST("+ids.toString()+") AS BIGINT)"; List list1 = dao.sqlFindList(sql); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From cfc7486f75dc6931ab01c6dbd6d93d52d5b900bc Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:43:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3768262c..578926d1 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ ids.append(","); } ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(CAST("+ids.toString()+") AS BIGINT)"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in("+ids.toString()+")"; List list1 = dao.sqlFindList(sql); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From 706ba219b872bfb66b6a6bbb88c2585dba630fb8 Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:46:48 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FavoritesServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 578926d1..8eb122ae 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 @@ -291,16 +291,16 @@ 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,praises,favorites,comments from boe_note_info where id in("+ids.toString()+")"; - List list1 = dao.sqlFindList(sql); +// 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,praises,favorites,comments from boe_note_info where id in(?1)"; + List list1 = dao.sqlFindList(sql,noteList); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { if(o[0].equals(favoriteTotalDto.getId())){ From fb8b2053684fd738b409425c615fec56d4ba41b3 Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:53:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8eb122ae..8329c7aa 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ // ids.append(","); // } // ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?1)"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?0)"; List list1 = dao.sqlFindList(sql,noteList); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From 44fe0ae05a76424780f676e8aee850f51bcd82cd Mon Sep 17 00:00:00 2001 From: 86182 Date: Mon, 31 Oct 2022 23:54:52 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8329c7aa..8eb122ae 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 @@ -299,7 +299,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ // ids.append(","); // } // ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?0)"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?1)"; List list1 = dao.sqlFindList(sql,noteList); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { From f0239fedddf7639e2dae1b037dd39bf44dee5801 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 00:10:44 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FavoritesServiceImpl.java | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) 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 8eb122ae..53814a5b 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 @@ -15,6 +15,8 @@ import javax.transaction.Transactional; import com.xboe.module.interaction.dto.*; import com.xboe.module.qa.dao.AnswerDao; import com.xboe.module.qa.entity.Answer; +import com.xboe.phase2.dao.NoteInfoDao; +import com.xboe.phase2.entity.NoteInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -71,6 +73,9 @@ public class FavoritesServiceImpl implements IFavoritesService{ @Autowired AnswerDao answerDao; + @Autowired + NoteInfoDao noteInfoDao; + @Override @Caching(evict = {@CacheEvict(value = CacheName.FAVOR, key = "'" + CacheName.KEY_FAVOR + "'+#favorite.objType+#favorite.objId+#favorite.sysCreateAid")}) @@ -291,6 +296,9 @@ public class FavoritesServiceImpl implements IFavoritesService{ } if(!noteList.isEmpty()){ + QueryBuilder from=QueryBuilder.from(NoteInfo.class); + from.addFilter(FieldFilters.in("id", noteList)); + from.addFields("id","courseName","content","sysCreateAid","sysCreateBy","sysCreateTime","piaises","favorites","comments"); // StringBuilder ids=new StringBuilder(); // for (String s:noteList) { //// ids.append("'"); @@ -299,24 +307,29 @@ public class FavoritesServiceImpl implements IFavoritesService{ // ids.append(","); // } // ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?1)"; - List list1 = dao.sqlFindList(sql,noteList); - 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]); +// String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in(?1)"; +// List list1 = dao.sqlFindList(sql,noteList); + try { + List list1 = noteInfoDao.findListFields(from.builder()); + 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]; +// Timestamp time = (Timestamp)o[5]; - favoriteTotalDto.setPublishTime(time.toLocalDateTime()); - favoriteTotalDto.setPraises((Integer)o[6]); - favoriteTotalDto.setFavorites((Integer) o[7]); - favoriteTotalDto.setComments((Integer) o[8]); + favoriteTotalDto.setPublishTime((LocalDateTime) o[5]); + favoriteTotalDto.setPraises((Integer)o[6]); + favoriteTotalDto.setFavorites((Integer) o[7]); + favoriteTotalDto.setComments((Integer) o[8]); + } } } + } catch (Exception e) { + e.printStackTrace(); } } From fd1fb20c68f66de7c2817b0b1f36a31202aff5a0 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 00:15:06 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/service/impl/FavoritesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 53814a5b..aeeece16 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 @@ -298,7 +298,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(!noteList.isEmpty()){ QueryBuilder from=QueryBuilder.from(NoteInfo.class); from.addFilter(FieldFilters.in("id", noteList)); - from.addFields("id","courseName","content","sysCreateAid","sysCreateBy","sysCreateTime","piaises","favorites","comments"); + from.addFields("id","courseName","content","sysCreateAid","sysCreateBy","sysCreateTime","praises","favorites","comments"); // StringBuilder ids=new StringBuilder(); // for (String s:noteList) { //// ids.append("'");