1

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

@@ -1,9 +1,12 @@
 package com.fdkankan.fusion.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +20,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_case")
+@TableName(value = "t_case",autoResultMap = true)
 public class CaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -75,4 +78,59 @@ public class CaseEntity implements Serializable {
     private String deptName;
     @TableField(exist = false)
     private String cover;
+
+
+    /**
+     * 案件编号
+     */
+    @TableField("case_num")
+    private String caseNum;
+    /**
+     * 案件类别
+     */
+    @TableField("case_category")
+    private String caseCategory;
+
+    /**
+     * 案发区域
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray caseRegion;
+
+
+    /**
+     * 案发地址
+     */
+    @TableField("case_address")
+    private String caseAddress;
+
+    /**
+     * 是否命案，0否，1是
+     */
+    @TableField("homicide_case")
+    private Integer homicideCase;
+    /**
+     * 是否刑案，0否，1是
+     */
+    @TableField("criminal_case")
+    private Integer criminalCase;
+
+    /**
+     * 案发时间
+     */
+    @TableField("crime_time")
+    private String crimeTime;
+
+    /**
+     * 是否展示场景0否，1是
+     */
+    @TableField("show_scenes")
+    private Integer showScenes;
+
+
+    @TableField("map_id")
+    private Integer mapId;
+
+    @TableField(exist = false)
+    public MapConfig mapConfig;
 }

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

@@ -48,6 +48,9 @@ public class CaseFiles implements Serializable {
     @TableField("files_url")
     private String filesUrl;
 
+    @TableField("ogn_files_url")
+    private String ognFilesUrl;
+
     @TableField("tb_status")
     @TableLogic
     private Integer tbStatus;
@@ -76,6 +79,9 @@ public class CaseFiles implements Serializable {
     @TableField("img_type")
     private Integer imgType;
 
+    @TableField("create_type")
+    private String createType;
+
     /**
      * 现场图或方位图json
      */

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

@@ -47,5 +47,12 @@ public class CaseFilesType implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("parent_id")
+    private Integer parentId;
 
+    @TableField("modal_show")
+    private Integer modalShow;
+
+    @TableField("flat_show")
+    private Integer flatShow;
 }

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

@@ -37,6 +37,9 @@ public class CaseLive implements Serializable {
     @TableField("tm_user_id")
     private String tmUserId;
 
+    @TableField("user_name")
+    private String userName;
+
     @TableField("take_room_id")
     private String takeRoomId;
 
@@ -54,4 +57,6 @@ public class CaseLive implements Serializable {
     private Date updateTime;
 
 
+    @TableField(exist = false)
+    private String num;
 }

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

@@ -1,10 +1,7 @@
 package com.fdkankan.fusion.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
@@ -46,13 +43,13 @@ public class CaseSettings implements Serializable {
     /**
      * 封面图
      */
-    @TableField("cover")
+    @TableField(value = "cover",updateStrategy = FieldStrategy.IGNORED)
     private String cover;
 
     /**
      * 背景，天空
      */
-    @TableField("back")
+    @TableField(value = "back",updateStrategy = FieldStrategy.IGNORED)
     private String back;
 
     /**
@@ -62,7 +59,7 @@ public class CaseSettings implements Serializable {
      *   bottomImage = "bimg",
      *   icon = "icon",
      */
-    @TableField("back_type")
+    @TableField(value = "back_type",updateStrategy = FieldStrategy.IGNORED)
     private String backType;
 
     @TableField("open_compass")
@@ -90,4 +87,10 @@ public class CaseSettings implements Serializable {
 
     @TableField("rotate")
     private Double rotate;
+
+    @TableField(value = "map_id",updateStrategy = FieldStrategy.IGNORED)
+    private Integer mapId;
+
+    @TableField(exist = false)
+    private MapConfig mapConfig;
 }

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

@@ -119,5 +119,12 @@ public class CaseTag implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("show3d_title")
+    private Integer show3dTitle;
 
+    @TableField("audio")
+    private String audio;
+
+    @TableField("file_name")
+    private String fileName;
 }

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

@@ -67,4 +67,29 @@ public class CaseTagPoint implements Serializable {
 
     @TableField("bind_hide")
     private String bindHide;
+
+
+    @TableField("global_visibility")
+    private Integer globalVisibility;
+
+    @TableField("type")
+    private String type;
+
+    @TableField("mat")
+    private String mat;
+
+    @TableField("font_size")
+    private Integer fontSize;
+
+    @TableField("line_height")
+    private String lineHeight;
+
+    @TableField("visibility_range")
+    private Integer visibilityRange;
+
+    @TableField("normal")
+    private String normal;
+
+    @TableField("pose")
+    private String pose;
 }

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

@@ -72,5 +72,15 @@ public class FusionGuide implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("show_taggings")
+    private Boolean showTaggings;
 
+    @TableField("show_measure")
+    private Boolean showMeasure;
+
+    @TableField("show_monitor")
+    private Boolean showMonitor;
+
+    @TableField("show_path")
+    private Boolean showPath;
 }

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

@@ -80,5 +80,7 @@ public class FusionGuidePath implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("play_animation")
+    private Boolean playAnimation;
 
 }

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

@@ -57,6 +57,8 @@ public class HotIcon implements Serializable {
     private Integer isNew;
     @TableField("case_id")
     private Integer caseId;
+    @TableField("sort")
+    private Integer sort;
 
     @TableField("tb_status")
     @TableLogic

src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 @Data
-@Configuration
 public class SceneVo extends Model {
     private Long id;
     private Integer buildObjStatus;

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

@@ -60,6 +60,9 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     @Autowired
     ICaseSettingsService caseSettingsService;
 
+    @Autowired
+    IMapConfigService mapConfigService;
+
     @Override
     public PageInfo pageList(CaseParam param,String userName) {
         LambdaQueryWrapper<CaseEntity> wrapper = new LambdaQueryWrapper<>();
@@ -99,6 +102,18 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             }
         }
 
+        List<Integer> mapIds = page.getRecords().stream().map(CaseEntity::getMapId).collect(Collectors.toList());
+        if(!mapIds.isEmpty()){
+            HashMap<Integer,MapConfig> map = mapConfigService.getMapByIds(mapIds);
+            for (CaseEntity caseEntity : page.getRecords()) {
+                if(caseEntity.getMapId() != null && map.get(caseEntity.getMapId()) != null){
+                    MapConfig mapConfig = map.get(caseEntity.getMapId());
+                    caseEntity.setMapConfig(mapConfig);
+                }
+            }
+        }
+
+
         Set<String> deptIds1 = page.getRecords().stream().filter(entity -> StringUtils.isNotBlank(entity.getDeptId()))
                 .map(CaseEntity::getDeptId).collect(Collectors.toSet());
         HashMap<String, TmDepartment> mapByDeptIds = tmDepartmentService.getMapByDeptIds(deptIds1);

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

@@ -2,12 +2,17 @@ package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.entity.CaseSettings;
+import com.fdkankan.fusion.entity.MapConfig;
 import com.fdkankan.fusion.mapper.ICaseSettingsMapper;
 import com.fdkankan.fusion.service.ICaseSettingsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fusion.service.IMapConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -20,10 +25,25 @@ import java.util.List;
 @Service
 public class CaseSettingsServiceImpl extends ServiceImpl<ICaseSettingsMapper, CaseSettings> implements ICaseSettingsService {
 
+    @Autowired
+    IMapConfigService mapConfigService;
     @Override
     public List<CaseSettings> getByCaseId(Integer caseId) {
         LambdaQueryWrapper<CaseSettings> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseSettings::getCaseId,caseId);
-        return this.list(wrapper);
+        List<CaseSettings> list = this.list(wrapper);
+        List<Integer> mapIds = list.stream().map(CaseSettings::getMapId).collect(Collectors.toList());
+        if(!mapIds.isEmpty()){
+            HashMap<Integer,MapConfig> map = mapConfigService.getMapByIds(mapIds);
+            for (CaseSettings caseSettings : list) {
+                if(caseSettings.getMapId() != null && map.get(caseSettings.getMapId()) != null){
+                    MapConfig mapConfig = map.get(caseSettings.getMapId());
+                    caseSettings.setMapConfig(mapConfig);
+                }
+
+            }
+        }
+
+        return list;
     }
 }