1

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

@@ -34,8 +34,9 @@ public class CaseFusionController {
     IFusionNumService fusionNumService;
 
     @GetMapping("/list")
-    public ResultData allList(@RequestParam(required = false) Integer caseId){
-        return ResultData.ok(fusionNumService.getListByCaseId(caseId));
+    public ResultData allList(@RequestParam(required = false) Integer caseId,
+                              @RequestHeader String token){
+        return ResultData.ok(fusionNumService.getListByCaseId(caseId,token));
     }
 
     @PostMapping("/add")

src/main/java/com/fdkankan/fusion/request/CaseParam.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.request;
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;
 
+import java.util.HashMap;
 import java.util.List;
 
 @Data
@@ -10,4 +11,5 @@ public class CaseParam extends RequestBase {
     private Integer caseId;
     private String caseTitle;
     private List<SceneNumParam> sceneNumParam;
+    private HashMap<Integer,List<String>> typeMap;
 }

src/main/java/com/fdkankan/fusion/service/IFusionNumService.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service;
 import com.fdkankan.fusion.entity.FusionNum;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.request.FusionParam;
+import com.fdkankan.fusion.response.SceneVo;
 
 import java.util.List;
 
@@ -20,7 +21,7 @@ public interface IFusionNumService extends IService<FusionNum> {
 
     List<FusionNum> getListByFusionIdList(List<Integer> fusionIdList);
 
-    List<FusionNum> getListByCaseId(Integer caseId);
+    List<SceneVo> getListByCaseId(Integer caseId, String token);
 
     void add(FusionParam param);
 }

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

@@ -65,10 +65,13 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(param.getCaseId() == null){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
-        HashMap<Integer, List<String>> typeMap = caseNumService.getTypeMap(param.getCaseId());
+        if(param.getTypeMap() == null){
+            HashMap<Integer, List<String>> typeMap = caseNumService.getTypeMap(param.getCaseId());
+            param.setTypeMap(typeMap);
+        }
         List<SceneVo> listAll = new ArrayList<>();
-        for (Integer type : typeMap.keySet()) {
-            List<String> numList = typeMap.get(type);
+        for (Integer type : param.getTypeMap().keySet()) {
+            List<String> numList = param.getTypeMap().get(type);
             if(numList ==null || numList.size() <=0){
                 continue;
             }
@@ -77,7 +80,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
                 scenePram.setType(type);
                 scenePram.setPageNum(1);
                 scenePram.setPageSize(99999);
-                scenePram.setNumList(typeMap.get(type));
+                scenePram.setNumList(param.getTypeMap().get(type));
                 PageInfo pageInfo = sceneService.pageList(scenePram,token);
                 List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
                 listAll.addAll(list1);

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

@@ -6,8 +6,11 @@ import com.fdkankan.fusion.entity.CaseFusion;
 import com.fdkankan.fusion.entity.FusionNum;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.mapper.IFusionNumMapper;
+import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.FusionParam;
+import com.fdkankan.fusion.response.SceneVo;
 import com.fdkankan.fusion.service.ICaseFusionService;
+import com.fdkankan.fusion.service.ICaseService;
 import com.fdkankan.fusion.service.IFusionNumService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -32,6 +36,8 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
 
     @Autowired
     ICaseFusionService caseFusionService;
+    @Autowired
+    ICaseService caseService;
 
     @Override
     public List<FusionNum> getByNum(String num) {
@@ -49,13 +55,33 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
     }
 
     @Override
-    public List<FusionNum> getListByCaseId(Integer caseId) {
+    public List<SceneVo> getListByCaseId(Integer caseId, String token) {
         List<CaseFusion> fusionList = caseFusionService.getListByCaseId(caseId);
         if(fusionList.size()<=0){
             return new ArrayList<>();
         }
         List<Integer> fusionIdList = fusionList.parallelStream().map(CaseFusion::getFusionId).collect(Collectors.toList());
-        return getListByFusionIdList(fusionIdList);
+        List<FusionNum> listByFusionIdList = getListByFusionIdList(fusionIdList);
+        CaseParam param =new CaseParam();
+        HashMap<Integer, List<String>> typeMap = this.getTypeMap(listByFusionIdList);
+        param.setTypeMap(typeMap);
+        param.setCaseId(caseId);
+        return caseService.sceneList(param,token);
+    }
+
+    private HashMap<Integer, List<String>> getTypeMap( List<FusionNum> list) {
+        HashMap<Integer,List<String>> typeMap = new HashMap<>();
+        for (FusionNum fusionNum : list) {
+            List<String> numList ;
+            if(typeMap.get(fusionNum.getNumType()) == null){
+                numList = new ArrayList<>();
+            }else {
+                numList = typeMap.get(fusionNum.getNumType());
+            }
+            numList.add(fusionNum.getNum());
+            typeMap.put(fusionNum.getNumType(),numList);
+        }
+        return typeMap;
     }
 
     @Override

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

@@ -101,7 +101,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                 CreateObjUtil.unRar(newObjFile.getPath(),objPath);
             }
 
-            OBJToGLBUtil.objToGlb(objPath,glbPath);
+            OBJToGLBUtil.objToGlb(objPath+"/"+modelName,glbPath+"/"+modelName);
             uploadToOssUtil.upload(glbPath,glbOssPath);
 
             model.setCreateStatus(1);  //上传成功
@@ -120,6 +120,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         String username = JwtUtil.getUsername(token);
         LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Model::getUserName,username);
+        wrapper.eq(Model::getType,3);
         if(StringUtils.isNotBlank(param.getModelTitle())){
             wrapper.like(Model::getModelTitle,param.getModelTitle());
         }