Merge branch 'release-知象光电' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/SceneFileController.java

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -1,10 +1,12 @@
 package com.fdkankan.contro.controller;
 
 import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.exception.BusinessException;
@@ -16,6 +18,7 @@ import com.fdkankan.contro.vo.ReportFailLogVO;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.SceneParam;
 import com.fdkankan.contro.vo.SceneUploadCountParamVO;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.web.util.RSAEncrypt;
@@ -29,6 +32,7 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 场景文件上传模块
@@ -213,13 +217,26 @@ public class SceneFileController{
 
     @Autowired
     private ISceneZxgdService sceneZxgdService;
+    @Resource
+    FYunFileConfig fYunFileConfig;
 
     @GetMapping("/getZxgd/{search}")
     public ResultData getZxgd(@PathVariable(value = "search") String search) throws Exception{
         LambdaQueryWrapper<SceneZxgd> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(SceneZxgd::getTitle, search).or().like(SceneZxgd::getUnicode, search);
         List<SceneZxgd> list = sceneZxgdService.list(wrapper);
-        return ResultData.ok(list);
+        if(CollUtil.isEmpty(list)){
+            return ResultData.ok();
+        }
+        List<JSONObject> collect = list.stream().map(v -> {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("名称", v.getTitle());
+            jsonObject.put("unicode", v.getUnicode());
+            jsonObject.put("状态", CommonSuccessStatus.get(v.getStatus()).message());
+            jsonObject.put("url", fYunFileConfig.getHost() + "zxgd/" + v.getUnicode() + "/mesh.ply");
+            return jsonObject;
+        }).collect(Collectors.toList());
+        return ResultData.ok(collect);
     }
 
 }