1、图片信息表添加字段 2、获取角色信息接口修改

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-18
  * @Version: V1.0
  */
 @Api(tags="图片信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-18
  * @Version: V1.0
  */
 @Data
@@ -35,12 +35,21 @@ public class TravelImage implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
-	/**图片*/
-	@Excel(name = "图片", width = 15)
-    @ApiModelProperty(value = "图片")
-    private java.lang.String image;
+	/**图片名称*/
+	@Excel(name = "图片名称", width = 15)
+    @ApiModelProperty(value = "图片名称")
+    private java.lang.String imageName;
+	/**图片内容*/
+	@Excel(name = "图片内容", width = 15)
+    @ApiModelProperty(value = "图片内容")
+    private java.lang.String imageContent;
 	/**图片分类*/
-	@Excel(name = "图片分类", width = 15)
+	@Excel(name = "图片分类", width = 15, dictTable = "travel_category", dicText = "category_name", dicCode = "id")
+	@Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id")
     @ApiModelProperty(value = "图片分类")
     private java.lang.String categoryId;
+	/**排序编号*/
+	@Excel(name = "排序编号", width = 15)
+    @ApiModelProperty(value = "排序编号")
+    private java.lang.Integer orderId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-18
  * @Version: V1.0
  */
 public interface TravelImageMapper extends BaseMapper<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-18
  * @Version: V1.0
  */
 public interface ITravelImageService extends IService<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue

@@ -123,15 +123,25 @@
             }
           },
           {
-            title:'图片',
+            title:'图片名称',
             align:"center",
-            dataIndex: 'image',
+            dataIndex: 'imageName'
+          },
+          {
+            title:'图片内容',
+            align:"center",
+            dataIndex: 'imageContent',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'图片分类',
             align:"center",
-            dataIndex: 'categoryId'
+            dataIndex: 'categoryId_dictText'
+          },
+          {
+            title:'排序编号',
+            align:"center",
+            dataIndex: 'orderId'
           },
           {
             title: '操作',
@@ -167,8 +177,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'string',value:'imageName',text:'图片名称',dictCode:''})
+        fieldList.push({type:'string',value:'imageContent',text:'图片内容',dictCode:''})
         fieldList.push({type:'string',value:'categoryId',text:'图片分类',dictCode:"travel_category,category_name,id"})
+        fieldList.push({type:'int',value:'orderId',text:'排序编号',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/modules/TravelImageForm.vue

@@ -4,13 +4,23 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            <a-form-model-item label="图片名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageName">
+              <a-input v-model="model.imageName" placeholder="请输入图片名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageContent">
+              <j-image-upload isMultiple  v-model="model.imageContent" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="图片分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <a-input v-model="model.categoryId" placeholder="请输入图片分类"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="travel_category,category_name,id" placeholder="请选择图片分类" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input-number v-model="model.orderId" 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/travelImage/vue3/TravelImage.data.ts

@@ -5,15 +5,25 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '图片',
+    title: '图片名称',
     align:"center",
-    dataIndex: 'image',
+    dataIndex: 'imageName'
+   },
+   {
+    title: '图片内容',
+    align:"center",
+    dataIndex: 'imageContent',
     customRender:render.renderAvatar,
    },
    {
     title: '图片分类',
     align:"center",
-    dataIndex: 'categoryId'
+    dataIndex: 'categoryId_dictText'
+   },
+   {
+    title: '排序编号',
+    align:"center",
+    dataIndex: 'orderId'
    },
 ];
 //查询数据
@@ -22,8 +32,13 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '图片',
-    field: 'image',
+    label: '图片名称',
+    field: 'imageName',
+    component: 'Input',
+  },
+  {
+    label: '图片内容',
+    field: 'imageContent',
      component: 'JImageUpload',
      componentProps:{
       },
@@ -31,6 +46,14 @@ export const formSchema: FormSchema[] = [
   {
     label: '图片分类',
     field: 'categoryId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_category,category_name,id"
+     },
+  },
+  {
+    label: '排序编号',
+    field: 'orderId',
+    component: 'InputNumber',
   },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java

@@ -77,12 +77,12 @@ public class IndexApiController {
     //根据角色类型获取角色信息列表-讲解员/达人/摄影师
     @ApiOperation(value="小程序-根据角色类型获取角色信息列表-讲解员/达人/摄影师", notes="1-讲解员，2-达人，3-摄影师")
     @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
-    public Result<?> queryRoleInfoList(String roleType, String level, String spot){
-        return indexApiService.queryRoleInfoList(roleType, level, spot);
+    public Result<?> queryRoleInfoList(String roleId, String level, String spot){
+        return indexApiService.queryRoleInfoList(roleId, level, spot);
     }
 
     //根据角色id获取角色信息详情
-    @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="小程序-根据角色类型获取角色信息列表")
+    @ApiOperation(value="小程序-根据角色Id获取角色信息详情", notes="小程序-根据角色Id获取角色信息详情")
     @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET})
     public Result<?> queryRoleInfoById(String roleInfoId){
         return indexApiService.queryRoleInfoById(roleInfoId);
@@ -116,7 +116,7 @@ public class IndexApiController {
 
     /*************************我的***********************************/
     //添加志愿者
-    @ApiOperation(value="小程序-添加支援者", notes="小程序-添加支援者")
+    @ApiOperation(value="小程序-添加志愿者", notes="小程序-添加志愿者")
     @RequestMapping(value = "/addVolunteer", method = {RequestMethod.POST})
     public Result<?> addVolunteer(){
         return indexApiService.addVolunteer();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -138,15 +138,15 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //根据角色类型获取角色信息列表
     @Override
-    public Result<?> queryRoleInfoList(String roleType, String level, String spot) {
+    public Result<?> queryRoleInfoList(String roleId, String level, String spot) {
         List<TravelRoleInfo> list = travelRoleInfoService
                 .lambdaQuery()
-                .eq(TravelRoleInfo::getRoleId, roleType)
+                .eq(TravelRoleInfo::getRoleId, roleId)
                 .eq(TravelRoleInfo::getRoleLevel, level)
                 .like(TravelRoleInfo::getSkill, spot)
                 .list();
 
-        return Result.OK("景点列表", list);
+        return Result.OK("角色列表", list);
     }
 
     //根据角色id获取角色详情