修改热门词汇

fill-manager/src/main/java/com/mortals/xhx/module/baseset/service/impl/BasesetServiceImpl.java

 package com.mortals.xhx.module.baseset.service.impl;
 
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
@@ -15,6 +16,7 @@ import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.service.BasesetService;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -37,7 +39,13 @@ public class BasesetServiceImpl extends AbstractCRUDServiceImpl<BasesetDao, Base
     @Override
     protected void findAfter(BasesetEntity params, PageInfo pageInfo, Context context, List<BasesetEntity> list) throws AppException {
         list.forEach(item -> {
-            List<HotwordEntity> hotwordEntities = hotwordService.find(new HotwordQuery().siteId(item.getSiteId()));
+            HotwordQuery hotwordQuery = new HotwordQuery();
+            hotwordQuery.siteId(item.getSiteId());
+            List<OrderCol> orderColList = new ArrayList<>();
+            orderColList.add(new OrderCol("wordsSource", OrderCol.ASCENDING));
+            orderColList.add(new OrderCol("searchCount", OrderCol.DESCENDING));
+            hotwordQuery.setOrderColList(orderColList);
+            List<HotwordEntity> hotwordEntities = hotwordService.find(hotwordQuery);
             item.setHotwordList(hotwordEntities);
         });
         super.findAfter(params, pageInfo, context, list);

fill-manager/src/main/java/com/mortals/xhx/module/baseset/web/BasesetController.java

@@ -54,14 +54,11 @@ public class BasesetController extends BaseCRUDJsonBodyMappingController<Baseset
 
     @Override
     protected void saveBefore(BasesetEntity entity, Map<String, Object> model, Context context) throws AppException {
-
         BasesetEntity basesetEntity = this.service.selectOne(new BasesetQuery().siteId(entity.getSiteId()));
         if(!ObjectUtils.isEmpty(basesetEntity)){
             entity.setId(basesetEntity.getId());
             entity.setUpdateTime(new Date());
         }
-
-
         super.saveBefore(entity, model, context);
     }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -285,8 +285,8 @@ public class HomeController extends BaseJsonBodyController {
             HotwordQuery hotwordQuery = new HotwordQuery();
             hotwordQuery.siteId(homeQueryPdu.getSiteId());
             List<OrderCol> orderColList = new ArrayList<>();
-            orderColList.add(new OrderCol("searchCount", OrderCol.DESCENDING));
             orderColList.add(new OrderCol("wordsSource", OrderCol.ASCENDING));
+            orderColList.add(new OrderCol("searchCount", OrderCol.DESCENDING));
             hotwordQuery.setOrderColList(orderColList);
 
             PageInfo pageInfo = new PageInfo();