1、文章表备注更改

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/controller/TravelArticleController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-15
  * @Version: V1.0
  */
 @Api(tags="文章表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/entity/TravelArticle.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-15
  * @Version: V1.0
  */
 @Data
@@ -59,8 +59,8 @@ public class TravelArticle implements Serializable {
 	@Excel(name = "文章内容", width = 15)
     @ApiModelProperty(value = "文章内容")
     private java.lang.String articleContent;
-	/**文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)*/
-	@Excel(name = "文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)", width = 15)
-    @ApiModelProperty(value = "文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)")
+	/**文章所属分类*/
+	@Excel(name = "文章所属分类", width = 15)
+    @ApiModelProperty(value = "文章所属分类")
     private java.lang.Integer categoryId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/mapper/TravelArticleMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-15
  * @Version: V1.0
  */
 public interface TravelArticleMapper extends BaseMapper<TravelArticle> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/ITravelArticleService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-15
  * @Version: V1.0
  */
 public interface ITravelArticleService extends IService<TravelArticle> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/impl/TravelArticleServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="文章所属分类">
+              <a-input placeholder="请输入文章所属分类" v-model="queryParam.categoryId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -139,9 +154,9 @@
             scopedSlots: {customRender: 'htmlSlot'}
           },
           {
-            title:'文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
+            title:'文章所属分类',
             align:"center",
-            dataIndex: 'categoryId_dictText'
+            dataIndex: 'categoryId'
           },
           {
             title: '操作',
@@ -180,7 +195,7 @@
         fieldList.push({type:'string',value:'articleTitle',text:'文章标题',dictCode:''})
         fieldList.push({type:'string',value:'articleImage',text:'文章封面',dictCode:''})
         fieldList.push({type:'Text',value:'articleContent',text:'文章内容',dictCode:''})
-        fieldList.push({type:'int',value:'categoryId',text:'文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',dictCode:''})
+        fieldList.push({type:'int',value:'categoryId',text:'文章所属分类',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/modules/TravelArticleForm.vue

@@ -19,8 +19,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="" placeholder="请选择文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)" />
+            <a-form-model-item label="文章所属分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <a-input-number v-model="model.categoryId" placeholder="请输入文章所属分类" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue3/TravelArticle.data.ts

@@ -22,13 +22,19 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'htmlSlot' },
    },
    {
-    title: '文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
+    title: '文章所属分类',
     align:"center",
-    dataIndex: 'categoryId_dictText'
+    dataIndex: 'categoryId'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "文章所属分类",
+      field: "categoryId",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -50,11 +56,8 @@ export const formSchema: FormSchema[] = [
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
-    label: '文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
+    label: '文章所属分类',
     field: 'categoryId',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:""
-     },
+    component: 'InputNumber',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/controller/TravelSpotController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-16
  * @Version: V1.0
  */
 @Api(tags="地点表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-16
  * @Version: V1.0
  */
 @Data
@@ -51,14 +51,14 @@ public class TravelSpot implements Serializable {
 	@Excel(name = "地点坐标_纬度", width = 15)
     @ApiModelProperty(value = "地点坐标_纬度")
     private java.math.BigDecimal spotLatitude;
-	/**地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)*/
-	@Excel(name = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)", width = 15, dictTable = "travel_area", dicText = "area_name", dicCode = "id")
+	/**地点所属景区*/
+	@Excel(name = "地点所属景区", width = 15, dictTable = "travel_area", dicText = "area_name", dicCode = "id")
 	@Dict(dictTable = "travel_area", dicText = "area_name", dicCode = "id")
-    @ApiModelProperty(value = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)")
+    @ApiModelProperty(value = "地点所属景区")
     private java.lang.String areaId;
-	/**地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)*/
-	@Excel(name = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)", width = 15)
-    @ApiModelProperty(value = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)")
+	/**地点类型*/
+	@Excel(name = "地点类型", width = 15)
+    @ApiModelProperty(value = "地点类型")
     private java.lang.Integer categoryId;
 	/**地点详情*/
 	@Excel(name = "地点详情", width = 15)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/mapper/TravelSpotMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-16
  * @Version: V1.0
  */
 public interface TravelSpotMapper extends BaseMapper<TravelSpot> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/service/ITravelSpotService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-16
  * @Version: V1.0
  */
 public interface ITravelSpotService extends IService<TravelSpot> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/service/impl/TravelSpotServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-10-16
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue

@@ -4,6 +4,33 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="地点名字">
+              <a-input placeholder="请输入地点名字" v-model="queryParam.spotName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="地点所属景区">
+              <j-dict-select-tag placeholder="请选择地点所属景区" v-model="queryParam.areaId" dictCode="travel_area,area_name,id"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="地点类型">
+                <a-input placeholder="请输入地点类型" v-model="queryParam.categoryId"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -144,14 +171,14 @@
             dataIndex: 'spotLatitude'
           },
           {
-            title:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
+            title:'地点所属景区',
             align:"center",
             dataIndex: 'areaId_dictText'
           },
           {
-            title:'地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
+            title:'地点类型',
             align:"center",
-            dataIndex: 'categoryId_dictText'
+            dataIndex: 'categoryId'
           },
           {
             title:'地点详情',
@@ -202,8 +229,8 @@
         fieldList.push({type:'string',value:'spotImage',text:'地点图片',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'spotLongitude',text:'地点坐标_经度',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'spotLatitude',text:'地点坐标_纬度',dictCode:''})
-        fieldList.push({type:'string',value:'areaId',text:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',dictCode:"travel_area,area_name,id"})
-        fieldList.push({type:'int',value:'categoryId',text:'地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',dictCode:''})
+        fieldList.push({type:'string',value:'areaId',text:'地点所属景区',dictCode:"travel_area,area_name,id"})
+        fieldList.push({type:'int',value:'categoryId',text:'地点类型',dictCode:''})
         fieldList.push({type:'Text',value:'spotDetail',text:'地点详情',dictCode:''})
         fieldList.push({type:'Text',value:'spotAudio',text:'语音讲解内容',dictCode:''})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue

@@ -24,13 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
-              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="travel_area,area_name,id" placeholder="请选择地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)" />
+            <a-form-model-item label="地点所属景区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
+              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="travel_area,area_name,id" placeholder="请选择地点所属景区" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="" placeholder="请选择地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)" />
+            <a-form-model-item label="地点类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <a-input-number v-model="model.categoryId" placeholder="请输入地点类型" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts

@@ -26,14 +26,14 @@ export const columns: BasicColumn[] = [
     dataIndex: 'spotLatitude'
    },
    {
-    title: '地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
+    title: '地点所属景区',
     align:"center",
     dataIndex: 'areaId_dictText'
    },
    {
-    title: '地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
+    title: '地点类型',
     align:"center",
-    dataIndex: 'categoryId_dictText'
+    dataIndex: 'categoryId'
    },
    {
     title: '地点详情',
@@ -49,6 +49,27 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "地点名字",
+      field: "spotName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "地点所属景区",
+      field: "areaId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"travel_area,area_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "地点类型",
+      field: "categoryId",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -75,7 +96,7 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
   },
   {
-    label: '地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
+    label: '地点所属景区',
     field: 'areaId',
     component: 'JDictSelectTag',
     componentProps:{
@@ -83,12 +104,9 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
+    label: '地点类型',
     field: 'categoryId',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:""
-     },
+    component: 'InputNumber',
   },
   {
     label: '地点详情',