1

README.md

@@ -64,3 +64,20 @@ fusion:
 ~~~~
 
 
+###**2.0.0**
+~~~~ 多元融合，案件解耦
+ 
+ 多元融合页面接口修改
+    1. fusion/case/getInfo  接口去除
+    2. 增加 fusion/caseFusion/info?fusionId=?  多元融合详情接口
+    3. fusion/caseInquestInfo 接口去除
+    4. fusion/caseSettings/info  接口入参修改为fusionId
+    5. caseFusion/list 入参修改为fusionId
+    6. fusion/case/sceneList  接口去除
+    7. fusion/edit/hotIcon 入参修改为fusionId ，add入参一致修改
+    8. fusion/caseTag 入参修改为fusionId ，add入参一致修改
+    9. fusion/fusionGuide 入参修改为fusionId ，add入参一致修改
+    10.fusion/casePath 入参修改为fusionId  ，add入参一致修改
+    11.fusion/caseAnimation 入参修改为fusionId ，add入参一致修改    
+~~~~
+

doc/update-1.7.4.sql

@@ -1,18 +1,4 @@
-/*
- Navicat Premium Data Transfer
 
- Source Server         : v4-120.25.146.52-fusion-test
- Source Server Type    : MySQL
- Source Server Version : 50736
- Source Host           : 120.25.146.52:13306
- Source Schema         : fd_fusion
-
- Target Server Type    : MySQL
- Target Server Version : 50736
- File Encoding         : 65001
-
- Date: 15/05/2025 16:46:22
-*/
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
@@ -22,38 +8,54 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_case_overview`;
 CREATE TABLE `t_case_overview`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `case_id` int(11) NULL DEFAULT NULL,
-  `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标题',
-  `store` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据',
-  `viewport` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '视口',
-  `cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '封面图',
-  `type` int(11) NULL DEFAULT NULL,
-  `map_url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '封面图',
-  `tb_status` int(1) NULL DEFAULT 0,
-  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+                                    `id` int NOT NULL AUTO_INCREMENT,
+                                    `case_id` int NULL DEFAULT NULL,
+                                    `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                    `cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                    `store` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据',
+                                    `viewport` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '视口',
+                                    `type` int NULL DEFAULT 0,
+                                    `map_url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                    `tb_status` int NULL DEFAULT 0,
+                                    `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                                    `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                    `high` int NULL DEFAULT NULL,
+                                    `width` int NULL DEFAULT NULL,
+                                    `list_cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 179 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for t_case_tabulation
 -- ----------------------------
 DROP TABLE IF EXISTS `t_case_tabulation`;
 CREATE TABLE `t_case_tabulation`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `case_id` int(11) NULL DEFAULT NULL,
-  `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标题',
-  `store` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据',
-  `viewport` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '视口',
-  `cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '封面图',
-  `paper_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '纸张',
-  `is_auto_gen` int(11) NULL DEFAULT NULL,
-  `tb_status` int(1) NULL DEFAULT 0,
-  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `overview_id` int(11) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+                                      `id` int NOT NULL AUTO_INCREMENT,
+                                      `case_id` int NULL DEFAULT NULL,
+                                      `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                      `store` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据',
+                                      `viewport` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '视口',
+                                      `cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '封面图',
+                                      `paper_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '纸张',
+                                      `is_auto_gen` int NULL DEFAULT NULL,
+                                      `tb_status` int NULL DEFAULT 0,
+                                      `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                                      `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                      `overview_id` int NULL DEFAULT NULL,
+                                      `map_url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                      `high` int NULL DEFAULT NULL,
+                                      `width` int NULL DEFAULT NULL,
+                                      `list_cover` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+                                      PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 231 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+
+ALTER TABLE `fd_fusion`.`t_case_files`
+    ADD COLUMN `overview_id` int NULL DEFAULT NULL AFTER `ogn_files_url`;
+
+ALTER TABLE `fd_fusion`.`t_case_files`
+    ADD COLUMN `tabulation_id` int NULL DEFAULT NULL AFTER `overview_id`;

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

@@ -11,6 +11,7 @@ import com.fdkankan.fusion.entity.CaseOverview;
 import com.fdkankan.fusion.httpClient.client.OtherClient;
 import com.fdkankan.fusion.service.ICaseOverviewService;
 import com.fdkankan.fusion.service.ICaseService;
+import com.fdkankan.fusion.service.ICaseTabulationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,6 +39,8 @@ public class CaseOverviewController {
     ICaseService caseService;
     @Autowired
     OtherClient otherClient;
+    @Autowired
+    ICaseTabulationService caseTabulationService;
 
 
     @GetMapping("/getByCaseId")
@@ -56,6 +59,8 @@ public class CaseOverviewController {
     @PushJm(event_content = "添加绘图")
     public ResultData addOrUpdate (@RequestBody CaseOverview caseOverview){
         caseOverviewService.saveOrUpdate(caseOverview);
+        caseOverview.getCaseTabulation().setOverviewId(caseOverview.getId());
+        caseTabulationService.addOrUpdate(caseOverview.getCaseTabulation());
         return ResultData.ok(caseOverview);
     }
 

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

@@ -71,5 +71,10 @@ public class CaseOverview implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("kankan_cover")
+    private String kankanCover;
+
+    @TableField(exist = false)
+    private CaseTabulation caseTabulation;
 
 }