1

src/main/java/com/fdkankan/fusion/entity/CaseFusion.java

@@ -57,5 +57,9 @@ public class CaseFusion implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField(exist = false)
+    private String createUserName;
 
+    @TableField(exist = false)
+    private String deptName;
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFusionServiceImpl.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.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +54,10 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
     ITmDepartmentService departmentService;
     @Autowired
     ISceneDeptShareService sceneDeptShareService;
+    @Autowired
+    ITmUserService tmUserService;
+    @Autowired
+    ITmDepartmentService tmDepartmentService;
 
     @Override
     public List<CaseFusion> getListByCaseId(Integer caseId) {
@@ -150,6 +155,23 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
             param.getDeptIds().addAll(sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList()));
         }
         Page<CaseFusion> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+        Set<String> userIds = page.getRecords().stream().map(CaseFusion::getSysUserId).collect(Collectors.toSet());
+        HashMap<String, TmUser> byIds = tmUserService.getByIds(userIds);
+        Set<String> collect = byIds.values().stream().map(TmUser::getDeptId).collect(Collectors.toSet());
+        HashMap<String,TmDepartment> deptMap = tmDepartmentService.getMapByDeptIds(collect);
+
+        for (CaseFusion record : page.getRecords()) {
+            if(record.getSysUserId() != null){
+                TmUser tmUser = byIds.get(record.getSysUserId());
+                if(tmUser != null){
+                    record.setCreateUserName(tmUser.getUserName());
+                    TmDepartment department = deptMap.get(tmUser.getDeptId());
+                    if(department != null){
+                        record.setDeptName(department.getName());
+                    }
+                }
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 }

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

@@ -85,7 +85,7 @@ public class SceneService implements ISceneService {
             List<String> collect = tmCameraList.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
             param.setSnCodes(collect);
         }
-        if(param.getSnCodes().isEmpty() || param.getNumList().isEmpty()){
+        if(param.getSnCodes().isEmpty() && param.getNumList().isEmpty()){
             return PageInfo.PageInfoEmpty();
         }
         Page<SceneVo> sceneVoPage = scenePlusService.sceneList(param);
@@ -103,6 +103,7 @@ public class SceneService implements ISceneService {
                 sceneVo.setDeptId(tmDepartment.getId());
                 sceneVo.setDeptName(tmDepartment.getName());
             }
+            sceneVo.setStatus(setLaserStatus(sceneVo.getStatus(),sceneVo.getPayStatus()));
             if(modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
                 sceneVo.setStatus(5);
             }
@@ -110,41 +111,9 @@ public class SceneService implements ISceneService {
         return PageInfo.PageInfo(sceneVoPage);
     }
 
-    /**
-     * 四维看看返回数据格式转换
-     */
-    private List<SceneVo> overSceneVo(JSONArray list,Integer type) {
-        List<SceneVo> sceneVoList = new ArrayList<>();
-        for (Object obj : list) {
-            String res = JSONObject.toJSONString(obj);
-            SceneProEntityVo fdkkScenePlusVo = JSONObject.parseObject(res, SceneProEntityVo.class);
-            SceneVo sceneVo = new SceneVo();
-            sceneVo.setId(fdkkScenePlusVo.getId());
-            sceneVo.setBuildObjStatus(0);
-            sceneVo.setCreateTime(fdkkScenePlusVo.getCreateTime());
-            sceneVo.setName(fdkkScenePlusVo.getSceneName());
-            sceneVo.setNum(fdkkScenePlusVo.getNum());
-            sceneVo.setPayStatus(1);
-            sceneVo.setSceneName(fdkkScenePlusVo.getSceneName());
-            sceneVo.setSnCode(fdkkScenePlusVo.getSnCode());
-            sceneVo.setStatus(setLaserStatus(fdkkScenePlusVo.getStatus(),fdkkScenePlusVo.getPayStatus()));
-            sceneVo.setThumb(fdkkScenePlusVo.getThumb());
-            sceneVo.setTitle(fdkkScenePlusVo.getSceneName());
-            sceneVo.setViewCount(fdkkScenePlusVo.getViewCount());
-            sceneVo.setIsLaser(false);
-            sceneVo.setType(type);
-            sceneVo.setOrientation(fdkkScenePlusVo.getOrientation());
-            sceneVo.setRtkLocation(fdkkScenePlusVo.getRtkLocation());
-            if(fdkkScenePlusVo.getUserId()== null){
-                sceneVo.setBind(false);
-            }
-            sceneVoList.add(sceneVo);
-        }
-        return sceneVoList;
-    }
 
     private Integer setLaserStatus(Integer status,Integer payStatus){
-        //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
+        //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中 ,5排队
         if(status == 0){
             return 0;
         }