1111

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/BatchSaveVisualAngleDTO.java

@@ -0,0 +1,12 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchSaveVisualAngleDTO extends WorkIdDto{
+
+    private List<WorkVisualAngleDTO> list;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/DeleteWorkHotDTO.java

@@ -0,0 +1,42 @@
+package com.gis.domain.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 热点
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeleteWorkHotDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id", required = true)
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+    /**
+     * 作品id
+     */
+    @ApiModelProperty(value = "作品id", required = true)
+    @NotBlank(message = "workId不能为空")
+    private String workId;
+
+}
+

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskDto.java

@@ -15,7 +15,6 @@ import java.io.Serializable;
  * @since 2023-09-06 14:37
  */
 @Data
-@ApiModel("遮罩设置表")
 public class WorkCustomMaskDto   {
 
 
@@ -25,8 +24,11 @@ public class WorkCustomMaskDto   {
     @ApiModelProperty("wordid")
     private String workId;
 
-    @ApiModelProperty("sceneCode")
-    private String sceneCode;
+    @ApiModelProperty("素材id")
+    private Long fodderId;
+
+    @ApiModelProperty("导航id")
+    private Long navigationId;
 
     @ApiModelProperty("图片地址	")
     private String icon;
@@ -36,4 +38,7 @@ public class WorkCustomMaskDto   {
 
     @ApiModelProperty("类型 earth sky")
     private String type;
+
+    @ApiModelProperty("缩放")
+    private Double scale;
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkHotDTO.java

@@ -0,0 +1,112 @@
+package com.gis.domain.dto;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 热点
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkHotDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 作品id
+     */
+    @ApiModelProperty(value = "作品id", required = true)
+    @NotBlank(message = "workId不能为空")
+    private String workId;
+
+    /**
+     * 场景id
+     */
+    @ApiModelProperty(value = "导航id", required = true)
+    @NotNull(message = "navigationId不能为空")
+    private Long navigationId;
+
+    /**
+     * 列表图标路径
+     */
+    @ApiModelProperty(value = "列表图标路径")
+    private String img;
+
+    /**
+     * 列表图标类型
+     */
+    @ApiModelProperty(value = "列表图标类型")
+    private String icontype;
+
+    /**
+     * 热点图标类型
+     */
+    @ApiModelProperty(value = "热点图标类型")
+    private String hotspotIconType;
+
+    /**
+     * 是否显示标题
+     */
+    @ApiModelProperty(value = "是否显示标题")
+    private String titleDisplaMode;
+
+    /**
+     * 引用素材
+     */
+    @ApiModelProperty(value = "引用素材")
+    private JSONArray fodderId;
+
+    /**
+     * 标题位置
+     */
+    @ApiModelProperty(value = "标题位置")
+    private String titlePosition;
+
+    /**
+     * 热点类型
+     */
+    @ApiModelProperty(value = "热点类型")
+    private String hotspotType;
+
+    /**
+     * 图标大小
+     */
+    @ApiModelProperty(value = "图标大小")
+    private Integer size;
+
+    /**
+     * 不知道有啥用，但是需要保存
+     */
+    @ApiModelProperty(value = "name")
+    private String name;
+
+    /**
+     * 热点标题
+     */
+    @ApiModelProperty(value = "热点标题")
+    private String hotspotTitle;
+
+    @ApiModelProperty(value = "热点内容")
+    private JSONObject content;
+}
+

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkMaskBatchSaveDTO.java

@@ -0,0 +1,13 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class WorkMaskBatchSaveDTO extends WorkIdDto{
+
+    @NotEmpty(message = "数据不能为空")
+    List<WorkCustomMaskDto> list;
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkNavigationDTO.java

@@ -16,7 +16,6 @@ import java.util.List;
  * @since 2023-09-08 18:13
  */
 @Data
-@ApiModel("作品导航表")
 public class WorkNavigationDTO  extends WorkIdDto implements Serializable {
 
     @ApiModelProperty("id")

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkVisualAngleDTO.java

@@ -0,0 +1,37 @@
+package com.gis.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 视角设置表
+ * </p>
+ *
+ * @author
+ * @since 2024-04-15
+ */
+@Data
+public class WorkVisualAngleDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private Long navigationId;
+
+    private Double vlookat;
+
+    private Double hlookat;
+
+    private Integer vlookatmin;
+
+    private Integer vlookatmax;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkCustomMaskEntity.java

@@ -26,6 +26,12 @@ public class WorkCustomMaskEntity extends BaseEntity implements Serializable {
     @ApiModelProperty("wordid")
     private String workId;
 
+    @ApiModelProperty("navigation_id")
+    private Long navigationId;
+
+    @ApiModelProperty("素材id")
+    private Long fodderId;
+
     @ApiModelProperty("图片地址")
     private String icon;
 

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkExplanation.java

@@ -67,7 +67,7 @@ public class WorkExplanation implements Serializable {
     /**
      * 循环播放
      */
-    @TableField("repeat")
+    @TableField("play_repeat")
     private Boolean playRepeat;
 
     /**

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkHot.java

@@ -0,0 +1,123 @@
+package com.gis.domain.entity;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 热点
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Getter
+@Setter
+@TableName("tb_work_hot")
+public class WorkHot implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 作品id
+     */
+    @TableField("workId")
+    private String workId;
+
+    /**
+     * 场景id
+     */
+    @TableField("navigation_id")
+    private Long navigationId;
+
+    /**
+     * 列表图标路径
+     */
+    @TableField("img")
+    private String img;
+
+    /**
+     * 列表图标类型
+     */
+    @TableField("icontype")
+    private String icontype;
+
+    /**
+     * 热点图标类型
+     */
+    @TableField("hotspot_icon_type")
+    private String hotspotIconType;
+
+    /**
+     * 是否显示标题
+     */
+    @TableField("title_displa_mode")
+    private String titleDisplaMode;
+
+    /**
+     * 引用素材
+     */
+    @TableField("fodder_id")
+    private String fodderId;
+
+    /**
+     * 标题位置
+     */
+    @TableField("title_position")
+    private String titlePosition;
+
+    /**
+     * 热点类型
+     */
+    @TableField("hotspot_type")
+    private String hotspotType;
+
+    /**
+     * 图标大小
+     */
+    @TableField("size")
+    private Integer size;
+
+    /**
+     * 不知道有啥用，但是需要保存
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 热点标题
+     */
+    @TableField("hotspot_title")
+    private String hotspotTitle;
+
+    @TableField("content")
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_delete")
+    @TableLogic(value = "0", delval = "1")
+    private Integer isDelete;
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkBackgroundMusicVo.java

@@ -11,7 +11,6 @@ import lombok.Data;
  * @since 2023-09-05 20:57
  */
 @Data
-@ApiModel("背景音乐表")
 public class WorkBackgroundMusicVo {
 
     @ApiModelProperty(value = "对象ID")

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkCoverTypeVo.java

@@ -11,7 +11,6 @@ import lombok.Data;
  * @since 2023-09-05 19:21
  */
 @Data
-@ApiModel("开场封面表")
 public class WorkCoverTypeVo {
     @ApiModelProperty(value = "对象ID")
     private Long id;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkCustomButtonVo.java

@@ -11,7 +11,6 @@ import lombok.Data;
  * @since 2023-09-06 14:50
  */
 @Data
-@ApiModel("自定义按钮设置表")
 public class WorkCustomButtonVo {
 
     @ApiModelProperty(value = "对象ID")

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkCustomMaskVO.java

@@ -0,0 +1,47 @@
+package com.gis.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 遮罩设置表
+ *
+ * @author Xiewj
+ * @since 2023-09-06 14:37
+ */
+@Data
+public class WorkCustomMaskVO extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("wordid")
+    private String workId;
+
+    @ApiModelProperty("导航id")
+    private Long navigationId;
+
+    @ApiModelProperty("素材id")
+    private Long fodderId;
+
+    @ApiModelProperty("图片地址")
+    private String icon;
+
+    @ApiModelProperty("开关 默认false")
+    private Boolean isShow;
+
+    @ApiModelProperty("类型 earth sky")
+    private String type;
+
+    @ApiModelProperty("随着场景转动")
+    private Boolean antidistorted;
+
+    @ApiModelProperty("缩放")
+    private Double scale;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkExplanationVo.java

@@ -0,0 +1,60 @@
+package com.gis.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 作品场景讲解
+ * </p>
+ *
+ * @author
+ * @since 2024-04-22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkExplanationVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String workId;
+
+    /**
+     * 场景id
+     */
+    private Long navigationId;
+
+    /**
+     * 是否默认开启
+     */
+    private Boolean openByDefault;
+
+    /**
+     * 文件url
+     */
+    private String audioUrl;
+
+    /**
+     * 文件名
+     */
+    private String audioName;
+
+    /**
+     * 素材id
+     */
+    private Long fodderId;
+
+    /**
+     * 循环播放
+     */
+    private Boolean playRepeat;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkHotVO.java

@@ -0,0 +1,110 @@
+package com.gis.domain.vo;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 热点
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel
+public class WorkHotVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 作品id
+     */
+    @ApiModelProperty(value = "作品id")
+    private String workId;
+
+    /**
+     * 场景id
+     */
+    @ApiModelProperty(value = "导航id")
+    private Long navigationId;
+
+    /**
+     * 列表图标路径
+     */
+    @ApiModelProperty(value = "列表图标路径")
+    private String img;
+
+    /**
+     * 列表图标类型
+     */
+    @ApiModelProperty(value = "列表图标类型")
+    private String icontype;
+
+    /**
+     * 热点图标类型
+     */
+    @ApiModelProperty(value = "热点图标类型")
+    private String hotspotIconType;
+
+    /**
+     * 是否显示标题
+     */
+    @ApiModelProperty(value = "是否显示标题")
+    private String titleDisplaMode;
+
+    /**
+     * 引用素材
+     */
+    @ApiModelProperty(value = "引用素材")
+    private JSONArray fodderId;
+
+    /**
+     * 标题位置
+     */
+    @ApiModelProperty(value = "标题位置")
+    private String titlePosition;
+
+    /**
+     * 热点类型
+     */
+    @ApiModelProperty(value = "热点类型")
+    private String hotspotType;
+
+    /**
+     * 图标大小
+     */
+    @ApiModelProperty(value = "图标大小")
+    private Integer size;
+
+    /**
+     * 不知道有啥用，但是需要保存
+     */
+    @ApiModelProperty(value = "name")
+    private String name;
+
+    /**
+     * 热点标题
+     */
+    @ApiModelProperty(value = "热点标题")
+    private String hotspotTitle;
+
+    @ApiModelProperty(value = "热点内容")
+    private JSONObject content;
+}
+

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkLogoVo.java

@@ -11,7 +11,6 @@ import lombok.Data;
  * @since 2023-09-06 10:21
  */
 @Data
-@ApiModel("logo表")
 public class WorkLogoVo {
 
     @ApiModelProperty(value = "对象ID")

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkSceneVo.java

@@ -15,8 +15,7 @@ import java.io.Serializable;
  * @since 2023-09-08 18:13
  */
 @Data
-@ApiModel("作品场景表")
- public class WorkSceneVo implements Serializable {
+public class WorkSceneVo implements Serializable {
 
     @ApiModelProperty(value = "对象ID")
     private Long id;
@@ -39,10 +38,10 @@ import java.io.Serializable;
     @ApiModelProperty("所属菜单Id")
     private Long parentId;
 
-   @ApiModelProperty("官网场景版本")
-   private String version;
+    @ApiModelProperty("官网场景版本")
+    private String version;
 
-   @ApiModelProperty("素材id")
-   private Long fodderId;
+    @ApiModelProperty("素材id")
+    private Long fodderId;
 
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkViewVo.java

@@ -25,24 +25,41 @@ public class WorkViewVo {
 
     private WorkVo work;
 
+    @ApiModelProperty(value = "开场提示")
     private WorkOpeningTipVo workOpeningTip;
 
+    @ApiModelProperty(value = "开场动画")
     private WorkOpeningAnimationVo WorkOpeningAnimation;
 
+    @ApiModelProperty(value = "开场封面")
     private WorkCoverTypeVo workCoverType;
 
+    @ApiModelProperty(value = "背景音乐")
     private WorkBackgroundMusicVo workBackgroundMusic;
 
+    @ApiModelProperty(value = "自定义logo")
     private WorkLogoVo workLogo;
 
-    private List<WorkCustomButtonVo> workCustomButtonVoList;
+    @ApiModelProperty(value = "自定义按钮")
+    private List<WorkCustomButtonVo> workCustomButtonList;
 
+    @ApiModelProperty(value = "导航树")
     private List<Tree<Long>> navigationTrees;
 
+    @ApiModelProperty(value = "初始场景")
     private WorkSceneVo firstScene;
 
+    @ApiModelProperty(value = "视角")
+    private List<WorkVisualAngleVo>  workVisualAngleList;
 
+    @ApiModelProperty(value = "讲解")
+    private List<WorkExplanationVo>  workExplanationList;
 
+    @ApiModelProperty(value = "热点")
+    private List<WorkHotVO> workHotList;
+
+    @ApiModelProperty(value = "遮罩")
+    private List<WorkCustomMaskVO> workCustomMaskList;
 
 
 

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkVisualAngleVo.java

@@ -0,0 +1,40 @@
+package com.gis.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 视角设置表
+ * </p>
+ *
+ * @author
+ * @since 2024-04-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkVisualAngleVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String workId;
+
+    private Long navigationId;
+
+    private Double vlookat;
+
+    private Double hlookat;
+
+    private Integer vlookatmin;
+
+    private Integer vlookatmax;
+
+}

720yun_fd_manage/gis_generate/src/main/java/com/gis/generate/AutoGenerate.java

@@ -20,7 +20,7 @@ public class AutoGenerate {
         System.out.println(path);
 
         generate(path,"", getTables(new String[]{
-                "tb_work_explanation"
+                "tb_work_hot"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -48,8 +48,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://120.25.146.52:3306/720yun_fd_manage",
-            "root","4dkk2020test%")
+        FastAutoGenerator.create("jdbc:mysql://120.25.146.52:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false",
+            "root","JK123456%JIK")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/WorkHotMapper.java

@@ -0,0 +1,18 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.entity.WorkHot;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 热点 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Mapper
+public interface WorkHotMapper extends BaseMapper<WorkHot> {
+
+}

720yun_fd_manage/gis_mapper/src/main/resources/mapper/WorkHotMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gis.mapper.WorkHotMapper">
+
+</mapper>

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkCustomMaskService.java

@@ -1,7 +1,12 @@
 package com.gis.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.dto.WorkCustomMaskDto;
+import com.gis.domain.dto.WorkMaskBatchSaveDTO;
 import com.gis.domain.entity.WorkCustomMaskEntity;
+import com.gis.domain.vo.WorkCustomMaskVO;
+
+import java.util.List;
 
 /**
  * 遮罩设置表 服务类接口
@@ -11,4 +16,7 @@ import com.gis.domain.entity.WorkCustomMaskEntity;
  */
 public interface WorkCustomMaskService extends IService<WorkCustomMaskEntity> {
 
+    List<WorkCustomMaskVO> batchSave(WorkMaskBatchSaveDTO dto);
+
+    List<WorkCustomMaskEntity> listByWorkId(String workId);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkExplanationService.java

@@ -3,6 +3,7 @@ package com.gis.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.domain.dto.BathSaveWorkExplanationDto;
 import com.gis.domain.entity.WorkExplanation;
+import com.gis.domain.vo.WorkExplanationVo;
 
 import java.util.List;
 
@@ -16,7 +17,9 @@ import java.util.List;
  */
 public interface WorkExplanationService extends IService<WorkExplanation> {
 
-    void bathSaveWorkExplanation(BathSaveWorkExplanationDto dto);
+    List<WorkExplanationVo> bathSaveWorkExplanation(BathSaveWorkExplanationDto dto);
+
+    List<WorkExplanation> listByWorkId(String workId);
 
 
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkHotService.java

@@ -0,0 +1,30 @@
+package com.gis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.dto.DeleteWorkHotDTO;
+import com.gis.domain.dto.WorkHotDTO;
+import com.gis.domain.entity.WorkExplanation;
+import com.gis.domain.entity.WorkHot;
+import com.gis.domain.vo.WorkHotVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 热点 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+public interface WorkHotService extends IService<WorkHot> {
+
+    WorkHotVO save(WorkHotDTO dto);
+
+    WorkHot getByWorkIdAndId(String workdId, Long id);
+
+    void delete(DeleteWorkHotDTO dto);
+
+    List<WorkHot> listByWorkId(String workId);
+
+}

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkVisualAngleService.java

@@ -1,7 +1,11 @@
 package com.gis.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.dto.BatchSaveVisualAngleDTO;
 import com.gis.domain.entity.WorkVisualAngle;
+import com.gis.domain.vo.WorkVisualAngleVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,8 @@ import com.gis.domain.entity.WorkVisualAngle;
  */
 public interface WorkVisualAngleService extends IService<WorkVisualAngle> {
 
+    List<WorkVisualAngleVo> batchSaveVisualAngle(BatchSaveVisualAngleDTO dto);
+
+    List<WorkVisualAngle> listByWorkId(String workId);
+
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkCustomMaskServiceImpl.java

@@ -1,12 +1,23 @@
 package com.gis.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.common.exception.BaseRuntimeException;
+import com.gis.domain.dto.WorkCustomMaskDto;
+import com.gis.domain.dto.WorkMaskBatchSaveDTO;
+import com.gis.domain.vo.WorkCustomMaskVO;
 import com.gis.mapper.WorkCustomMaskMapper;
 import com.gis.service.WorkCustomMaskService;
 import com.gis.domain.entity.WorkCustomMaskEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 遮罩设置表 服务实现类
  *
@@ -15,4 +26,28 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class WorkCustomMaskServiceImpl extends ServiceImpl<WorkCustomMaskMapper,WorkCustomMaskEntity> implements WorkCustomMaskService {
+
+
+    @Override
+    public List<WorkCustomMaskVO> batchSave(WorkMaskBatchSaveDTO dto) {
+
+        List<WorkCustomMaskDto> list = dto.getList();
+        List<Long> ids = list.stream().filter(v -> Objects.nonNull(v.getId())).map(v -> v.getId()).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(ids)){
+            long count = this.count(new LambdaQueryWrapper<WorkCustomMaskEntity>().eq(WorkCustomMaskEntity::getWorkId, dto.getWorkId()).in(WorkCustomMaskEntity::getId, ids));
+            if(ids.size() != count){
+                throw new BaseRuntimeException("id有误");
+            }
+        }
+        List<WorkCustomMaskEntity> workCustomMaskEntities = BeanUtil.copyToList(list, WorkCustomMaskEntity.class);
+        workCustomMaskEntities.stream().forEach(v->v.setWorkId(dto.getWorkId()));
+        this.saveOrUpdateBatch(workCustomMaskEntities);
+
+        return BeanUtil.copyToList(workCustomMaskEntities, WorkCustomMaskVO.class);
+    }
+
+    @Override
+    public List<WorkCustomMaskEntity> listByWorkId(String workId) {
+        return this.list(new LambdaQueryWrapper<WorkCustomMaskEntity>().eq(WorkCustomMaskEntity::getWorkId, workId));
+    }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkExplanationServiceImpl.java

@@ -8,6 +8,7 @@ import com.gis.common.exception.BaseRuntimeException;
 import com.gis.domain.dto.BathSaveWorkExplanationDto;
 import com.gis.domain.dto.WorkExplanationDto;
 import com.gis.domain.entity.WorkExplanation;
+import com.gis.domain.vo.WorkExplanationVo;
 import com.gis.mapper.WorkExplanationMapper;
 import com.gis.service.WorkExplanationService;
 import org.springframework.stereotype.Service;
@@ -29,10 +30,10 @@ import java.util.stream.Collectors;
 public class WorkExplanationServiceImpl extends ServiceImpl<WorkExplanationMapper, WorkExplanation> implements WorkExplanationService {
 
     @Override
-    public void bathSaveWorkExplanation(BathSaveWorkExplanationDto dto) {
+    public List<WorkExplanationVo> bathSaveWorkExplanation(BathSaveWorkExplanationDto dto) {
 
         if(CollUtil.isEmpty(dto.getList())){
-            return;
+            return null;
         }
         List<Long> idList = dto.getList().stream().filter(v -> Objects.nonNull(v.getId())).map(v -> v.getId()).collect(Collectors.toList());
         if(CollUtil.isNotEmpty(idList)){
@@ -50,5 +51,12 @@ public class WorkExplanationServiceImpl extends ServiceImpl<WorkExplanationMappe
         });
 
         this.saveOrUpdateBatch(workExplanations);
+
+        return BeanUtil.copyToList(workExplanations, WorkExplanationVo.class);
+    }
+
+    @Override
+    public List<WorkExplanation> listByWorkId(String workId) {
+        return this.list(new LambdaQueryWrapper<WorkExplanation>().eq(WorkExplanation::getWorkId, workId));
     }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkHotServiceImpl.java

@@ -0,0 +1,69 @@
+package com.gis.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.common.exception.BaseRuntimeException;
+import com.gis.domain.dto.DeleteWorkHotDTO;
+import com.gis.domain.dto.WorkHotDTO;
+import com.gis.domain.entity.WorkHot;
+import com.gis.domain.vo.WorkHotVO;
+import com.gis.mapper.WorkHotMapper;
+import com.gis.service.WorkHotService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 热点 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Service
+public class WorkHotServiceImpl extends ServiceImpl<WorkHotMapper, WorkHot> implements WorkHotService {
+
+    @Override
+    public WorkHot getByWorkIdAndId(String workdId, Long id) {
+        return this.getOne(new LambdaQueryWrapper<WorkHot>().eq(WorkHot::getId, id).eq(WorkHot::getWorkId, workdId));
+    }
+
+    @Override
+    public WorkHotVO save(WorkHotDTO dto) {
+
+        WorkHot workHotDb = null;
+        if(Objects.nonNull(dto.getId())){
+            workHotDb = this.getByWorkIdAndId(dto.getWorkId(), dto.getId());
+            if(Objects.isNull(workHotDb)){
+                throw new BaseRuntimeException("热点不存在");
+            }
+        }
+        WorkHot workHot = BeanUtil.copyProperties(dto, WorkHot.class, "content", "fodderId");
+        workHot.setContent(JSON.toJSONString(dto.getContent()));
+        workHot.setFodderId(JSON.toJSONString(dto.getFodderId()));
+        if(Objects.nonNull(workHotDb)){
+            workHot.setId(workHotDb.getId());
+        }
+
+        this.saveOrUpdate(workHot);
+
+        WorkHotVO vo = BeanUtil.copyProperties(workHot, WorkHotVO.class, "content", "fodderId");
+        vo.setContent(dto.getContent());
+        vo.setFodderId(dto.getFodderId());
+        return vo;
+    }
+
+    @Override
+    public void delete(DeleteWorkHotDTO dto) {
+        this.remove(new LambdaQueryWrapper<WorkHot>().eq(WorkHot::getId, dto.getId()).eq(WorkHot::getWorkId, dto.getWorkId()));
+    }
+
+    @Override
+    public List<WorkHot> listByWorkId(String workId) {
+        return this.list(new LambdaQueryWrapper<WorkHot>().eq(WorkHot::getWorkId, workId));
+    }
+}

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkViewServiceImpl.java

@@ -1,7 +1,9 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.lang.tree.Tree;
+import com.alibaba.fastjson.JSON;
 import com.gis.common.util.Result;
 import com.gis.domain.entity.*;
 import com.gis.domain.vo.*;
@@ -10,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class WorkViewServiceImpl implements WorkViewService {
@@ -30,6 +34,14 @@ public class WorkViewServiceImpl implements WorkViewService {
     private WorkCustomButtonService workCustomButtonService;
     @Autowired
     private WorkNavigationSettingService workNavigationSettingService;
+    @Autowired
+    private WorkVisualAngleService workVisualAngleService;
+    @Autowired
+    private WorkExplanationService workExplanationService;
+    @Autowired
+    private WorkHotService workHotService;
+    @Autowired
+    private WorkCustomMaskService workCustomMaskService;
 
     @Override
     public WorkViewVo getViewInfo(String workId) {
@@ -58,6 +70,28 @@ public class WorkViewServiceImpl implements WorkViewService {
 
         WorkSceneVo initialScene = workNavigationSettingService.getInitialScene(workId);
 
+        //视角
+        List<WorkVisualAngle> workVisualAngles = workVisualAngleService.listByWorkId(workId);
+        List<WorkVisualAngleVo> workVisualAngleVos = BeanUtil.copyToList(workVisualAngles, WorkVisualAngleVo.class);
+
+        //讲解
+        List<WorkExplanation> workExplanations = workExplanationService.listByWorkId(workId);
+        List<WorkExplanationVo> workExplanationVos = BeanUtil.copyToList(workExplanations, WorkExplanationVo.class);
+
+        //热点
+        List<WorkHot> workHots = workHotService.listByWorkId(workId);
+        Map<Long, WorkHot> workHotMap = workHots.stream().collect(Collectors.toMap(WorkHot::getId, v -> v));
+        List<WorkHotVO> workHotVOS = BeanUtil.copyToList(workHots, WorkHotVO.class, new CopyOptions().setIgnoreProperties(WorkHot::getFodderId, WorkHot::getContent));
+        workHotVOS.stream().forEach(v->{
+            WorkHot workHot = workHotMap.get(v.getId());
+            v.setFodderId(JSON.parseArray(workHot.getFodderId()));
+            v.setContent(JSON.parseObject(workHot.getContent()));
+        });
+
+        //遮罩
+        List<WorkCustomMaskEntity> workCustomMaskEntities = workCustomMaskService.listByWorkId(workId);
+        List<WorkCustomMaskVO> workCustomMaskVOS = BeanUtil.copyToList(workCustomMaskEntities, WorkCustomMaskVO.class);
+
         return WorkViewVo.builder()
                 .workId(workId)
                 .work(workVo)
@@ -66,9 +100,13 @@ public class WorkViewServiceImpl implements WorkViewService {
                 .workCoverType(workCoverTypeVo)
                 .workBackgroundMusic(workBackgroundMusicVo)
                 .workLogo(workLogoVo)
-                .workCustomButtonVoList(workCustomButtonVos)
+                .workCustomButtonList(workCustomButtonVos)
                 .navigationTrees(navigationTrees)
                 .firstScene(initialScene)
+                .workVisualAngleList(workVisualAngleVos)
+                .workExplanationList(workExplanationVos)
+                .workHotList(workHotVOS)
+                .workCustomMaskList(workCustomMaskVOS)
                 .build();
     }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkVisualAngleServiceImpl.java

@@ -1,11 +1,20 @@
 package com.gis.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.domain.dto.BatchSaveVisualAngleDTO;
+import com.gis.domain.dto.WorkVisualAngleDTO;
 import com.gis.domain.entity.WorkVisualAngle;
+import com.gis.domain.vo.WorkVisualAngleVo;
 import com.gis.mapper.WorkVisualAngleMapper;
 import com.gis.service.WorkVisualAngleService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 视角设置表 服务实现类
@@ -17,4 +26,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkVisualAngleServiceImpl extends ServiceImpl<WorkVisualAngleMapper, WorkVisualAngle> implements WorkVisualAngleService {
 
+    @Override
+    public List<WorkVisualAngleVo> batchSaveVisualAngle(BatchSaveVisualAngleDTO dto) {
+        List<WorkVisualAngleDTO> list = dto.getList();
+        if(CollUtil.isEmpty(list)){
+            return null;
+        }
+
+        List<WorkVisualAngle> workVisualAngles = BeanUtil.copyToList(list, WorkVisualAngle.class);
+        workVisualAngles.stream().forEach(v-> v.setWorkId(dto.getWorkId()));
+        this.saveOrUpdateBatch(workVisualAngles);
+
+        return BeanUtil.copyToList(workVisualAngles, WorkVisualAngleVo.class);
+    }
+
+    @Override
+    public List<WorkVisualAngle> listByWorkId(String workId) {
+        return this.list(new LambdaQueryWrapper<WorkVisualAngle>().eq(WorkVisualAngle::getWorkId, workId));
+    }
 }

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkCustomMaskController.java

@@ -0,0 +1,52 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.DeleteWorkHotDTO;
+import com.gis.domain.dto.WorkHotDTO;
+import com.gis.domain.dto.WorkMaskBatchSaveDTO;
+import com.gis.domain.vo.WorkHotVO;
+import com.gis.service.WorkCustomMaskService;
+import com.gis.service.WorkHotService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 遮罩 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Api(tags = "作品编辑-遮罩")
+@RestController
+@RequestMapping("/work/edit/mask")
+public class WorkCustomMaskController {
+
+    @Autowired
+    private WorkCustomMaskService workCustomMaskService;
+
+    /**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @ApiOperation(value = "保存", position = 1)
+    @PostMapping("/save")
+    public Result<WorkHotVO> batchSave(@RequestBody @Valid WorkMaskBatchSaveDTO dto){
+        return Result.success(workCustomMaskService.batchSave(dto));
+    }
+
+
+
+
+}

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkEditBaseController.java

@@ -1,21 +1,19 @@
 package com.gis.web.controller;
 
-import com.gis.common.constant.ErrorEnum;
 import com.gis.common.util.Result;
-import com.gis.domain.dto.AddWorkNavigationSceneDTO;
 import com.gis.domain.dto.WorkBaseSettingDto;
-import com.gis.domain.dto.WorkNavigationDTO;
-import com.gis.domain.dto.WorkNavigationSettingDto;
 import com.gis.service.WorkBaseSettingService;
 import com.gis.service.WorkNavigationSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.Objects;
 
 @Api(tags = "作品编辑-基础")
 @RestController

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkEditVisualAngleController.java

@@ -1,9 +1,11 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.BatchSaveVisualAngleDTO;
 import com.gis.domain.dto.WorkBaseSettingDto;
 import com.gis.service.WorkBaseSettingService;
 import com.gis.service.WorkNavigationSettingService;
+import com.gis.service.WorkVisualAngleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,13 +23,13 @@ import javax.validation.Valid;
 public class WorkEditVisualAngleController {
 
     @Autowired
-    private WorkBaseSettingService workBaseSettingService;
+    private WorkVisualAngleService workVisualAngleService;
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation(value = "保存", position = 1)
     @PostMapping("/save")
-    public Result save(@RequestBody @Valid WorkBaseSettingDto dto){
-        return  Result.success(workBaseSettingService.save(dto));
+    public Result save(@RequestBody @Valid BatchSaveVisualAngleDTO dto){
+        return Result.success(workVisualAngleService.batchSaveVisualAngle(dto));
     }
 
 }

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkExplanationController.java

@@ -33,8 +33,7 @@ public class WorkExplanationController {
     @ApiOperation(value = "保存", position = 1)
     @PostMapping("/save")
     public Result bathSaveWorkExplanation(@RequestBody @Valid BathSaveWorkExplanationDto dto){
-        workExplanationService.bathSaveWorkExplanation(dto);
-        return Result.success();
+        return Result.success(workExplanationService.bathSaveWorkExplanation(dto));
     }
 
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkHotController.java

@@ -0,0 +1,63 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.common.util.ResultData;
+import com.gis.domain.dto.DeleteWorkHotDTO;
+import com.gis.domain.dto.WorkHotDTO;
+import com.gis.domain.vo.WorkHotVO;
+import com.gis.service.WorkHotService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 热点 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-05-23
+ */
+@Api(tags = "作品编辑-热点")
+@RestController
+@RequestMapping("/work/edit/workHot")
+public class WorkHotController {
+
+    @Autowired
+    private WorkHotService workHotService;
+
+    /**
+     * 保存讲解
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @ApiOperation(value = "保存", position = 1)
+    @PostMapping("/save")
+    public Result<WorkHotVO> save(@RequestBody @Valid WorkHotDTO dto){
+        return Result.success(workHotService.save(dto));
+    }
+
+    /**
+     * 保存讲解
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @ApiOperation(value = "删除", position = 1)
+    @PostMapping("/delete")
+    public Result delete(@RequestBody @Valid DeleteWorkHotDTO dto){
+        workHotService.delete(dto);
+        return Result.success();
+    }
+
+
+
+}

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkViewController.java

@@ -40,4 +40,6 @@ public class WorkViewController {
     }
 
 
+
+
 }