1

src/main/java/com/fdkankan/fusion/controller/FusionGuideController.java

@@ -35,8 +35,7 @@ public class FusionGuideController {
 
     @PostMapping("/add")
     public ResultData add(@RequestBody FusionGuide fusionGuide){
-        fusionGuideService.add(fusionGuide);
-        return ResultData.ok();
+        return ResultData.ok(fusionGuideService.add(fusionGuide));
     }
     @PostMapping("/updateSort")
     public ResultData updateSort(@RequestBody FusionGuide fusionGuide){

src/main/java/com/fdkankan/fusion/controller/FusionGuidePathController.java

@@ -0,0 +1,32 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.fusion.service.IFusionGuidePathService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-16
+ */
+@RestController
+@RequestMapping("/fusionGuidePath")
+public class FusionGuidePathController {
+
+    @Autowired
+    IFusionGuidePathService fusionGuidePathService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+        return ResultData.ok();
+    }
+}
+

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

@@ -38,22 +38,17 @@ public class FusionGuide implements Serializable {
     private Integer fusionId;
 
     /**
-     * 位置
+     * 封面图
      */
-    @TableField("position")
-    private String position;
+    @TableField("cover")
+    private String cover;
 
-    /**
-     * 持续时间 秒
-     */
-    @TableField("time")
-    private Integer time;
 
     /**
-     * 速度 m/s
+     * 标题
      */
-    @TableField("speed")
-    private Double speed;
+    @TableField("title")
+    private String title;
 
     /**
      * 排序

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

@@ -0,0 +1,81 @@
+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 java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-16
+ */
+@Getter
+@Setter
+@TableName("t_fusion_guide_path")
+public class FusionGuidePath implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "guide_path_id", type = IdType.AUTO)
+    private Integer guidePathId;
+
+    @TableField("guide_id")
+    private Integer guideId;
+
+    /**
+     * 位置json
+     */
+    @TableField("target")
+    private String target;
+
+    /**
+     * 位置json
+     */
+    @TableField("position")
+    private String position;
+
+    /**
+     * 封面图
+     */
+    @TableField("cover")
+    private String cover;
+
+    /**
+     * 持续时间 秒
+     */
+    @TableField("time")
+    private Integer time;
+
+    /**
+     * 速度 m/s 
+     */
+    @TableField("speed")
+    private Double speed;
+
+    /**
+     * 排序
+     */
+    @TableField("sort")
+    private Integer sort;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-                "t_fusion_meter",
+                "t_fusion_guide_path",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/fusion/mapper/IFusionGuidePathMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.FusionGuidePath;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-16
+ */
+@Mapper
+public interface IFusionGuidePathMapper extends BaseMapper<FusionGuidePath> {
+
+}

src/main/java/com/fdkankan/fusion/service/IFusionGuidePathService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.FusionGuidePath;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-16
+ */
+public interface IFusionGuidePathService extends IService<FusionGuidePath> {
+
+}

src/main/java/com/fdkankan/fusion/service/IFusionGuideService.java

@@ -17,7 +17,7 @@ public interface IFusionGuideService extends IService<FusionGuide> {
 
     List<FusionGuide> getAllList(Integer fusionId);
 
-    void add(FusionGuide fusionGuide);
+    FusionGuide add(FusionGuide fusionGuide);
 
     Long getCountByFusionId(Integer fusionId);
 }

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

@@ -86,13 +86,15 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             listAll.addAll(list1);
 
         }
-        List<String> numList = listAll.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
-        //设置模型
-        List<Model> modelList = modelService.getListByNum(numList);
-        HashMap<String,Model> map = new HashMap<>();
-        modelList.forEach(entity-> map.put(entity.getNum(),entity));
-        for (SceneVo sceneVo : listAll) {
-            BeanUtils.copyProperties(map.get(sceneVo.getNum()),sceneVo);
+        if(listAll.size() >0){
+            List<String> numList = listAll.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+            //设置模型
+            List<Model> modelList = modelService.getListByNum(numList);
+            HashMap<String,Model> map = new HashMap<>();
+            modelList.forEach(entity-> map.put(entity.getNum(),entity));
+            for (SceneVo sceneVo : listAll) {
+                BeanUtils.copyProperties(map.get(sceneVo.getNum()),sceneVo);
+            }
         }
         String username = JwtUtil.getUsername(token);
         List<Model> models = modelService.getByUserName(username);

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

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.fdkankan.fusion.entity.FusionGuidePath;
+import com.fdkankan.fusion.mapper.IFusionGuidePathMapper;
+import com.fdkankan.fusion.service.IFusionGuidePathService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-16
+ */
+@Service
+public class FusionGuidePathServiceImpl extends ServiceImpl<IFusionGuidePathMapper, FusionGuidePath> implements IFusionGuidePathService {
+
+}

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

@@ -1,7 +1,9 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.fusion.entity.FusionGuide;
+import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.mapper.IFusionGuideMapper;
 import com.fdkankan.fusion.service.IFusionGuideService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,14 +40,15 @@ public class FusionGuideServiceImpl extends ServiceImpl<IFusionGuideMapper, Fusi
     }
 
     @Override
-    public void add(FusionGuide fusionGuide) {
-        if(fusionGuide.getFusionId() == null || StringUtils.isEmpty(fusionGuide.getPosition())
-            || fusionGuide.getTime() == null || fusionGuide.getSpeed() == null){
-
+    public FusionGuide add(FusionGuide fusionGuide) {
+        if(fusionGuide.getFusionId() == null || StringUtils.isEmpty(fusionGuide.getTitle())
+            || StringUtils.isEmpty(fusionGuide.getCover())){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         Long count = this.getCountByFusionId(fusionGuide.getFusionId());
         fusionGuide.setSort(count + 1);
         this.save(fusionGuide);
+        return fusionGuide;
     }
 
 

src/main/resources/mapper/fusion/FusionGuidePathMapper.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.fdkankan.fusion.mapper.IFusionGuidePathMapper">
+
+</mapper>