From 7d1ebc22e561d3b47a0d8fd2c5d8d78fb0f8682a Mon Sep 17 00:00:00 2001 From: Guava Date: Tue, 20 Jun 2023 20:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A8=E8=8D=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/boecase/dao/CasesRecordDao.java | 37 + .../xboe/module/boecase/dto/CasePageVo.java | 30 + .../service/impl/CasesServiceImpl.java | 657 +++++++----------- 3 files changed, 332 insertions(+), 392 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java new file mode 100644 index 00000000..24a92f4b --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -0,0 +1,37 @@ +package com.xboe.module.boecase.dao; + +import com.xboe.module.boecase.dto.CasePageVo; +import com.xboe.module.boecase.entity.Cases; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +/** + * @author : civism + * @version 1.0 + * @date 2023/6/20 18:55 + */ +@Repository +public interface CasesRecordDao extends JpaRepository, JpaSpecificationExecutor { + + @Query(nativeQuery = true, value = "select b.* from boe_cases_recommend_push_record a LEFT JOIN boe_cases b on. a.case_id = b.id and b.deleted=false " + + " where a.deleted=false and a.push_user_id= :#{#condition.userId}" + + " and if(:#{#condition.keyWord} is not null,b.title like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.keyword1 like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.keyword2 like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.keyword3 like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.keyword4 like CONCAT('%',:#{#condition.keyWord},'%')" + + " or b.keyword5 like CONCAT('%',:#{#condition.keyWord},'%'),1=1)" + + " and if(:#{#condition.years} is not null ,YEAR(b.sys_create_time) in (:#{#condition.years}),1=1 )" + + " and if(:#{#condition.majorType} is nto null ,b.major_type = :#{#condition.majorType},1=1) " + + " and if(:#{#condition.org1} is not null,b.org_domain_parent in (:#{#condition.org1}),1=1)" + + " and if(:#{#condition.org2} is not null,b.org_domain_parent2 in (:#{#condition.org2}),1=1)" + + " and if(:#{#condition.org3} is not null,b.org_domain_parent3 in (:#{#condition.org3}),1=1)" + + " group by b.id order by a.sys_create_time DESC") + Page queryList(Pageable pageable, @Param("condition") CasePageVo casePage); +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java index 87e1625c..c3a615a5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java @@ -1,8 +1,11 @@ package com.xboe.module.boecase.dto; +import cn.hutool.core.util.StrUtil; import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; +import java.util.stream.Collectors; @Data public class CasePageVo extends PageDto { @@ -51,4 +54,31 @@ public class CasePageVo extends PageDto { */ private String type; + /** + * 人员id + */ + private String userId; + + + public List getOrg1() { + if (CollectionUtils.isNotEmpty(this.orgDomainDtos)) { + return orgDomainDtos.stream().map(OrgDomainDto::getOrgDomainParent).filter(StrUtil::isNotBlank).collect(Collectors.toList()); + } + return null; + } + + public List getOrg2() { + if (CollectionUtils.isNotEmpty(this.orgDomainDtos)) { + return orgDomainDtos.stream().map(OrgDomainDto::getOrgDomainParent2).filter(StrUtil::isNotBlank).collect(Collectors.toList()); + } + return null; + } + + public List getOrg3() { + if (CollectionUtils.isNotEmpty(this.orgDomainDtos)) { + return orgDomainDtos.stream().map(OrgDomainDto::getOrgDomainParent3).filter(StrUtil::isNotBlank).collect(Collectors.toList()); + } + return null; + } + } 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 9e043b42..acb24ef1 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 @@ -1,37 +1,35 @@ package com.xboe.module.boecase.service.impl; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.transaction.Transactional; - import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.xboe.common.OrderCondition; +import com.xboe.common.PageList; import com.xboe.common.utils.IDGenerator; +import com.xboe.common.utils.StringUtil; +import com.xboe.core.orm.*; +import com.xboe.module.boecase.dao.CasesDao; import com.xboe.module.boecase.dao.CasesMajorTypeDao; +import com.xboe.module.boecase.dao.CasesRecordDao; import com.xboe.module.boecase.dto.*; +import com.xboe.module.boecase.entity.Cases; import com.xboe.module.boecase.entity.CasesMajorType; +import com.xboe.module.boecase.service.ICasesService; import com.xboe.module.dict.dao.SysDictionaryDao; import com.xboe.module.dict.entity.DictItem; import com.xboe.school.vo.CasesVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import com.xboe.common.OrderCondition; -import com.xboe.common.PageList; -import com.xboe.common.utils.StringUtil; -import com.xboe.core.orm.FieldFilters; -import com.xboe.core.orm.FieldUpdateType; -import com.xboe.core.orm.IFieldFilter; -import com.xboe.core.orm.LikeMatchMode; -import com.xboe.core.orm.QueryBuilder; -import com.xboe.core.orm.UpdateBuilder; -import com.xboe.module.boecase.dao.CasesDao; -import com.xboe.module.boecase.entity.Cases; -import com.xboe.module.boecase.service.ICasesService; +import javax.annotation.Resource; +import javax.transaction.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; @Slf4j @Service @@ -47,16 +45,19 @@ public class CasesServiceImpl implements ICasesService { @Resource CasesMajorTypeDao casesMajorTypeDao; + @Resource + private CasesRecordDao casesRecordDao; + /** * 案例分页查询，用于门户的查询 - * */ + */ @Override public PageList queryPageCases(int pageIndex, int pageSize, CaseVo caseVo) { - QueryBuilder query=QueryBuilder.from(Cases.class); - PageList page=null; + QueryBuilder query = QueryBuilder.from(Cases.class); + PageList page = null; List filters = new ArrayList<>(); - filters.add(FieldFilters.eq("deleted",false)); - List likes=new ArrayList(); + filters.add(FieldFilters.eq("deleted", false)); + List likes = new ArrayList(); likes.add(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("keyword1", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); @@ -64,96 +65,95 @@ public class CasesServiceImpl implements ICasesService { likes.add(FieldFilters.like("keyword3", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("keyword4", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("keyword5", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - - - if(StringUtil.isNotBlank(caseVo.getKeyWord())) { + + + if (StringUtil.isNotBlank(caseVo.getKeyWord())) { filters.add(FieldFilters.or(likes)); } - if(StringUtils.isNotBlank(caseVo.getOrgDomain())){ - if(caseVo.getOrgDomain().contains(",")){ + if (StringUtils.isNotBlank(caseVo.getOrgDomain())) { + if (caseVo.getOrgDomain().contains(",")) { String[] split = caseVo.getOrgDomain().split(","); List strings = Arrays.asList(split); - filters.add(FieldFilters.in("orgDomainParent",strings)); - }else{ - filters.add(FieldFilters.eq("orgDomainParent",caseVo.getOrgDomain())); + filters.add(FieldFilters.in("orgDomainParent", strings)); + } else { + filters.add(FieldFilters.eq("orgDomainParent", caseVo.getOrgDomain())); } } - //增加只是查询有附件的 filters.add(FieldFilters.isNotNull("filePath")); - filters.add(FieldFilters.ne("filePath","")); + filters.add(FieldFilters.ne("filePath", "")); // if(StringUtil.isNotBlank(caseVo.getMajorType())){ // filters.add(FieldFilters.eq("majorType",caseVo.getMajorType())); // } - if(StringUtil.isNotBlank(caseVo.getMajorType())){ + if (StringUtil.isNotBlank(caseVo.getMajorType())) { QueryBuilder from = QueryBuilder.from(CasesMajorType.class); //前端直接字符串拼接传，后端转化数组 - if(caseVo.getMajorType().contains(",")){ + if (caseVo.getMajorType().contains(",")) { String[] split = caseVo.getMajorType().split(","); List strings = Arrays.asList(split); - from.addFilter(FieldFilters.in("majorId",strings)); - }else{ - from.addFilter(FieldFilters.eq("majorId",caseVo.getMajorType())); + from.addFilter(FieldFilters.in("majorId", strings)); + } else { + from.addFilter(FieldFilters.eq("majorId", caseVo.getMajorType())); } from.addGroupBy("caseId"); - from.addFields("id","caseId"); + from.addFields("id", "caseId"); // List list = casesMajorTypeDao.findList(from.builder()); - List listFields=null; + List listFields = null; try { listFields = casesMajorTypeDao.findListFields(from.builder()); } catch (Exception e) { - log.error("查询失败",e); + log.error("查询失败", e); } List list1 = new ArrayList<>(); - if(listFields!=null && !listFields.isEmpty()){ - for (Object[] obj:listFields) { + if (listFields != null && !listFields.isEmpty()) { + for (Object[] obj : listFields) { list1.add((String) obj[1]); } } - if(list1!=null &&!list1.isEmpty()){ - query.addFilter(FieldFilters.in("id",list1)); - }else { + if (list1 != null && !list1.isEmpty()) { + query.addFilter(FieldFilters.in("id", list1)); + } else { //如果所点击的内容分类都没有案例数据，应该返回空 return page; } } - if(StringUtils.isNotBlank(caseVo.getCaseType())){ - filters.add(FieldFilters.eq("caseType",caseVo.getCaseType())); + if (StringUtils.isNotBlank(caseVo.getCaseType())) { + filters.add(FieldFilters.eq("caseType", caseVo.getCaseType())); } - if(caseVo.getBreCommend()!=null){ - if(!caseVo.getBreCommend()){ - filters.add(FieldFilters.eq("breCommend",0)); - }else { + if (caseVo.getBreCommend() != null) { + if (!caseVo.getBreCommend()) { + filters.add(FieldFilters.eq("breCommend", 0)); + } else { filters.add(FieldFilters.eq("breCommend", 1)); } } - if(caseVo.getIsTop()!=null && caseVo.getIsTop()) { + if (caseVo.getIsTop() != null && caseVo.getIsTop()) { query.addOrder(OrderCondition.desc("isTop")); query.addOrder(OrderCondition.desc("topTime")); } - //如果选择的是优秀案例，那么这里就按优秀案例的试试排序 - if(caseVo.getExcellent()!=null && caseVo.getExcellent()){ - filters.add(FieldFilters.eq("excellent",caseVo.getExcellent())); + //如果选择的是优秀案例，那么这里就按优秀案例的试试排序 + if (caseVo.getExcellent() != null && caseVo.getExcellent()) { + filters.add(FieldFilters.eq("excellent", caseVo.getExcellent())); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } - - + + query.addFilters(filters); query.addOrder(order); query.setPageIndex(pageIndex); @@ -165,162 +165,29 @@ public class CasesServiceImpl implements ICasesService { /** * 案例分页查询，用于门户的查询 v2 - * */ + */ @Override public PageList queryPageCasesV2(CasePageVo caseVo) { - QueryBuilder query=QueryBuilder.from(Cases.class); - PageList page=null; - List filters = new ArrayList<>(); - filters.add(FieldFilters.eq("deleted",false)); - List likes=new ArrayList(); - likes.add(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword1", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword2", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword3", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword4", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword5", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - List notInIds = caseVo.getNotInIds(); - if (CollUtil.isNotEmpty(notInIds)) { - filters.add(FieldFilters.notIn("id", notInIds)); - } - - if(StringUtil.isNotBlank(caseVo.getKeyWord())) { - filters.add(FieldFilters.or(likes)); - } - - List orgDomainDtos = caseVo.getOrgDomainDtos(); - IFieldFilter orgDomain = null; - if(CollUtil.isNotEmpty(orgDomainDtos)){ - for (int i = 0; i < orgDomainDtos.size(); i++) { - OrgDomainDto domainDto = orgDomainDtos.get(i); - String orgDomainParent = domainDto.getOrgDomainParent(); - String orgDomainParent2 = domainDto.getOrgDomainParent2(); - String orgDomainParent3 = domainDto.getOrgDomainParent3(); - List fieldFilters = new ArrayList<>(); - IFieldFilter itemFilter = null; - if (StrUtil.isNotBlank(orgDomainParent)) { - itemFilter = FieldFilters.eq("orgDomainParent",orgDomainParent); - } - if (StrUtil.isNotBlank(orgDomainParent2)) { - IFieldFilter orgDomainParentFilter = FieldFilters.eq("orgDomainParent2", orgDomainParent2); - if (Objects.nonNull(itemFilter)) { - itemFilter = FieldFilters.and(itemFilter, orgDomainParentFilter); - } else { - itemFilter = orgDomainParentFilter; - } - } - if (StrUtil.isNotBlank(orgDomainParent3)) { - IFieldFilter orgDomainParent3Filter = FieldFilters.eq("orgDomainParent3", orgDomainParent3); - if (Objects.nonNull(itemFilter)) { - itemFilter = FieldFilters.and(itemFilter, orgDomainParent3Filter); - } else { - itemFilter = orgDomainParent3Filter; - } - } - if (i==0) { - orgDomain = itemFilter; - } else { - orgDomain = FieldFilters.or(orgDomain, itemFilter); - } - } - } - if (Objects.nonNull(orgDomain)) { - filters.add(orgDomain); - } - //创建时间过滤 - List years = caseVo.getYears(); - if (CollUtil.isNotEmpty(years)) { - FieldFilters.in("YEAR(sysCreateTime)",years); - } - - //增加只是查询有附件的 - filters.add(FieldFilters.isNotNull("filePath")); - filters.add(FieldFilters.ne("filePath","")); - - if(StringUtil.isNotBlank(caseVo.getMajorType())){ - - QueryBuilder from = QueryBuilder.from(CasesMajorType.class); - //前端直接字符串拼接传，后端转化数组 - if(caseVo.getMajorType().contains(",")){ - String[] split = caseVo.getMajorType().split(","); - List strings = Arrays.asList(split); - from.addFilter(FieldFilters.in("majorId",strings)); - }else{ - from.addFilter(FieldFilters.eq("majorId",caseVo.getMajorType())); - } - from.addGroupBy("caseId"); - from.addFields("id","caseId"); -// List list = casesMajorTypeDao.findList(from.builder()); - List listFields=null; - try { - listFields = casesMajorTypeDao.findListFields(from.builder()); - } catch (Exception e) { - log.error("查询失败",e); - } - List list1 = new ArrayList<>(); - if(listFields!=null && !listFields.isEmpty()){ - for (Object[] obj:listFields) { - list1.add((String) obj[1]); - } - } - if(list1!=null &&!list1.isEmpty()){ - query.addFilter(FieldFilters.in("id",list1)); - }else { - //如果所点击的内容分类都没有案例数据，应该返回空 - return page; - } - } - - if(StringUtils.isNotBlank(caseVo.getCaseType())){ - filters.add(FieldFilters.eq("caseType",caseVo.getCaseType())); - } - if(caseVo.getBreCommend()!=null){ - if(!caseVo.getBreCommend()){ - filters.add(FieldFilters.eq("breCommend",0)); - }else { - filters.add(FieldFilters.eq("breCommend", 1)); - } - } - if(caseVo.getIsTop()!=null && caseVo.getIsTop()) { - query.addOrder(OrderCondition.desc("isTop")); - query.addOrder(OrderCondition.desc("topTime")); - } - //如果选择的是优秀案例，那么这里就按优秀案例的试试排序 - if(caseVo.getExcellent()!=null && caseVo.getExcellent()){ - filters.add(FieldFilters.eq("excellent",caseVo.getExcellent())); - } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); - } - }else { - order=OrderCondition.desc("sysCreateTime"); - } - - query.addFilters(filters); - query.addOrder(order); - query.addOrder(OrderCondition.rand()); - query.setPageIndex(caseVo.getPageIndex()); - query.setPageSize(caseVo.getPageSize()); - page = casesDao.findPage(query.builder()); - - return page; + PageRequest pageRequest = PageRequest.of(caseVo.getPageIndex(), caseVo.getPageSize()); + Page cases = casesRecordDao.queryList(pageRequest, caseVo); + PageList pageList = new PageList<>(); + pageList.setCount((int) cases.getTotalElements()); + pageList.setPageSize(cases.getSize()); + pageList.setList(cases.getContent()); + return pageList; } @Override public PageList queryRecommendPageCasesV2(CasePageVo caseVo) { - String hql = "SELECT c.* FROM CasesRecommendPushRecord as rp INNER JOIN Cases as c ON rp.caseId = c.id WHERE 1 = 1"; + String hql = "select b.* from boe_cases_recommend_push_record a LEFT JOIN boe_cases b on. a.case_id = b.id\n" + + "where a.push_user_id=1 GROUP BY b.id ORDER BY a.sys_create_time DESC"; - QueryBuilder query=QueryBuilder.from(Cases.class); - PageList page=null; + QueryBuilder query = QueryBuilder.from(Cases.class); + PageList page = null; List filters = new ArrayList<>(); - filters.add(FieldFilters.eq("deleted",false)); - List likes=new ArrayList(); + filters.add(FieldFilters.eq("deleted", false)); + List likes = new ArrayList(); likes.add(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); likes.add(FieldFilters.like("keyword1", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); @@ -333,13 +200,13 @@ public class CasesServiceImpl implements ICasesService { filters.add(FieldFilters.notIn("id", notInIds)); } - if(StringUtil.isNotBlank(caseVo.getKeyWord())) { + if (StringUtil.isNotBlank(caseVo.getKeyWord())) { filters.add(FieldFilters.or(likes)); } List orgDomainDtos = caseVo.getOrgDomainDtos(); IFieldFilter orgDomain = null; - if(CollUtil.isNotEmpty(orgDomainDtos)){ + if (CollUtil.isNotEmpty(orgDomainDtos)) { for (int i = 0; i < orgDomainDtos.size(); i++) { OrgDomainDto domainDto = orgDomainDtos.get(i); String orgDomainParent = domainDto.getOrgDomainParent(); @@ -348,7 +215,7 @@ public class CasesServiceImpl implements ICasesService { List fieldFilters = new ArrayList<>(); IFieldFilter itemFilter = null; if (StrUtil.isNotBlank(orgDomainParent)) { - itemFilter = FieldFilters.eq("orgDomainParent",orgDomainParent); + itemFilter = FieldFilters.eq("orgDomainParent", orgDomainParent); } if (StrUtil.isNotBlank(orgDomainParent2)) { IFieldFilter orgDomainParentFilter = FieldFilters.eq("orgDomainParent2", orgDomainParent2); @@ -366,7 +233,7 @@ public class CasesServiceImpl implements ICasesService { itemFilter = orgDomainParent3Filter; } } - if (i==0) { + if (i == 0) { orgDomain = itemFilter; } else { orgDomain = FieldFilters.or(orgDomain, itemFilter); @@ -379,76 +246,75 @@ public class CasesServiceImpl implements ICasesService { //创建时间过滤 List years = caseVo.getYears(); if (CollUtil.isNotEmpty(years)) { - FieldFilters.in("YEAR(sysCreateTime)",years); + FieldFilters.in("YEAR(sysCreateTime)", years); } //增加只是查询有附件的 filters.add(FieldFilters.isNotNull("filePath")); - filters.add(FieldFilters.ne("filePath","")); + filters.add(FieldFilters.ne("filePath", "")); - if(StringUtil.isNotBlank(caseVo.getMajorType())){ + if (StringUtil.isNotBlank(caseVo.getMajorType())) { QueryBuilder from = QueryBuilder.from(CasesMajorType.class); //前端直接字符串拼接传，后端转化数组 - if(caseVo.getMajorType().contains(",")){ + if (caseVo.getMajorType().contains(",")) { String[] split = caseVo.getMajorType().split(","); List strings = Arrays.asList(split); - from.addFilter(FieldFilters.in("majorId",strings)); - }else{ - from.addFilter(FieldFilters.eq("majorId",caseVo.getMajorType())); + from.addFilter(FieldFilters.in("majorId", strings)); + } else { + from.addFilter(FieldFilters.eq("majorId", caseVo.getMajorType())); } from.addGroupBy("caseId"); - from.addFields("id","caseId"); + from.addFields("id", "caseId"); // List list = casesMajorTypeDao.findList(from.builder()); - List listFields=null; + List listFields = null; try { listFields = casesMajorTypeDao.findListFields(from.builder()); } catch (Exception e) { - log.error("查询失败",e); + log.error("查询失败", e); } List list1 = new ArrayList<>(); - if(listFields!=null && !listFields.isEmpty()){ - for (Object[] obj:listFields) { + if (listFields != null && !listFields.isEmpty()) { + for (Object[] obj : listFields) { list1.add((String) obj[1]); } } - if(list1!=null &&!list1.isEmpty()){ - query.addFilter(FieldFilters.in("id",list1)); - }else { + if (list1 != null && !list1.isEmpty()) { + query.addFilter(FieldFilters.in("id", list1)); + } else { //如果所点击的内容分类都没有案例数据，应该返回空 return page; } } - if(StringUtils.isNotBlank(caseVo.getCaseType())){ - filters.add(FieldFilters.eq("caseType",caseVo.getCaseType())); + if (StringUtils.isNotBlank(caseVo.getCaseType())) { + filters.add(FieldFilters.eq("caseType", caseVo.getCaseType())); } - if(caseVo.getBreCommend()!=null){ - if(!caseVo.getBreCommend()){ - filters.add(FieldFilters.eq("breCommend",0)); - }else { + if (caseVo.getBreCommend() != null) { + if (!caseVo.getBreCommend()) { + filters.add(FieldFilters.eq("breCommend", 0)); + } else { filters.add(FieldFilters.eq("breCommend", 1)); } } - if(caseVo.getIsTop()!=null && caseVo.getIsTop()) { + if (caseVo.getIsTop() != null && caseVo.getIsTop()) { query.addOrder(OrderCondition.desc("isTop")); query.addOrder(OrderCondition.desc("topTime")); } //如果选择的是优秀案例，那么这里就按优秀案例的试试排序 - if(caseVo.getExcellent()!=null && caseVo.getExcellent()){ - filters.add(FieldFilters.eq("excellent",caseVo.getExcellent())); + if (caseVo.getExcellent() != null && caseVo.getExcellent()) { + filters.add(FieldFilters.eq("excellent", caseVo.getExcellent())); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } - query.addFilters(filters); query.addOrder(order); query.addOrder(OrderCondition.rand()); @@ -460,36 +326,37 @@ public class CasesServiceImpl implements ICasesService { } /** - * 案例分页查询，是否置顶*/ + * 案例分页查询，是否置顶 + */ @Override public PageList managerList(int pageIndex, int pageSize, CaseVo caseVo) { - QueryBuilder query=QueryBuilder.from(Cases.class); - query.addFilter(FieldFilters.eq("deleted",false)); - if(StringUtils.isNotBlank(caseVo.getKeyWord())){ + QueryBuilder query = QueryBuilder.from(Cases.class); + query.addFilter(FieldFilters.eq("deleted", false)); + if (StringUtils.isNotBlank(caseVo.getKeyWord())) { query.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); } - if(StringUtils.isNotBlank(caseVo.getOrgDomain())){ - query.addFilter(FieldFilters.eq("orgDomainParent",caseVo.getOrgDomain())); + if (StringUtils.isNotBlank(caseVo.getOrgDomain())) { + query.addFilter(FieldFilters.eq("orgDomainParent", caseVo.getOrgDomain())); } - if(caseVo.getExcellent()!=null){ - query.addFilter(FieldFilters.eq("excellent",caseVo.getExcellent())); + if (caseVo.getExcellent() != null) { + query.addFilter(FieldFilters.eq("excellent", caseVo.getExcellent())); } // if(StringUtil.isNotBlank(caseVo.getMajorType())){ // query.addFilter(FieldFilters.eq("majorType",caseVo.getMajorType())); // } - if(caseVo.getIsTop()!=null) { - query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); + if (caseVo.getIsTop() != null) { + query.addFilter(FieldFilters.eq("isTop", caseVo.getIsTop())); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } query.addOrder(order); query.setPageIndex(pageIndex); @@ -502,34 +369,34 @@ public class CasesServiceImpl implements ICasesService { public PageList queryList(int pageIndex, int pageSize, CaseVo caseVo) { PageList pageList = new PageList<>(); pageList.setList(new ArrayList()); - QueryBuilder query=QueryBuilder.from(Cases.class); - query.addFilter(FieldFilters.eq("deleted",false)); - if(StringUtils.isNotBlank(caseVo.getKeyWord())){ + QueryBuilder query = QueryBuilder.from(Cases.class); + query.addFilter(FieldFilters.eq("deleted", false)); + if (StringUtils.isNotBlank(caseVo.getKeyWord())) { query.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); } - if(StringUtils.isNotBlank(caseVo.getAuthorName())){ + if (StringUtils.isNotBlank(caseVo.getAuthorName())) { query.addFilter(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, caseVo.getAuthorName())); } - if(caseVo.getIsTop()!=null) { - query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); + if (caseVo.getIsTop() != null) { + query.addFilter(FieldFilters.eq("isTop", caseVo.getIsTop())); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } query.addOrder(order); query.setPageIndex(pageIndex); query.setPageSize(pageSize); - query.addFields("id","title","coverUrl","authorId","authorName","companyId"); + query.addFields("id", "title", "coverUrl", "authorId", "authorName", "companyId"); try { PageList pageFields = casesDao.findPageFields(query.builder()); - for (Object[] o:pageFields.getList()) { + for (Object[] o : pageFields.getList()) { CasesFiledVo casesFiledVo = new CasesFiledVo(); casesFiledVo.setId((String) o[0]); casesFiledVo.setTitle((String) o[1]); @@ -550,37 +417,37 @@ public class CasesServiceImpl implements ICasesService { @Override public PageList myList(int pageIndex, int pageSize, CaseVo caseVo, String aid) { - QueryBuilder query=QueryBuilder.from(Cases.class); - query.addFilter(FieldFilters.eq("deleted",false)); - if(StringUtils.isNotBlank(caseVo.getKeyWord())){ + QueryBuilder query = QueryBuilder.from(Cases.class); + query.addFilter(FieldFilters.eq("deleted", false)); + if (StringUtils.isNotBlank(caseVo.getKeyWord())) { query.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); } - if(StringUtils.isNotBlank(caseVo.getOrgDomain())){ - query.addFilter(FieldFilters.eq("orgDomainParent",caseVo.getOrgDomain())); + if (StringUtils.isNotBlank(caseVo.getOrgDomain())) { + query.addFilter(FieldFilters.eq("orgDomainParent", caseVo.getOrgDomain())); } - if(caseVo.getExcellent()!=null){ - query.addFilter(FieldFilters.eq("excellent",caseVo.getExcellent())); + if (caseVo.getExcellent() != null) { + query.addFilter(FieldFilters.eq("excellent", caseVo.getExcellent())); } // if(StringUtil.isNotBlank(caseVo.getMajorType())){ // query.addFilter(FieldFilters.eq("majorType",caseVo.getMajorType())); // } - if(caseVo.getIsTop()!=null) { - query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); + if (caseVo.getIsTop() != null) { + query.addFilter(FieldFilters.eq("isTop", caseVo.getIsTop())); } - if(StringUtils.isNotBlank(aid)){ - query.addFilter(FieldFilters.eq("authorId",aid)); + if (StringUtils.isNotBlank(aid)) { + query.addFilter(FieldFilters.eq("authorId", aid)); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } query.addOrder(order); query.setPageIndex(pageIndex); @@ -592,37 +459,37 @@ public class CasesServiceImpl implements ICasesService { @Override public List myList(CaseVo caseVo, String aid) { - QueryBuilder query=QueryBuilder.from(Cases.class); - query.addFilter(FieldFilters.eq("deleted",false)); - if(StringUtils.isNotBlank(caseVo.getKeyWord())){ + QueryBuilder query = QueryBuilder.from(Cases.class); + query.addFilter(FieldFilters.eq("deleted", false)); + if (StringUtils.isNotBlank(caseVo.getKeyWord())) { query.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); } - if(StringUtils.isNotBlank(caseVo.getOrgDomain())){ - query.addFilter(FieldFilters.eq("orgDomainParent",caseVo.getOrgDomain())); + if (StringUtils.isNotBlank(caseVo.getOrgDomain())) { + query.addFilter(FieldFilters.eq("orgDomainParent", caseVo.getOrgDomain())); } - if(caseVo.getExcellent()!=null){ - query.addFilter(FieldFilters.eq("excellent",caseVo.getExcellent())); + if (caseVo.getExcellent() != null) { + query.addFilter(FieldFilters.eq("excellent", caseVo.getExcellent())); } // if(StringUtil.isNotBlank(caseVo.getMajorType())){ // query.addFilter(FieldFilters.eq("majorType",caseVo.getMajorType())); // } - if(caseVo.getIsTop()!=null) { - query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); + if (caseVo.getIsTop() != null) { + query.addFilter(FieldFilters.eq("isTop", caseVo.getIsTop())); } - if(StringUtils.isNotBlank(aid)){ - query.addFilter(FieldFilters.eq("authorId",aid)); + if (StringUtils.isNotBlank(aid)) { + query.addFilter(FieldFilters.eq("authorId", aid)); } - OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { - if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { - order=OrderCondition.asc(caseVo.getOrderField()); - }else { - order=OrderCondition.desc(caseVo.getOrderField()); + OrderCondition order = null; + if (StringUtils.isNotBlank(caseVo.getOrderField())) { + if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) { + order = OrderCondition.asc(caseVo.getOrderField()); + } else { + order = OrderCondition.desc(caseVo.getOrderField()); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } query.addOrder(order); @@ -633,25 +500,29 @@ public class CasesServiceImpl implements ICasesService { /** * 设置置顶 - * */ + */ @Override public void updateTop(String id, Integer isTop) { - if(isTop==0) { - casesDao.updateMultiFieldById(id,UpdateBuilder.create("isTop",false),UpdateBuilder.create("topTime",null)); - }else { - casesDao.updateMultiFieldById(id,UpdateBuilder.create("isTop",true),UpdateBuilder.create("topTime",LocalDateTime.now())); - } + if (isTop == 0) { + casesDao.updateMultiFieldById(id, UpdateBuilder.create("isTop", false), UpdateBuilder.create("topTime", null)); + } else { + casesDao.updateMultiFieldById(id, UpdateBuilder.create("isTop", true), UpdateBuilder.create("topTime", LocalDateTime.now())); + } } + /** - *删除案例 */ + * 删除案例 + */ @Override public void delete(String id) { casesDao.setDeleted(id); } + /** - * 案例详情*/ + * 案例详情 + */ @Override - public Cases selectById(String id,boolean addView) { + public Cases selectById(String id, boolean addView) { Cases cases = casesDao.get(id); // if(StringUtils.isNotBlank(cases.getMajorType())){ // DictItem dictItem = sysDictionaryDao.detail("major_type", cases.getMajorType()); @@ -661,25 +532,27 @@ public class CasesServiceImpl implements ICasesService { // DictItem dictItem1 = sysDictionaryDao.detail("org_domain",cases.getOrgDomain()); // cases.setOrgDomain(dictItem1.getName()); // } - if(addView) { - casesDao.updateMultiFieldById(id,UpdateBuilder.create("views","views+1", FieldUpdateType.EXPRESSION)); + if (addView) { + casesDao.updateMultiFieldById(id, UpdateBuilder.create("views", "views+1", FieldUpdateType.EXPRESSION)); } return cases; } + /** - * 作者排行榜*/ + * 作者排行榜 + */ @Override public List usernameList(Integer pageSize) { QueryBuilder builder = QueryBuilder.from(Cases.class); - builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("deleted", false)); builder.addGroupBy("authorId"); builder.addOrder(OrderCondition.desc("count(authorId)")); builder.setPageSize(pageSize); - builder.addFields("authorName","count(authorId)"); + builder.addFields("authorName", "count(authorId)"); List list = new ArrayList<>(); try { List listFields = casesDao.findListFields(builder.builder()); - for (Object[] o:listFields) { + for (Object[] o : listFields) { UsernameDto usernameDto = new UsernameDto(); usernameDto.setSysCreateUname((String) o[0]); usernameDto.setCounts((Long) o[1]); @@ -691,32 +564,33 @@ public class CasesServiceImpl implements ICasesService { return list; } + /** * 首页案例 - * */ + */ @Override public List caseRandom(Integer pageSize, String orderField, Boolean orderAsc) { - + QueryBuilder builder = QueryBuilder.from(Cases.class); - builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("deleted", false)); builder.addOrder(OrderCondition.desc("isTop")); builder.addOrder(OrderCondition.desc("topTime")); - OrderCondition order=null; - if(StringUtils.isNotBlank(orderField)) { - if(orderAsc==null|| orderAsc) { - order=OrderCondition.asc(orderField); - }else { - order=OrderCondition.desc(orderField); + OrderCondition order = null; + if (StringUtils.isNotBlank(orderField)) { + if (orderAsc == null || orderAsc) { + order = OrderCondition.asc(orderField); + } else { + order = OrderCondition.desc(orderField); } - }else { - order=OrderCondition.desc("sysCreateTime"); + } else { + order = OrderCondition.desc("sysCreateTime"); } builder.addOrder(order); builder.setPageSize(pageSize); - builder.addFields("id","title","summary","coverUrl","comments","praises","favorites","sysCreateAid","sysCreateBy","sysCreateTime","authorId","authorName"); + builder.addFields("id", "title", "summary", "coverUrl", "comments", "praises", "favorites", "sysCreateAid", "sysCreateBy", "sysCreateTime", "authorId", "authorName"); List list = casesDao.findList(builder.builder()); List caseDtos = new ArrayList<>(); - for (Object[] o:list) { + for (Object[] o : list) { CaseDto caseDto = new CaseDto(); caseDto.setId((String) o[0]); caseDto.setTitle((String) o[1]); @@ -728,8 +602,8 @@ public class CasesServiceImpl implements ICasesService { caseDto.setSysCreateAid((String) o[7]); caseDto.setSysCreateBy((String) o[8]); caseDto.setSysCreateTime(LocalDateTime.parse(o[9].toString())); - caseDto.setAuthorId((String)o[10]); - caseDto.setAuthorName((String)o[11]); + caseDto.setAuthorId((String) o[10]); + caseDto.setAuthorName((String) o[11]); caseDtos.add(caseDto); } return caseDtos; @@ -738,14 +612,14 @@ public class CasesServiceImpl implements ICasesService { @Override public List queryPraises(Integer pageSize) { QueryBuilder builder = QueryBuilder.from(Cases.class); - builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("deleted", false)); builder.addOrder(OrderCondition.desc("views")); builder.setPageSize(pageSize); - builder.addFields("id","title","views","authorName","coverUrl","summary","favorites","praises","shares","comments","views"); + builder.addFields("id", "title", "views", "authorName", "coverUrl", "summary", "favorites", "praises", "shares", "comments", "views"); List list = new ArrayList<>(); try { List listFields = casesDao.findListFields(builder.builder()); - for (Object[] o:listFields) { + for (Object[] o : listFields) { CaseRankingDto caseRankingDto = new CaseRankingDto(); caseRankingDto.setId((String) o[0]); caseRankingDto.setTitle((String) o[1]); @@ -770,17 +644,17 @@ public class CasesServiceImpl implements ICasesService { @Override public List queryComment(Integer pageSize) { QueryBuilder builder = QueryBuilder.from(Cases.class); - builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("deleted", false)); builder.addOrder(OrderCondition.desc("praises")); builder.setPageSize(pageSize); - builder.addFields("id","title","praises","authorName","coverUrl","summary","favorites","praises","shares","comments","views"); + builder.addFields("id", "title", "praises", "authorName", "coverUrl", "summary", "favorites", "praises", "shares", "comments", "views"); List list = new ArrayList<>(); try { List listFields = casesDao.findListFields(builder.builder()); - if(listFields.size()==0){ + if (listFields.size() == 0) { return list; } - for (Object[] o:listFields) { + for (Object[] o : listFields) { CaseRankingDto caseRankingDto = new CaseRankingDto(); caseRankingDto.setId((String) o[0]); caseRankingDto.setTitle((String) o[1]); @@ -813,7 +687,7 @@ public class CasesServiceImpl implements ICasesService { cases.setFavorites(0); StringBuffer stringBuffer = new StringBuffer(); List majorIds = cases.getMajorIds(); - for (String s:majorIds){ + for (String s : majorIds) { CasesMajorType casesMajorType = new CasesMajorType(); casesMajorType.setCaseId(cases.getId()); casesMajorType.setMajorId(s); @@ -821,7 +695,7 @@ public class CasesServiceImpl implements ICasesService { stringBuffer.append(s); stringBuffer.append(","); } - stringBuffer.deleteCharAt(stringBuffer.length()-1); + stringBuffer.deleteCharAt(stringBuffer.length() - 1); cases.setMajorIds(majorIds); cases.setMajorType(stringBuffer.toString()); casesDao.save(cases); @@ -831,11 +705,11 @@ public class CasesServiceImpl implements ICasesService { public void update(Cases cases) { List majorIds = cases.getMajorIds(); List caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId())); - for (CasesMajorType c:caseId) { + for (CasesMajorType c : caseId) { casesMajorTypeDao.deleteById(c.getId()); } StringBuffer stringBuffer = new StringBuffer(); - for (String s:majorIds){ + for (String s : majorIds) { CasesMajorType casesMajorType = new CasesMajorType(); casesMajorType.setCaseId(cases.getId()); casesMajorType.setMajorId(s); @@ -843,7 +717,7 @@ public class CasesServiceImpl implements ICasesService { stringBuffer.append(s); stringBuffer.append(","); } - stringBuffer.deleteCharAt(stringBuffer.length()-1); + stringBuffer.deleteCharAt(stringBuffer.length() - 1); cases.setMajorIds(majorIds); cases.setMajorType(stringBuffer.toString()); casesDao.update(cases); @@ -852,19 +726,19 @@ public class CasesServiceImpl implements ICasesService { @Override public List majorTypes() { List major_type = sysDictionaryDao.findByKey("major_type"); - String hql="select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId"; + String hql = "select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId"; List listByHql = casesDao.findListByHql(hql); List dictItems = new ArrayList<>(); - for (DictItem d:major_type) { - for (Object[] objs:listByHql) { - String s=(String)objs[0]; - if(d.getCode().equals(s)){ - d.setExplanation(objs[1].toString()); + for (DictItem d : major_type) { + for (Object[] objs : listByHql) { + String s = (String) objs[0]; + if (d.getCode().equals(s)) { + d.setExplanation(objs[1].toString()); dictItems.add(d); } } } - return dictItems; + return dictItems; } @@ -880,16 +754,16 @@ public class CasesServiceImpl implements ICasesService { @Override public List caseIndex(Integer type) { QueryBuilder builder = QueryBuilder.from(Cases.class); - builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("deleted", false)); builder.setPageSize(3); List casesVos = new ArrayList<>(); - builder.addFields("id","title","summary","coverUrl","comments","praises","favorites","sysCreateAid","sysCreateBy","sysCreateTime","authorId","authorName","views"); - if(type==2){ + builder.addFields("id", "title", "summary", "coverUrl", "comments", "praises", "favorites", "sysCreateAid", "sysCreateBy", "sysCreateTime", "authorId", "authorName", "views"); + if (type == 2) { builder.addOrder(OrderCondition.desc("views")); List list = casesDao.findList(builder.builder()); - Integer order=1; - for (Object[] o:list) { + Integer order = 1; + for (Object[] o : list) { CasesVo casesVo = new CasesVo(); casesVo.setId((String) o[0]); casesVo.setTitle((String) o[1]); @@ -901,18 +775,18 @@ public class CasesServiceImpl implements ICasesService { casesVo.setSysCreateAid((String) o[7]); casesVo.setSysCreateBy((String) o[8]); casesVo.setSysCreateTime(LocalDateTime.parse(o[9].toString())); - casesVo.setAuthorId((String)o[10]); - casesVo.setAuthorName((String)o[11]); + casesVo.setAuthorId((String) o[10]); + casesVo.setAuthorName((String) o[11]); casesVo.setViews((Integer) o[12]); casesVo.setOrder(order); order++; casesVos.add(casesVo); } - }else{ + } else { builder.addOrder(OrderCondition.desc("sysCreateTime")); List list = casesDao.findList(builder.builder()); - Integer order=1; - for (Object[] o:list) { + Integer order = 1; + for (Object[] o : list) { CasesVo casesVo = new CasesVo(); casesVo.setId((String) o[0]); casesVo.setTitle((String) o[1]); @@ -924,8 +798,8 @@ public class CasesServiceImpl implements ICasesService { casesVo.setSysCreateAid((String) o[7]); casesVo.setSysCreateBy((String) o[8]); casesVo.setSysCreateTime(LocalDateTime.parse(o[9].toString())); - casesVo.setAuthorId((String)o[10]); - casesVo.setAuthorName((String)o[11]); + casesVo.setAuthorId((String) o[10]); + casesVo.setAuthorName((String) o[11]); casesVo.setViews((Integer) o[12]); casesVos.add(casesVo); } @@ -936,15 +810,14 @@ public class CasesServiceImpl implements ICasesService { @Override public void excellent(String id, Boolean excellent) { - //取消时，把时间清空 - if(excellent) { - casesDao.updateMultiFieldById(id,UpdateBuilder.create("excellent",excellent),UpdateBuilder.create("excellentTime",LocalDateTime.now())); - }else { - casesDao.updateMultiFieldById(id,UpdateBuilder.create("excellent",excellent),UpdateBuilder.create("excellentTime",null)); - } - + //取消时，把时间清空 + if (excellent) { + casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", LocalDateTime.now())); + } else { + casesDao.updateMultiFieldById(id, UpdateBuilder.create("excellent", excellent), UpdateBuilder.create("excellentTime", null)); + } + } - }