Merge branches 'branch-cwf' and 'master' of http://192.168.2.241:3000/linzhiwei/tofly-river into branch-cwf

src/main/java/com/tofly/river/model/common/dto/ViewportManagementBaseInfoDto.java

@@ -24,15 +24,12 @@ public class ViewportManagementBaseInfoDto implements Serializable {
 
     private Long id;
 
-    @ApiModelProperty(value = "视图编码")
-    private String markCode;
+    @ApiModelProperty(value = "视图名称")
+    private String markName;
 
     @ApiModelProperty(value = "空间范围")
     private String extent;
 
-    @ApiModelProperty(value = "文件id")
-    private String fileId;
-
     @ApiModelProperty(value = "相机参数JSON")
     private String camera;
 

src/main/java/com/tofly/river/model/common/po/ViewportManagementBaseInfo.java

@@ -30,18 +30,14 @@ public class ViewportManagementBaseInfo implements Serializable {
     @TableId(value = "id",type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "视图编码")
-    @TableField("mark_code")
-    private String markCode;
+    @ApiModelProperty(value = "视图名称")
+    @TableField("mark_name")
+    private String markName;
 
     @ApiModelProperty(value = "空间范围")
     @TableField("extent")
     private String extent;
 
-    @ApiModelProperty(value = "文件(图片/视频)id")
-    @TableField("file_id")
-    private String fileId;
-
     @ApiModelProperty(value = "相机参数JSON")
     @TableField("camera")
     private String camera;

src/main/java/com/tofly/river/model/common/vo/ViewportManagementBaseInfoVo.java

@@ -25,18 +25,12 @@ public class ViewportManagementBaseInfoVo implements Serializable {
 
     private Long id;
 
-    @ApiModelProperty(value = "视图编码")
-    private String markCode;
-
     @ApiModelProperty(value = "视图名称")
     private String markName;
 
     @ApiModelProperty(value = "空间范围")
     private String extent;
 
-    @ApiModelProperty(value = "文件(图片/视频)Id")
-    private String fileId;
-
     @ApiModelProperty(value = "相机参数JSON")
     private String camera;
 

src/main/java/com/tofly/river/service/common/impl/ViewportManagementBaseInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.tofly.river.service.common.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.river.common.GlobalConstantTypeEnum;
 import com.tofly.river.mapper.common.ViewportManagementBaseInfoMapper;
@@ -30,37 +31,16 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class ViewportManagementBaseInfoServiceImpl extends ServiceImpl<ViewportManagementBaseInfoMapper, ViewportManagementBaseInfo> implements IViewportManagementBaseInfoService {
-    @Autowired
-    private IDictionaryBaseInfoService iDictionaryBaseInfoService;
+
 
     @Override
     public List<ViewportManagementBaseInfoVo> viewConversion(List<ViewportManagementBaseInfo> infoList) {
-        List<ViewportManagementBaseInfoVo> infoVoList = new ArrayList<>();
-        Map<String, Map<String, String>> globalConstantTypeEnumMap = iDictionaryBaseInfoService.getGlobalConstantTypeEnumMap();
-        infoList.forEach(info ->{
-            // 需要添加(视点名称/用户名称)
-            ViewportManagementBaseInfoVo baseInfoVo = JSON.parseObject(JSON.toJSONString(info), ViewportManagementBaseInfoVo.class);
-            baseInfoVo.setMarkName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.VIEWPOINT.getCode()).get(info.getMarkCode()));
-            baseInfoVo.setUserName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.USER.getCode()).get(info.getUserCode()));
-            infoVoList.add(baseInfoVo);
-        });
-        return infoVoList;
+
+        return JSONArray.parseArray(JSON.toJSONString(infoList),ViewportManagementBaseInfoVo.class);
     }
 
     @Override
     public void indexUpdate(List<ViewportManagementBaseInfo> infoList) {
-        Map<String,List<String>> indexMap = new HashMap<>(12);
-        List<String> codeList = infoList.stream().map(ViewportManagementBaseInfo::getMarkCode).collect(Collectors.toList());
-        indexMap.put(GlobalConstantTypeEnum.VIEWPOINT.getCode(),codeList);
-        log.info("视点数据索引更新 list= {} ",JSON.toJSONString(codeList));
-        // 反转数据 赋值索引
-        iDictionaryBaseInfoService.indexUpdate(indexMap);
-        Map<String, String> stringMap = iDictionaryBaseInfoService.getGlobalConstantTypeEnumMap().get(GlobalConstantTypeEnum.VIEWPOINT.getCode()).entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
-        infoList.forEach(info -> {
-            String code = info.getMarkCode();
-            if(stringMap.size() > 0 && stringMap.containsKey(code)){
-                info.setMarkCode(stringMap.get(code));
-            }
-        });
+
     }
 }