Merge branch 'cy' of http://124.70.32.114:3100/zhangxiaomeng/kechengfuzhu into wzx

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

kcui/src/api/twdelete.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+
+export function twdelete(id){
+    return request({
+        url: `/twdelete/${id}`, // 使用模板字符串来包含变量
+        method: 'delete',
+    });
+}

kcui/src/view/DhInfo.vue

@@ -177,6 +177,7 @@ import headInfo from '@/components/Head.vue';
 import Foot from "@/components/Foot.vue";
 import {editInfo, getDocList, getTwInfo} from "@/api/kcInfo";
 import Editor from "@/components/Editor.vue";
+import {twdelete} from "@/api/twdelete";
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
@@ -282,7 +283,8 @@ export default {
 
 
     //管理员操作
-    deleteTw() {
+    deleteTw(id){
+      twdelete(id);
       console.log("这是删除操作")
     },
     editTw(id) {

kcui/src/view/JsInfo.vue

@@ -177,6 +177,7 @@ import headInfo from '@/components/Head.vue';
 import Foot from "@/components/Foot.vue";
 import {editInfo, getDocList, getTwInfo} from "@/api/kcInfo";
 import Editor from "@/components/Editor.vue";
+import {twdelete} from "@/api/twdelete";
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
@@ -282,7 +283,8 @@ export default {
 
 
     //管理员操作
-    deleteTw() {
+    deleteTw(id){
+      twdelete(id);
       console.log("这是删除操作")
     },
     editTw(id) {

kcui/src/view/SpInfo.vue

@@ -191,6 +191,7 @@ import headInfo from '@/components/Head.vue';
 import Foot from "@/components/Foot.vue";
 import {editInfo, getDocList, getTwInfo} from "@/api/kcInfo";
 import Editor from "@/components/Editor.vue";
+import {twdelete} from "@/api/twdelete";
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
@@ -211,11 +212,12 @@ export default {
         {id: 4, name: "知识图谱", info: "Graph"},
         {id: 4, name: "帮助文档", info: "Help"}
       ],
+      type:"2",//视频数据类型
       page: "视频资源",
       typeList: ["起降", "飞行", "通信载荷使用", "探测载荷使用", "攻击载荷使用"],
       contentList: [],
       selectName: "",
-      twType: "",
+      spType: "",
       pageSize: 6,
       pageNum: 1,
       total: 0,
@@ -254,7 +256,8 @@ export default {
       console.log("djaksjdklajsdk")
       var data = {
         name: this.selectName,
-        twType: this.twType,
+        type: this.type,
+        spType: this.spType,
         pageNum: this.pageNum,
         pageSize: this.pageSize
       }
@@ -281,7 +284,7 @@ export default {
           }
         }
 
-        console.log(this.onePagesList)
+        console.log(this.onePagesList,)
 
       })
     },
@@ -296,7 +299,8 @@ export default {
 
 
     //管理员操作
-    deleteTw() {
+    deleteTw(id){
+      twdelete(id);
       console.log("这是删除操作")
     },
     editTw(id) {

kcui/src/view/TWInfo.vue

@@ -154,6 +154,18 @@
         <el-form-item style="position: relative ;" label="知识内容">
           <Editor v-if="form.contentInfo!=''" v-model="TxtValue" style="height: 15vw;"></Editor>
         </el-form-item>
+
+        <el-form-item style="position: relative ;" label="选择类别">
+          <el-select v-model="value" placeholder="请选择类别">
+            <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item style="position: relative;margin-top: 5vw;" label="相关图片">
           <el-upload
               action="http://127.0.0.1:10031/fileUpdate/upload"
@@ -187,6 +199,7 @@ import headInfo from '@/components/Head.vue';
 import Foot from "@/components/Foot.vue";
 import {editInfo, getDocList, getTwInfo} from "@/api/kcInfo";
 import Editor from "@/components/Editor.vue";
+import {twdelete} from "@/api/twdelete";
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
@@ -221,6 +234,15 @@ export default {
       openInfo: false,
 
 
+      options: [
+        {value: '1', label: '海洋大气'},
+        {value: '2', label: '海洋文学'},
+        {value: '3', label: '海洋地理'},
+        {value: '4', label: '复杂水声'},
+        {value: '5', label: '复杂电磁'}
+      ],
+      value: '',
+
       form: {
         name: "",
         contentInfo: "",
@@ -292,9 +314,11 @@ export default {
 
 
    //管理员操作
-    deleteTw() {
+    deleteTw(id){
+      twdelete(id);
       console.log("这是删除操作")
     },
+
     editTw(id){
       //展示出一个修改的弹窗
       var data = {

src/main/java/com/main/woka/Web/Controller/TwDeleteController.java

@@ -0,0 +1,29 @@
+package com.main.woka.Web.Controller;
+
+import com.main.woka.Common.core.AjaxResult;
+import com.main.woka.Web.Service.TwDeleteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/twdelete")
+public class TwDeleteController extends BaseController {
+
+    @Autowired
+    private TwDeleteService twDeleteService;
+
+    @DeleteMapping("/{id}")
+    public AjaxResult deleteItem(@PathVariable Long id) {
+
+        try {
+            // 调用服务层方法进行删除操作
+            twDeleteService.deleteItem(id);
+            return  AjaxResult.success();
+
+        } catch (Exception e) {
+            // 返回错误信息
+            e.printStackTrace();
+            return  AjaxResult.error("删除失败");
+        }
+}
+}

src/main/java/com/main/woka/Web/Mapper/TwDeleteMapper.java

@@ -0,0 +1,10 @@
+package com.main.woka.Web.Mapper;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TwDeleteMapper {
+    @Delete("DELETE FROM kc_info WHERE id = #{id}")
+    void deleteById(Long id); // 根据ID删除记录
+}

src/main/java/com/main/woka/Web/Service/TwDeleteService.java

@@ -0,0 +1,20 @@
+package com.main.woka.Web.Service;
+
+import com.main.woka.Web.Mapper.TwDeleteMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TwDeleteService {
+    private final TwDeleteMapper twDeleteMapper;
+
+    @Autowired
+    public TwDeleteService(TwDeleteMapper twDeleteMapper) {
+        this.twDeleteMapper = twDeleteMapper;
+    }
+
+    public void deleteItem(Long id) {
+        // 调用Mapper执行数据库删除操作
+        twDeleteMapper.deleteById(id);
+    }
+}

src/main/resources/application.properties

@@ -21,7 +21,7 @@ spring.task.execution.thread-name-prefix=duoxiancheng
 # neo4j����
 spring.neo4j.url=bolt://localhost:7687
 spring.neo4j.username=neo4j
-spring.neo4j.password=123456
+spring.neo4j.password=12345678