showlist功能完善联调测试通过

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ES6UnusedImports" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JsonStandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
   </profile>

.idea/workspace.xml

@@ -4,125 +4,28 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="新增状态变更记录">
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/service/IUploadService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/service/impl/UploadServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/controller/OkkiShowlistController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiAdvantage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiFaq.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiHighlight.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiKeywords.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiKeywordsSeries.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiOverview.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiProductList.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiRecommendedProducts.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiReview.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiShowlist.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiShowlistBlog.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiAdvantageMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiFaqMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiHighlightMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiKeywordsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiKeywordsSeriesMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiOverviewMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiProductListMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiRecommendedProductsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiReviewMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiShowlistBlogMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/OkkiShowlistMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiAdvantageMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiFaqMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiHighlightMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiKeywordsMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiKeywordsSeriesMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiOverviewMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiProductListMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiRecommendedProductsMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiReviewMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiShowlistBlogMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/mapper/xml/OkkiShowlistMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiAdvantageService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiFaqService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiHighlightService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiKeywordsSeriesService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiKeywordsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiOverviewService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiProductListService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiRecommendedProductsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiReviewService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiShowlistBlogService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiShowlistService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiAdvantageServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiFaqServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiHighlightServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiKeywordsSeriesServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiKeywordsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiOverviewServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiProductListServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiRecommendedProductsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiReviewServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistBlogServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/vo/OkkiShowlistPage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/utils/UploadUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/OkkiShowlist.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/OkkiShowlist.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/OkkiShowlistList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/V20240514_1__menu_insert_OkkiShowlist.sql" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiBlockTable.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiFaqForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiHighlightForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiKeywordsForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiKeywordsSeriesForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiOverviewForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiProductListForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiRecommendedProductsForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiReviewForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistBlogForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistModal.vue" afterDir="false" />
+    <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="新增showlist功能">
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/AdvantageParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/BlockParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/BlogParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ButtonParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/FaqListParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/FaqParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/HighlightParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordListParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordSeriesParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordsParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/LayoutParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/OverviewParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ProductParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/PushShowlistParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ReviewListParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ReviewParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/TdkParam.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/controller/OkkiAccountApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/controller/OkkiAccountApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/controller/OkkiAccountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/controller/OkkiAccountController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/entity/OkkiAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/entity/OkkiAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/mapper/OkkiAccountMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/mapper/OkkiAccountMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/mapper/xml/OkkiAccountMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/mapper/xml/OkkiAccountMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/service/IOkkiAccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/service/IOkkiAccountService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/account/service/impl/OkkiAccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/service/impl/OkkiAccountServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/controller/OkkiBlogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/controller/OkkiBlogController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/entity/OkkiBlog.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/entity/OkkiBlog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/mapper/OkkiBlogMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/mapper/OkkiBlogMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/mapper/xml/OkkiBlogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/mapper/xml/OkkiBlogMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/service/IOkkiBlogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/service/IOkkiBlogService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/service/impl/OkkiBlogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/blog/service/impl/OkkiBlogServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/common/controller/UploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/controller/UploadController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/common/service/IUploadService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/common/service/impl/UploadServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/controller/OkkiExternalLinkController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/controller/OkkiExternalLinkController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/entity/OkkiExternalLink.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/entity/OkkiExternalLink.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/mapper/OkkiExternalLinkMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/mapper/OkkiExternalLinkMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/mapper/xml/OkkiExternalLinkMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/mapper/xml/OkkiExternalLinkMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/service/IOkkiExternalLinkService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/service/IOkkiExternalLinkService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/externallink/service/impl/OkkiExternalLinkServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/externallink/service/impl/OkkiExternalLinkServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/controller/OkkiSiteController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/controller/ShopApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/dto/ParamDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/dto/ParamDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/entity/OkkiSite.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSiteStatusChangeLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/entity/OkkiSiteStatusChangeLog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/mapper/OkkiSiteMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/mapper/OkkiSiteMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/mapper/OkkiSiteStatusChangeLogMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/mapper/OkkiSiteStatusChangeLogMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/mapper/xml/OkkiSiteMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/mapper/xml/OkkiSiteMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/mapper/xml/OkkiSiteStatusChangeLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/mapper/xml/OkkiSiteStatusChangeLogMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/param/ChangeSiteStatusParam.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/service/IOkkiSiteService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteStatusChangeLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/service/IOkkiSiteStatusChangeLogService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/service/impl/OkkiSiteServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteStatusChangeLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/service/impl/OkkiSiteStatusChangeLogServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/utils/HttpClientUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/utils/HttpClientUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/utils/SignUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/utils/SignUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiShowlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiShowlist.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml" afterDir="false" />
     </list>
@@ -140,8 +43,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Vue Composition API Component" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -164,6 +67,9 @@
   &quot;associatedIndex&quot;: 3
 }</component>
   <component name="ProjectId" id="2fdDRc9jjrc8nqAXwCaxoJQEE5f" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -183,10 +89,10 @@
     "RequestMappingsPanelWidth0": "75",
     "RequestMappingsPanelWidth1": "75",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "Spring Boot.JeecgSystemApplication.executor": "Run",
+    "Spring Boot.JeecgSystemApplication.executor": "Debug",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist",
+    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.stylelint": "true",
     "node.js.detected.package.tslint": "true",
@@ -212,11 +118,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\showlist\entity" />
       <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\showlist" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\showlist" />
       <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\api\okki\showlist" />
       <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\api\okki\site\mapper\xml" />
-      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\site" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="org.jeecg.modules.api.okki.site.service" />
@@ -278,7 +184,7 @@
       <workItem from="1714957905106" duration="25834000" />
       <workItem from="1715333910993" duration="2376000" />
       <workItem from="1715391022847" duration="21115000" />
-      <workItem from="1715648405916" duration="9789000" />
+      <workItem from="1715648405916" duration="33106000" />
     </task>
     <task id="LOCAL-00001" summary="增加添加站点对外接口">
       <option name="closed" value="true" />
@@ -408,7 +314,15 @@
       <option name="project" value="LOCAL" />
       <updated>1714988973801</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="新增showlist功能">
+      <option name="closed" value="true" />
+      <created>1715678301632</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1715678301632</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -428,7 +342,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="增加添加站点对外接口" />
     <MESSAGE value="新增状态变更记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增状态变更记录" />
+    <MESSAGE value="新增showlist功能" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增showlist功能" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/entity/OkkiShowlist.java

@@ -17,7 +17,7 @@ import java.util.Date;
 /**
  * @Description: showlist
  * @Author: jeecg-boot
- * @Date:   2024-05-14
+ * @Date:   2024-05-15
  * @Version: V1.0
  */
 @ApiModel(value="okki_showlist对象", description="showlist")
@@ -136,6 +136,23 @@ public class OkkiShowlist implements Serializable {
 	@Excel(name = "faq字幕", width = 15)
     @ApiModelProperty(value = "faq字幕")
     private String faqSubtitles;
+	/**showlist标题*/
+	@Excel(name = "showlist标题", width = 15)
+    @ApiModelProperty(value = "showlist标题")
+    private String tdkTitle;
+	/**showlist描述*/
+	@Excel(name = "showlist描述", width = 15)
+    @ApiModelProperty(value = "showlist描述")
+    private String tdkDescription;
+	/**showlist关键词*/
+	@Excel(name = "showlist关键词", width = 15)
+    @ApiModelProperty(value = "showlist关键词")
+    private String tdkKeywords;
+	/**同步状态*/
+	@Excel(name = "同步状态", width = 15, dicCode = "blog_status")
+    @Dict(dicCode = "blog_status")
+    @ApiModelProperty(value = "同步状态")
+    private Integer status;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -146,9 +163,4 @@ public class OkkiShowlist implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
-	/**同步状态*/
-	@Excel(name = "同步状态", width = 15, dicCode = "blog_status")
-    @Dict(dicCode = "blog_status")
-    @ApiModelProperty(value = "同步状态")
-    private Integer status;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/AdvantageParam.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdvantageParam {
+
+    private String title;
+
+    private String content;
+
+    private LayoutParam layout;
+
+    private List<BlockParam> block;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/BlockParam.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class BlockParam {
+
+    private String title;
+
+    private String content;
+
+    private String pic;
+
+    private ButtonParam button;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/BlogParam.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class BlogParam {
+
+    private String title;
+
+    private LayoutParam layout;
+
+    private String[] blog_list;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ButtonParam.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class ButtonParam {
+
+    private String name;
+
+    private String url;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/FaqListParam.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class FaqListParam {
+
+    private String question;
+
+    private String answer;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/FaqParam.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FaqParam {
+
+    private String title;
+
+    private String subtitles;
+
+    private List<FaqListParam> faq_list;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/HighlightParam.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HighlightParam {
+
+    private String title;
+
+    private String content;
+
+    private LayoutParam layout;
+
+    private List<BlockParam> block;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordListParam.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class KeywordListParam {
+
+    private String name;
+
+    private String link_url;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordSeriesParam.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class KeywordSeriesParam {
+
+    private String title;
+
+    private Integer layout_type;
+
+    private List<KeywordsParam> keywords;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/KeywordsParam.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class KeywordsParam {
+
+    private String title;
+
+    private List<KeywordListParam> keyword_list;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/LayoutParam.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class LayoutParam {
+
+    private Integer alignment;
+
+    private Integer columns_per_row;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/OverviewParam.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class OverviewParam {
+
+    private Integer overview_type;
+
+    private String title;
+
+    private String content;
+
+    private String pic;
+
+    private ButtonParam button;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ProductParam.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class ProductParam {
+
+    private Integer product_list_type;
+
+    private String title;
+
+    private String subtitles;
+
+    private String[] pid_list;
+
+    private Integer sid;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/PushShowlistParam.java

@@ -0,0 +1,46 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PushShowlistParam {
+
+    /** 主键id，小满根据此字段判断是插入还是更新*/
+    private String showlist_id;
+
+    private String url;
+
+    private String json_ld;
+
+    private OverviewParam overview;
+
+    private ProductParam product_list;
+
+    private HighlightParam highlight;
+
+    private List<AdvantageParam> advantage;
+
+    private ProductParam recommended_products;
+
+    private KeywordsParam keywords;
+
+    private KeywordSeriesParam keyword_series;
+
+    private ReviewParam review;
+
+    private FaqParam faq;
+
+    private BlogParam blog;
+
+    private TdkParam tdk;
+
+    private Integer inquiry_type;
+
+    private Integer report_score;
+
+    private String report_link;
+
+
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ReviewListParam.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class ReviewListParam {
+
+    private String content;
+
+    private String avatar_url;
+
+    private String name;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/ReviewParam.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ReviewParam {
+
+    private String title;
+
+    private String subtitles;
+
+    private LayoutParam layout;
+
+    private List<ReviewListParam> review_list;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/param/TdkParam.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.okki.showlist.param;
+
+import lombok.Data;
+
+@Data
+public class TdkParam {
+
+    private String title;
+
+    private String description;
+
+    private String keywords;
+
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java

@@ -1,35 +1,21 @@
 package org.jeecg.modules.okki.showlist.service.impl;
 
-import org.jeecg.modules.okki.showlist.entity.OkkiShowlist;
-import org.jeecg.modules.okki.showlist.entity.OkkiOverview;
-import org.jeecg.modules.okki.showlist.entity.OkkiProductList;
-import org.jeecg.modules.okki.showlist.entity.OkkiHighlight;
-import org.jeecg.modules.okki.showlist.entity.OkkiAdvantage;
-import org.jeecg.modules.okki.showlist.entity.OkkiRecommendedProducts;
-import org.jeecg.modules.okki.showlist.entity.OkkiKeywords;
-import org.jeecg.modules.okki.showlist.entity.OkkiKeywordsSeries;
-import org.jeecg.modules.okki.showlist.entity.OkkiReview;
-import org.jeecg.modules.okki.showlist.entity.OkkiFaq;
-import org.jeecg.modules.okki.showlist.entity.OkkiShowlistBlog;
-import org.jeecg.modules.okki.showlist.mapper.OkkiOverviewMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiProductListMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiHighlightMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiAdvantageMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiRecommendedProductsMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiKeywordsMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiKeywordsSeriesMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiReviewMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiFaqMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiShowlistBlogMapper;
-import org.jeecg.modules.okki.showlist.mapper.OkkiShowlistMapper;
-import org.jeecg.modules.okki.showlist.service.IOkkiShowlistService;
-import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.okki.showlist.entity.*;
+import org.jeecg.modules.okki.showlist.mapper.*;
+import org.jeecg.modules.okki.showlist.param.*;
+import org.jeecg.modules.okki.showlist.service.IOkkiShowlistService;
+import org.jeecg.modules.okki.utils.HttpClientUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * @Description: showlist
@@ -37,9 +23,16 @@ import java.util.Collection;
  * @Date:   2024-05-14
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class OkkiShowlistServiceImpl extends ServiceImpl<OkkiShowlistMapper, OkkiShowlist> implements IOkkiShowlistService {
 
+	@Value("${OKKI.BASE_URL}")
+	private String URL;
+
+	@Value("${OKKI.CLIENT_SECRET}")
+	private String CLIENT_SECRET;
+
 	@Autowired
 	private OkkiShowlistMapper okkiShowlistMapper;
 	@Autowired
@@ -264,8 +257,207 @@ public class OkkiShowlistServiceImpl extends ServiceImpl<OkkiShowlistMapper, Okk
 	}
 
 	@Override
-	public boolean changeStatus(OkkiShowlist okkiShowlist) {
-		return false;
+	public boolean changeStatus(OkkiShowlist param) {
+		// 主表id
+		String id = param.getId();
+		OkkiShowlist okkiShowlist = okkiShowlistMapper.selectById(id);
+		List<OkkiOverview> okkiOverviews = okkiOverviewMapper.selectByMainId(id);
+		List<OkkiProductList> okkiProductLists = okkiProductListMapper.selectByMainId(id);
+		List<OkkiHighlight> okkiHighlights = okkiHighlightMapper.selectByMainId(id);
+		List<OkkiAdvantage> okkiAdvantages = okkiAdvantageMapper.selectByMainId(id);
+		List<OkkiRecommendedProducts> okkiRecommendedProducts = okkiRecommendedProductsMapper.selectByMainId(id);
+		List<OkkiKeywords> okkiKeywords = okkiKeywordsMapper.selectByMainId(id);
+		List<OkkiKeywordsSeries> okkiKeywordsSeries = okkiKeywordsSeriesMapper.selectByMainId(id);
+		List<OkkiReview> okkiReviews = okkiReviewMapper.selectByMainId(id);
+		List<OkkiFaq> okkiFaqs = okkiFaqMapper.selectByMainId(id);
+		List<OkkiShowlistBlog> okkiShowlistBlogs = okkiShowlistBlogMapper.selectByMainId(id);
+		// 请求okki平台接口
+		Map<String, String> query = new TreeMap<>();
+		query.put("sign_method", "hmac-md5");
+		query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+		query.put("site_id", String.valueOf(okkiShowlist.getSiteId()));
+		query.put("method", "save_showlist");
+		PushShowlistParam pushShowlistParam = new PushShowlistParam();
+		// 组装传入参数
+		try {
+			String queryStr = HttpClientUtils.buildQueryString(query);
+			pushShowlistParam.setShowlist_id(id);
+			pushShowlistParam.setUrl(okkiShowlist.getUrl());
+			pushShowlistParam.setJson_ld(okkiShowlist.getJsonLd());
+			// overview
+			OverviewParam overviewParam = new OverviewParam();
+			overviewParam.setOverview_type(okkiOverviews.get(0).getOverviewType());
+			overviewParam.setTitle(okkiOverviews.get(0).getTitle());
+			overviewParam.setContent(okkiOverviews.get(0).getContent());
+			overviewParam.setPic(okkiOverviews.get(0).getPic());
+			ButtonParam buttonParam = new ButtonParam();
+			buttonParam.setName(okkiOverviews.get(0).getButtonName());
+			buttonParam.setUrl(okkiOverviews.get(0).getButtonUrl());
+			overviewParam.setButton(buttonParam);
+			pushShowlistParam.setOverview(overviewParam);
+			// product_list
+			ProductParam productListParam = new ProductParam();
+			productListParam.setProduct_list_type(okkiProductLists.get(0).getProductListType());
+			productListParam.setTitle(okkiProductLists.get(0).getTitle());
+			productListParam.setSubtitles(okkiProductLists.get(0).getSubtitles());
+			// 将字符串转数组
+			String pidList = okkiProductLists.get(0).getPidList();
+			if (!"".equals(pidList) && pidList != null) {
+				String[] split = pidList.split(",");
+				productListParam.setPid_list(split);
+			}
+			productListParam.setSid(okkiProductLists.get(0).getSid());
+			pushShowlistParam.setProduct_list(productListParam);
+			// highlight
+			HighlightParam highlightParam = new HighlightParam();
+			highlightParam.setTitle(okkiShowlist.getHighlightTitle());
+			highlightParam.setContent(okkiShowlist.getHighlightContent());
+			LayoutParam highlightLayoutParam = new LayoutParam();
+			highlightLayoutParam.setAlignment(okkiShowlist.getHighlightLayoutAlignment());
+			highlightLayoutParam.setColumns_per_row(okkiShowlist.getHighlightLayoutColumnsPerRow());
+			highlightParam.setLayout(highlightLayoutParam);
+			List<BlockParam> highlightBlockParams = new ArrayList<>();
+			for (OkkiHighlight okkiHighlight : okkiHighlights) {
+				BlockParam blockParam = new BlockParam();
+				blockParam.setTitle(okkiHighlight.getBlockTitle());
+				blockParam.setContent(okkiHighlight.getBlockContent());
+				blockParam.setPic(okkiHighlight.getBlockPic());
+				// button
+				ButtonParam highlightBlockButtonParam = new ButtonParam();
+				highlightBlockButtonParam.setName(okkiHighlight.getButtonName());
+				highlightBlockButtonParam.setUrl(okkiHighlight.getButtonUrl());
+				blockParam.setButton(highlightBlockButtonParam);
+				highlightBlockParams.add(blockParam);
+			}
+			highlightParam.setBlock(highlightBlockParams);
+			// advantage
+			ArrayList<AdvantageParam> advantageParams = new ArrayList<>();
+			AdvantageParam advantageParam = new AdvantageParam();
+			advantageParam.setTitle(okkiShowlist.getAdvantageTitle());
+			advantageParam.setContent(okkiShowlist.getAdvantageContent());
+			LayoutParam advantageLayoutParam = new LayoutParam();
+			advantageLayoutParam.setAlignment(okkiShowlist.getAdvantageLayoutAlignment());
+			advantageLayoutParam.setColumns_per_row(okkiShowlist.getAdvantageLayoutColumnsPerRow());
+			advantageParam.setLayout(advantageLayoutParam);
+			List<BlockParam> advantageBlockParams = new ArrayList<>();
+			for (OkkiAdvantage okkiAdvantage : okkiAdvantages) {
+				BlockParam blockParam = new BlockParam();
+				blockParam.setTitle(okkiAdvantage.getBlockTitle());
+				blockParam.setContent(okkiAdvantage.getBlockContent());
+				blockParam.setPic(okkiAdvantage.getBlockPic());
+				// button
+				ButtonParam  advantageBlockButtonParam = new ButtonParam();
+				advantageBlockButtonParam.setName(okkiAdvantage.getButtonName());
+				advantageBlockButtonParam.setUrl(okkiAdvantage.getButtonUrl());
+				blockParam.setButton(advantageBlockButtonParam);
+				advantageBlockParams.add(blockParam);
+			}
+			advantageParam.setBlock(advantageBlockParams);
+			advantageParams.add(advantageParam);
+			pushShowlistParam.setAdvantage(advantageParams);
+			// recommended_products
+			ProductParam recommendedProductParam = new ProductParam();
+			recommendedProductParam.setProduct_list_type(okkiRecommendedProducts.get(0).getProductListType());
+			recommendedProductParam.setTitle(okkiRecommendedProducts.get(0).getTitle());
+			recommendedProductParam.setSubtitles(okkiRecommendedProducts.get(0).getSubtitles());
+			recommendedProductParam.setSid(okkiRecommendedProducts.get(0).getSid());
+			// 将字符串转数组
+			String pidList1 = okkiRecommendedProducts.get(0).getPidList();
+			if (!"".equals(pidList1) && pidList1 != null) {
+				String[] split1 = pidList1.split(",");
+				recommendedProductParam.setPid_list(split1);
+			}
+			pushShowlistParam.setRecommended_products(recommendedProductParam);
+			// keywords
+			KeywordsParam keywordsParam = new KeywordsParam();
+			keywordsParam.setTitle(okkiShowlist.getKeywordsTitle());
+			ArrayList<KeywordListParam> keywordListParams = new ArrayList<>();
+			for (OkkiKeywords okkiKeyword : okkiKeywords) {
+				KeywordListParam keywordListParam = new KeywordListParam();
+				keywordListParam.setName(okkiKeyword.getKeywordListName());
+				keywordListParam.setLink_url(okkiKeyword.getKeywordListLinkUrl());
+				keywordListParams.add(keywordListParam);
+			}
+			keywordsParam.setKeyword_list(keywordListParams);
+			pushShowlistParam.setKeywords(keywordsParam);
+			//TODO:: keyword_series
+
+			// review
+			ReviewParam reviewParam = new ReviewParam();
+			reviewParam.setTitle(okkiShowlist.getReviewTitle());
+			reviewParam.setSubtitles(okkiShowlist.getReviewSubtitles());
+			LayoutParam reviewLayoutParam = new LayoutParam();
+			reviewLayoutParam.setAlignment(okkiShowlist.getReviewLayoutAlignment());
+			reviewLayoutParam.setColumns_per_row(okkiShowlist.getReviewLayoutColumnsPerRow());
+			reviewParam.setLayout(reviewLayoutParam);
+			ArrayList<ReviewListParam> reviewListParams = new ArrayList<>();
+			for (OkkiReview okkiReview : okkiReviews) {
+				ReviewListParam reviewListParam = new ReviewListParam();
+				reviewListParam.setContent(okkiReview.getReviewListContent());
+				reviewListParam.setAvatar_url(okkiReview.getReviewListAvatarUrl());
+				reviewListParam.setName(okkiReview.getReviewListName());
+				reviewListParams.add(reviewListParam);
+			}
+			reviewParam.setReview_list(reviewListParams);
+			pushShowlistParam.setReview(reviewParam);
+			// faq
+			FaqParam faqParam = new FaqParam();
+			faqParam.setTitle(okkiShowlist.getFaqTitle());
+			faqParam.setSubtitles(okkiShowlist.getFaqSubtitles());
+			ArrayList<FaqListParam> faqListParams = new ArrayList<>();
+			for (OkkiFaq okkiFaq : okkiFaqs) {
+				FaqListParam faqListParam = new FaqListParam();
+				faqListParam.setQuestion(okkiFaq.getQuestion());
+				faqListParam.setAnswer(okkiFaq.getAnswer());
+				faqListParams.add(faqListParam);
+			}
+			faqParam.setFaq_list(faqListParams);
+			pushShowlistParam.setFaq(faqParam);
+			// blog
+			BlogParam blogParam = new BlogParam();
+			blogParam.setTitle(okkiShowlistBlogs.get(0).getTitle());
+			LayoutParam blogLayoutParam = new LayoutParam();
+			blogLayoutParam.setAlignment(okkiShowlistBlogs.get(0).getLayoutAlignment());
+			blogLayoutParam.setColumns_per_row(okkiShowlistBlogs.get(0).getLayoutColumnsPerRow());
+			blogParam.setLayout(blogLayoutParam);
+			// 将字符串转数组
+			String blogList = okkiShowlistBlogs.get(0).getBlogList();
+			if (!"".equals(blogList) && blogList != null) {
+				String[] blogSplit = blogList.split(",");
+				blogParam.setBlog_list(blogSplit);
+			}
+			pushShowlistParam.setBlog(blogParam);
+			pushShowlistParam.setInquiry_type(okkiShowlist.getInquiryType());
+			// tdk
+			TdkParam tdkParam = new TdkParam();
+			tdkParam.setTitle(okkiShowlist.getTdkTitle());
+			tdkParam.setDescription(okkiShowlist.getTdkDescription());
+			tdkParam.setKeywords(okkiShowlist.getTdkKeywords());
+			pushShowlistParam.setTdk(tdkParam);
+			// 组装完成
+			String body = JSON.toJSONString(pushShowlistParam);
+			String signStr = queryStr + body;
+			query.put("signature", HttpClientUtils.generateHmacMD5(signStr, CLIENT_SECRET));
+			String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
+			log.info("url:" + okkiUrl + ",body:" + body);
+			String res = HttpClientUtils.doPost(okkiUrl, body);
+			log.info(res);
+			// {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
+			JSONObject jsonObject= JSONObject.parseObject(res);
+			if (jsonObject.get("code").equals(0)) {
+				okkiShowlist.setStatus(1);
+				int result = okkiShowlistMapper.updateById(okkiShowlist);
+				if (result == 0) {
+					return false;
+				}else {
+					return true;
+				}
+			}else {
+				throw new RuntimeException(jsonObject.get("msg").toString());
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 }

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -321,5 +321,9 @@ justauth:
     prefix: 'demo::'
     timeout: 1h
 OKKI:
+  # 小满测试环境
   BASE_URL: https://cms.dev.xiaoman.cn/shop-api/External/site
-  CLIENT_SECRET : rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ
+  CLIENT_SECRET : rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ
+  # 小满生产环境
+#  BASE_URL: https://cms.xiaoman.cn/shop-api/External/site
+#  CLIENT_SECRET: G8v7vplPP9cm7vgUFXqZJOB4TVjoomIy

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -77,7 +77,7 @@ spring:
           jobStore:
             class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
+            tablePrefix: qrtz_
             isClustered: true
             misfireThreshold: 12000
             clusterCheckinInterval: 15000