返回模型数据

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

@@ -37,24 +37,7 @@ public class SceneApiController extends BaseController{
         param.setPageNum(1);
         param.setPageSize(10000);
         param.setStatus(2);
-        PageInfo pageInfo = sceneService.pageList(param, getToken());
-        List<SceneVo> listAll = (List<SceneVo>) pageInfo.getList();
-        if(listAll.size() >0){
-            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) {
-                String createTime = sceneVo.getCreateTime();
-                Model model = map.get(sceneVo.getNum());
-                if(model == null){
-                    continue;
-                }
-                BeanUtils.copyProperties(model,sceneVo);
-                sceneVo.setCreateTime(createTime);
-            }
-        }
-        return ResultData.ok();
+        return ResultData.ok( sceneService.getSceneListAndModel(param));
+
     }
 }

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

@@ -2,8 +2,13 @@ package com.fdkankan.fusion.service;
 
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.request.ScenePram;
+import com.fdkankan.fusion.response.SceneVo;
+
+import java.util.List;
 
 public interface ISceneService {
 
     PageInfo pageList(ScenePram param, String token);
+
+    List<SceneVo> getSceneListAndModel(ScenePram param);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.JwtUtil;
 import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -26,7 +27,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SceneService implements ISceneService {
@@ -39,6 +42,29 @@ public class SceneService implements ISceneService {
     IModelService modelService;
 
     @Override
+    public List<SceneVo> getSceneListAndModel(ScenePram param) {
+        PageInfo pageInfo = this.pageList(param, null);
+        List<SceneVo> listAll = (List<SceneVo>) pageInfo.getList();
+        if(listAll.size() >0){
+            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) {
+                String createTime = sceneVo.getCreateTime();
+                Model model = map.get(sceneVo.getNum());
+                if(model == null){
+                    continue;
+                }
+                BeanUtils.copyProperties(model,sceneVo);
+                sceneVo.setCreateTime(createTime);
+            }
+        }
+        return listAll;
+    }
+
+    @Override
     public PageInfo pageList(ScenePram param, String token) {
         if(param.getType() == null){
            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);