默认icon

src/main/java/com/fdkankan/fusion/controller/HotIconController.java

@@ -80,6 +80,9 @@ public class HotIconController extends BaseController{
         if(hotIcon.getIconId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(hotIcon.getIconId() == 1){
+            return ResultData.ok();
+        }
         caseTagService.updateDFHotIcon(hotIcon.getIconId());
         hotIconService.removeById(hotIcon.getIconId());
         return ResultData.ok();

src/main/java/com/fdkankan/fusion/service/impl/HotIconServiceImpl.java

@@ -87,20 +87,24 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
 
     @Override
     public List<HotIcon> getListByCaseId(Integer caseId) {
+        List<Integer> hotIconId = new ArrayList<>();
         List<CaseTag> list = caseTagService.getListByCaseId(caseId);
         if(list.size() >0){
-            List<Integer> hotIconId = list.parallelStream().map(CaseTag::getHotIconId).collect(Collectors.toList());
-            if(hotIconId.size() >0){
-                return this.getByIds(hotIconId);
-            }
+            hotIconId = list.parallelStream().map(CaseTag::getHotIconId).collect(Collectors.toList());
         }
-        return new ArrayList<>();
+        hotIconId.add(getDefaultIcon().getIconId());
+        return this.getByIds(hotIconId);
     }
 
     @Override
     public List<HotIcon> getByIds(List<Integer> hotIconId) {
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(HotIcon::getIconId,hotIconId);
+        wrapper.orderByDesc(HotIcon::getIsSystem)           // 官方默认
+                .orderByDesc(HotIcon::getIsNew)           // 新增
+                .orderByDesc(HotIcon::getLastUse)         // 上次使用
+                .orderByDesc(HotIcon::getUseNum)          // 使用次数
+                .orderByDesc(HotIcon::getCreateTime);
         return this.list(wrapper);
     }
 }

src/main/resources/application-dev.yaml

@@ -48,4 +48,7 @@ spring:
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
     basePath: http://test.4dkankan.com/qjkankan
+    port: 80
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
     port: 80

src/main/resources/application-local.yaml

@@ -50,4 +50,7 @@ spring:
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
     basePath: http://test.4dkankan.com/qjkankan
+    port: 80
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
     port: 80