diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index c3dc13d..15a3d5a 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://traveladmin.augcl.com/travel-api/ +VUE_APP_API_BASE_URL=https://traveladmin.augcl.com/travel-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index abe2048..29da211 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://traveladmin.augcl.com/travel-api/ +VUE_APP_API_BASE_URL=https://traveladmin.augcl.com/travel-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/.env.test b/admin-hanhai-vue/.env.test index 9cda05a..93e0d0f 100644 --- a/admin-hanhai-vue/.env.test +++ b/admin-hanhai-vue/.env.test @@ -1,4 +1,4 @@ -NODE_ENV=production -VUE_APP_API_BASE_URL=http://boot.jeecg.com:8080/jeecg-boot +NODE_ENV=test +VUE_APP_API_BASE_URL=https://traveladmin.augcl.com/travel-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/controller/TravelAdvanceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/controller/TravelAdvanceController.java index d16bf29..a8eadd3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/controller/TravelAdvanceController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/controller/TravelAdvanceController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 建议表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="建议表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/entity/TravelAdvance.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/entity/TravelAdvance.java index 38062bc..3130d1a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/entity/TravelAdvance.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/entity/TravelAdvance.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 建议表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/TravelAdvanceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/TravelAdvanceMapper.java index 807d0f4..8094dc7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/TravelAdvanceMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/TravelAdvanceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 建议表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelAdvanceMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/ITravelAdvanceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/ITravelAdvanceService.java index 338710e..2ad99b9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/ITravelAdvanceService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/ITravelAdvanceService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 建议表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelAdvanceService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/impl/TravelAdvanceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/impl/TravelAdvanceServiceImpl.java index e8236c1..57bc2d8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/impl/TravelAdvanceServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/impl/TravelAdvanceServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 建议表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/TravelAdvanceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/TravelAdvanceList.vue index 195156f..db47fb8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/TravelAdvanceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/TravelAdvanceList.vue @@ -176,7 +176,7 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'question',text:'问题和意见',dictCode:''}) + fieldList.push({type:'Text',value:'question',text:'问题和意见',dictCode:''}) fieldList.push({type:'string',value:'image',text:'问题截图',dictCode:''}) fieldList.push({type:'string',value:'name',text:'联系姓名',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/controller/TravelAmusementController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/controller/TravelAmusementController.java index dca44ae..72c43fc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/controller/TravelAmusementController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/controller/TravelAmusementController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 游玩项目表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="游玩项目表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/entity/TravelAmusement.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/entity/TravelAmusement.java index cc30f73..7eb17a3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/entity/TravelAmusement.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/entity/TravelAmusement.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 游玩项目表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/mapper/TravelAmusementMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/mapper/TravelAmusementMapper.java index c06b5d5..547155e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/mapper/TravelAmusementMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/mapper/TravelAmusementMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 游玩项目表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelAmusementMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/ITravelAmusementService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/ITravelAmusementService.java index 9681be5..fd2a9ed 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/ITravelAmusementService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/ITravelAmusementService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 游玩项目表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelAmusementService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/impl/TravelAmusementServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/impl/TravelAmusementServiceImpl.java index c5704f8..7fb9085 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/impl/TravelAmusementServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/impl/TravelAmusementServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 游玩项目表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/TravelAmusementList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/TravelAmusementList.vue index 3c66347..9145f84 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/TravelAmusementList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/TravelAmusementList.vue @@ -224,9 +224,9 @@ fieldList.push({type:'string',value:'amusementImage',text:'项目图片',dictCode:''}) fieldList.push({type:'BigDecimal',value:'amusementPrice',text:'项目价格',dictCode:''}) fieldList.push({type:'string',value:'amusementBrief',text:'项目介绍',dictCode:''}) - fieldList.push({type:'string',value:'amusementRoute',text:'关于行程',dictCode:''}) - fieldList.push({type:'string',value:'amusementAttention',text:'注意事项',dictCode:''}) - fieldList.push({type:'string',value:'amusementStatement',text:'出行说明',dictCode:''}) + fieldList.push({type:'Text',value:'amusementRoute',text:'关于行程',dictCode:''}) + fieldList.push({type:'Text',value:'amusementAttention',text:'注意事项',dictCode:''}) + fieldList.push({type:'Text',value:'amusementStatement',text:'出行说明',dictCode:''}) fieldList.push({type:'string',value:'isPay',text:'是否付费项目(0-否 1-是)',dictCode:''}) fieldList.push({type:'string',value:'amusementType',text:'项目类型(0-遗产路径 1-我要研学)',dictCode:''}) fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java index 251805a..756e560 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="景区表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java index 39c1fad..cf24a77 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java index 0ce3434..50f3ac9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelAreaMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java index 5127c0d..17dc5c8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelAreaService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java index 442ae79..65b2666 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue index 78f611e..2719dca 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue @@ -180,7 +180,7 @@ fieldList.push({type:'string',value:'areaName',text:'景区名称',dictCode:''}) fieldList.push({type:'string',value:'areaBrief',text:'景区简介',dictCode:''}) fieldList.push({type:'string',value:'areaImage',text:'景区图片',dictCode:''}) - fieldList.push({type:'string',value:'areaDetail',text:'景区详情',dictCode:''}) + fieldList.push({type:'Text',value:'areaDetail',text:'景区详情',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/controller/TravelArticleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/controller/TravelArticleController.java index 5c16530..509f732 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/controller/TravelArticleController.java +++ b/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-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="文章表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/entity/TravelArticle.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/entity/TravelArticle.java index fa1b9de..1954794 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/entity/TravelArticle.java +++ b/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-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/mapper/TravelArticleMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/mapper/TravelArticleMapper.java index 53adb3a..728efaa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/mapper/TravelArticleMapper.java +++ b/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-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelArticleMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/ITravelArticleService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/ITravelArticleService.java index 28adbfe..13a5c34 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/ITravelArticleService.java +++ b/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-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelArticleService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/impl/TravelArticleServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/impl/TravelArticleServiceImpl.java index bfedf46..fb37a9b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/impl/TravelArticleServiceImpl.java +++ b/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-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue index d64d153..350a2bb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue @@ -179,7 +179,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'articleTitle',text:'文章标题',dictCode:''}) fieldList.push({type:'string',value:'articleImage',text:'文章封面',dictCode:''}) - fieldList.push({type:'string',value:'articleContent',text:'文章内容',dictCode:''}) + fieldList.push({type:'Text',value:'articleContent',text:'文章内容',dictCode:''}) fieldList.push({type:'int',value:'categoryId',text:'文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',dictCode:''}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java index 3ec62a8..6e9f13e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 非遗体验表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="非遗体验表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java index 232ae06..829ed11 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 非遗体验表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java index eea49ed..59c9271 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 非遗体验表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelExperienceMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java index 8ac26ac..f0322f5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 非遗体验表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelExperienceService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java index d9f9052..b9574d8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 非遗体验表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue index b286039..5992a41 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue @@ -190,7 +190,7 @@ fieldList.push({type:'string',value:'experienceTitle',text:'非遗体验标题',dictCode:''}) fieldList.push({type:'string',value:'experienceImage',text:'非遗体验封面',dictCode:''}) fieldList.push({type:'string',value:'experienceOpentime',text:'开放时间',dictCode:''}) - fieldList.push({type:'string',value:'experienceDetail',text:'非遗体验详情',dictCode:''}) + fieldList.push({type:'Text',value:'experienceDetail',text:'非遗体验详情',dictCode:''}) fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) this.superFieldList = fieldList diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java index 935eac5..62a4cc3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 角色信息表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="角色信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java index 18eb899..1e99e6b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 角色信息表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java index faacc47..2032964 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 角色信息表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface TravelRoleInfoMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java index 8695f48..6d10168 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 角色信息表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface ITravelRoleInfoService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java index 2bbd53e..149d59f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 角色信息表 * @Author: jeecg-boot - * @Date: 2024-09-24 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java index 8fabbeb..646d907 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java @@ -64,4 +64,8 @@ public class TravelSpot implements Serializable { @Excel(name = "地点详情", width = 15) @ApiModelProperty(value = "地点详情") private java.lang.String spotDetail; + /**语音讲解内容*/ + @Excel(name = "语音讲解内容", width = 15) + @ApiModelProperty(value = "语音讲解内容") + private java.lang.String spotAudio; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue index 7b6a699..746e7e4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue @@ -159,6 +159,11 @@ dataIndex: 'spotDetail', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'语音讲解内容', + align:"center", + dataIndex: 'spotAudio' + }, { title: '操作', dataIndex: 'action', @@ -199,7 +204,8 @@ 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:'spotDetail',text:'地点详情',dictCode:''}) + fieldList.push({type:'Text',value:'spotDetail',text:'地点详情',dictCode:''}) + fieldList.push({type:'Text',value:'spotAudio',text:'语音讲解内容',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue index 5b1788f..674907f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue @@ -38,6 +38,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts index e5186f1..151408d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts @@ -41,6 +41,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'spotDetail', slots: { customRender: 'htmlSlot' }, }, + { + title: '语音讲解内容', + align:"center", + dataIndex: 'spotAudio' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -90,4 +95,9 @@ export const formSchema: FormSchema[] = [ field: 'spotDetail', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '语音讲解内容', + field: 'spotAudio', + component: 'Input', + }, ];