Merge branch 'preview' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers into release

This commit is contained in:
dongruihua
2022-11-01 00:27:21 +08:00

View File

@@ -15,6 +15,8 @@ import javax.transaction.Transactional;
import com.xboe.module.interaction.dto.*; import com.xboe.module.interaction.dto.*;
import com.xboe.module.qa.dao.AnswerDao; import com.xboe.module.qa.dao.AnswerDao;
import com.xboe.module.qa.entity.Answer; 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
@@ -71,6 +73,9 @@ public class FavoritesServiceImpl implements IFavoritesService{
@Autowired @Autowired
AnswerDao answerDao; AnswerDao answerDao;
@Autowired
NoteInfoDao noteInfoDao;
@Override @Override
@Caching(evict = {@CacheEvict(value = CacheName.FAVOR, key = "'" + CacheName.KEY_FAVOR + "'+#favorite.objType+#favorite.objId+#favorite.sysCreateAid")}) @Caching(evict = {@CacheEvict(value = CacheName.FAVOR, key = "'" + CacheName.KEY_FAVOR + "'+#favorite.objType+#favorite.objId+#favorite.sysCreateAid")})
@@ -291,16 +296,21 @@ public class FavoritesServiceImpl implements IFavoritesService{
} }
if(!noteList.isEmpty()){ if(!noteList.isEmpty()){
StringBuilder ids=new StringBuilder(); QueryBuilder from=QueryBuilder.from(NoteInfo.class);
for (String s:noteList) { from.addFilter(FieldFilters.in("id", noteList));
// ids.append("'"); from.addFields("id","courseName","content","sysCreateAid","sysCreateBy","sysCreateTime","praises","favorites","comments");
ids.append(s); // StringBuilder ids=new StringBuilder();
// ids.append("'"); // for (String s:noteList) {
ids.append(","); //// ids.append("'");
} // ids.append(s);
ids.deleteCharAt(ids.length()-1); //// ids.append("'");
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()+")"; // ids.append(",");
List<Object[]> list1 = dao.sqlFindList(sql); // }
// 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<Object[]> list1 = dao.sqlFindList(sql,noteList);
try {
List<Object[]> list1 = noteInfoDao.findListFields(from.builder());
for (Object[] o:list1){ for (Object[] o:list1){
for (FavoriteTotalDto favoriteTotalDto : list.getList()) { for (FavoriteTotalDto favoriteTotalDto : list.getList()) {
if(o[0].equals(favoriteTotalDto.getId())){ if(o[0].equals(favoriteTotalDto.getId())){
@@ -309,15 +319,18 @@ public class FavoritesServiceImpl implements IFavoritesService{
favoriteTotalDto.setAuthorId((String) o[3]); favoriteTotalDto.setAuthorId((String) o[3]);
favoriteTotalDto.setAuthorName((String) o[4]); favoriteTotalDto.setAuthorName((String) o[4]);
Timestamp time = (Timestamp)o[5]; // Timestamp time = (Timestamp)o[5];
favoriteTotalDto.setPublishTime(time.toLocalDateTime()); favoriteTotalDto.setPublishTime((LocalDateTime) o[5]);
favoriteTotalDto.setPraises((Integer)o[6]); favoriteTotalDto.setPraises((Integer)o[6]);
favoriteTotalDto.setFavorites((Integer) o[7]); favoriteTotalDto.setFavorites((Integer) o[7]);
favoriteTotalDto.setComments((Integer) o[8]); favoriteTotalDto.setComments((Integer) o[8]);
} }
} }
} }
} catch (Exception e) {
e.printStackTrace();
}
} }
if(!answerList.isEmpty()){ if(!answerList.isEmpty()){