1

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

@@ -26,7 +26,9 @@ public interface IModelService extends IService<Model> {
 
     void delete(Integer modelId);
 
-    List<Model> getListByModeId(List<String> numList);
+    List<Model> getListByNum(List<String> numList);
 
     void deleteByNum(List<String> numList);
+
+    List<Model> getByUserName(String username);
 }

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -83,14 +84,22 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             PageInfo pageInfo = sceneService.pageList(scenePram,token);
             List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
             listAll.addAll(list1);
-            List<SceneVo> voList = new ArrayList<>();
-            List<Model> modelList = modelService.getListByModeId(numList);
-            for (Model model : modelList) {
-                SceneVo sceneVo = new SceneVo();
-                BeanUtils.copyProperties(model,sceneVo);
-                voList.add(sceneVo);
-            }
-            listAll.addAll(voList);
+
+        }
+        List<String> numList = listAll.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+        //设置模型
+        List<Model> modelList = modelService.getListByNum(numList);
+        HashMap<String,Model> map = new HashMap<>();
+        modelList.forEach(entity-> map.put(entity.getNum(),entity));
+        for (SceneVo sceneVo : listAll) {
+            BeanUtils.copyProperties(map.get(sceneVo.getNum()),sceneVo);
+        }
+        String username = JwtUtil.getUsername(token);
+        List<Model> models = modelService.getByUserName(username);
+        for (Model model : models) {
+            SceneVo sceneVo = new SceneVo();
+            BeanUtils.copyProperties(model,sceneVo);
+            listAll.add(sceneVo);
         }
         return listAll;
     }

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

@@ -141,9 +141,9 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
     }
 
     @Override
-    public List<Model> getListByModeId(List<String> numList) {
+    public List<Model> getListByNum(List<String> numList) {
         LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(Model::getModelId,numList);
+        wrapper.in(Model::getNum,numList);
         return this.list(wrapper);
     }
 
@@ -153,4 +153,12 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         wrapper.in(Model::getNum,numList);
         this.remove(wrapper);
     }
+
+    @Override
+    public List<Model> getByUserName(String username) {
+        LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Model::getUserName,username)
+                .eq(Model::getType,3);
+        return this.list(wrapper);
+    }
 }