Jelajahi Sumber

fix 修改店铺返回id为string,解决精度丢失问题

chenchen 5 bulan lalu
induk
melakukan
f1f7ff368b
49 mengubah file dengan 117 tambahan dan 117 penghapusan
  1. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismProjectToWebController.java
  2. 3 3
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/WebsiteTourismProjectTravelNotesController.java
  3. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/DatePriceSaveDto.java
  4. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/TourismBookProjectDto.java
  5. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/BasicToWebService.java
  6. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/BasicToWebServiceImpl.java
  7. 4 4
      application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatTourismIndexController.java
  8. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/ExtraController.java
  9. 3 3
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantFoodTypeController.java
  10. 13 13
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTourismProjectTravelNotesController.java
  11. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTravelNotesProjectRelationController.java
  12. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismContentController.java
  13. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismDatePriceController.java
  14. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismFileController.java
  15. 7 7
      application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismProjectController.java
  16. 3 3
      application-webadmin/src/main/java/com/tourism/webadmin/back/dao/TourismProjectMapper.java
  17. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/dto/TourBookInfoDto.java
  18. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/RestaurantFoodInfo.java
  19. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/RestaurantFoodType.java
  20. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourBookInfo.java
  21. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourOrder.java
  22. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismProjectTravelNotes.java
  23. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismTravelNotesContent.java
  24. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismTravelNotesFile.java
  25. 3 3
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTravelNotesProjectRelation.java
  26. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismContent.java
  27. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismDatePrice.java
  28. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismFile.java
  29. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismProject.java
  30. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/RestaurantFoodTypeService.java
  31. 6 6
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismProjectTravelNotesService.java
  32. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismTravelNotesContentService.java
  33. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismTravelNotesFileService.java
  34. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTravelNotesProjectRelationService.java
  35. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismContentService.java
  36. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismDatePriceService.java
  37. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismFileService.java
  38. 5 5
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismProjectService.java
  39. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/RestaurantFoodTypeServiceImpl.java
  40. 8 8
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismProjectTravelNotesServiceImpl.java
  41. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismTravelNotesContentServiceImpl.java
  42. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismTravelNotesFileServiceImpl.java
  43. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTravelNotesProjectRelationServiceImpl.java
  44. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismContentServiceImpl.java
  45. 2 2
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismDatePriceServiceImpl.java
  46. 3 3
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismFileServiceImpl.java
  47. 7 7
      application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismProjectServiceImpl.java
  48. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/vo/RestaurantFoodInfoVo.java
  49. 1 1
      application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourOrderVo.java

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismProjectToWebController.java

@@ -130,7 +130,7 @@ public class TourismProjectToWebController {
     @SaIgnore
 //    @SaCheckPermission("tourismProject.view")
     @GetMapping("/detail")
-    public ResponseResult<TourismProjectVo> detail(@NotNull(message = "所属目录(id)不能为空") Long id) {
+    public ResponseResult<TourismProjectVo> detail(@NotNull(message = "所属目录(id)不能为空") String id) {
         TourismProject tourismProject = tourismProjectService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismProject == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -170,7 +170,7 @@ public class TourismProjectToWebController {
      */
     @SaIgnore
     @GetMapping("/viewDatePrice")
-    public ResponseResult<WebSiteProjectDatePriceVo> view(@RequestParam Long projectId) {
+    public ResponseResult<WebSiteProjectDatePriceVo> view(@RequestParam String projectId) {
 
         TourismDatePrice tourismDatePrice = new TourismDatePrice();
         tourismDatePrice.setProjectId(projectId);

+ 3 - 3
application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/WebsiteTourismProjectTravelNotesController.java

@@ -84,7 +84,7 @@ public class WebsiteTourismProjectTravelNotesController {
      */
     @OperationLog(type = SysOperationLogType.LIST)
     @GetMapping("/travelNotesDetail")
-    public ResponseResult<TourTourismProjectTravelNotesVo> travelNotesDetail(@RequestParam Long id) {
+    public ResponseResult<TourTourismProjectTravelNotesVo> travelNotesDetail(@RequestParam String id) {
 
         TourTourismProjectTravelNotesVo tourTourismProjectTravelNotesVo = basicToWebServicel.travelNotesDetail(id);
 //        tourTourismProjectTravelNotesVo.setContactCode("[{\"name\":\"微信图片_20241021154757.png\",\"downloadUri\":\"/admin/app/tourTourismProjectTravelNotes/download\",\"filename\":\"6b92b75edcc04da1bd6e4af056911730.png\",\"uploadPath\":\"image/TourTourismProjectTravelNotes/contactCode\"}]");
@@ -192,13 +192,13 @@ public class WebsiteTourismProjectTravelNotesController {
      */
     @OperationLog(type = SysOperationLogType.LIST)
     @GetMapping("/relateProjectList")
-    public ResponseResult<List<TourismProjectVo>> relateProjectList(@RequestParam(required = true) Long travelNotesId) {
+    public ResponseResult<List<TourismProjectVo>> relateProjectList(@RequestParam(required = true) String travelNotesId) {
 
         TourTravelNotesProjectRelation tourTravelNotesProjectRelation = new TourTravelNotesProjectRelation();
         tourTravelNotesProjectRelation.setTravelNotesId(travelNotesId);
         List<TourTravelNotesProjectRelation> tourTravelNotesProjectRelationList =
                 tourTravelNotesProjectRelationService.getTourTravelNotesProjectRelationList(tourTravelNotesProjectRelation, "");
-        ArrayList<Long> relateProjectList =
+        ArrayList<String> relateProjectList =
                 tourTravelNotesProjectRelationList.stream().map(TourTravelNotesProjectRelation::getProjectId).collect(Collectors.toCollection(ArrayList::new));
 
         if(relateProjectList.size() == 0) {

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/DatePriceSaveDto.java

@@ -8,6 +8,6 @@ import java.util.List;
 @Data
 public class DatePriceSaveDto {
 
-    private Long projectId;
+    private String projectId;
     private List<DateRangesPriceVo> dateRangesPriceVoList;
 }

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/TourismBookProjectDto.java

@@ -6,6 +6,6 @@ import java.util.Date;
 
 @Data
 public class TourismBookProjectDto {
-    private Integer type;private Long projectId;
+    private Integer type;private String projectId;
     private Integer adultNumber;private Integer childrenNumber;private Date startDate;
 }

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/BasicToWebService.java

@@ -24,7 +24,7 @@ public interface BasicToWebService
 
     MyPageData<TourTourismProjectTravelNotesVo> getTravelNotesPageList(TourismProjectTravelNotesToWebDto tourismProjectTravelNotesToWebDto);
 
-    TourTourismProjectTravelNotesVo travelNotesDetail(Long id);
+    TourTourismProjectTravelNotesVo travelNotesDetail(String id);
 
     void userLikeTravelNotesUpdate(Long travelNotesId,Integer type);
 

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/BasicToWebServiceImpl.java

@@ -206,7 +206,7 @@ public class BasicToWebServiceImpl implements BasicToWebService
     }
 
     @Override
-    public TourTourismProjectTravelNotesVo travelNotesDetail(Long id){
+    public TourTourismProjectTravelNotesVo travelNotesDetail(String id){
         TourTourismProjectTravelNotes tourTourismProjectTravelNotes =
                 tourTourismProjectTravelNotesService.getByIdWithRelation(id, MyRelationParam.full());
 

+ 4 - 4
application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatTourismIndexController.java

@@ -110,7 +110,7 @@ public class WechatTourismIndexController {
      * @return 应答结果对象。
      */
     @GetMapping("/queryIndexBannerToTravelNote")
-    public ResponseResult<TourTourismProjectTravelNotesVo> queryIndexBannerToTravelNote(@RequestParam @NotNull(message = "首页跳转游记id不能为null") Long id) {
+    public ResponseResult<TourTourismProjectTravelNotesVo> queryIndexBannerToTravelNote(@RequestParam @NotNull(message = "首页跳转游记id不能为null") String id) {
 
         System.out.println(id);
         TourTourismProjectTravelNotes filter = new TourTourismProjectTravelNotes();
@@ -313,7 +313,7 @@ public class WechatTourismIndexController {
 
             TourismFile filter1 = new TourismFile();
             filter1.setDataState(1);
-            filter1.setAssociationTableId(Long.valueOf(o.getId()));
+            filter1.setAssociationTableId(o.getId());
             List<TourismFile> fileList = tourismFileService.getTourismFileList(filter1, null);
 
             fileList.stream().forEach(file->{
@@ -337,7 +337,7 @@ public class WechatTourismIndexController {
      * @return 应答结果对象。
      */
     @GetMapping("/queryTourismProjectDetailById")
-    public ResponseResult<TourismProjectVo> queryTourismProjectDetailById(@NotNull(message = "所属目录(id)不能为空") Long id) {
+    public ResponseResult<TourismProjectVo> queryTourismProjectDetailById(@NotNull(message = "所属目录(id)不能为空") String id) {
 
         TourismProject tourismProject = tourismProjectService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismProject == null) {
@@ -378,7 +378,7 @@ public class WechatTourismIndexController {
      * @return 应答结果对象。
      */
     @GetMapping("/queryTourismNoteDetailById")
-    public ResponseResult<TourismNoteDetailVo> queryTourismNoteDetailById(@NotNull(message = "所属目录(id)不能为空") Long id) {
+    public ResponseResult<TourismNoteDetailVo> queryTourismNoteDetailById(@NotNull(message = "所属目录(id)不能为空") String id) {
 
         TourismNoteDetailVo detailVo = new TourismNoteDetailVo();
         TourTourismProjectTravelNotes note = tourTourismProjectTravelNotesService.getByIdWithRelation(id, MyRelationParam.normal());

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/ExtraController.java

@@ -57,7 +57,7 @@ public class ExtraController {
      */
     @SaCheckPermission("tourismProject.view")
     @GetMapping("/viewDatePrice")
-    public ResponseResult<List<DateRangesPriceVo>> view(@RequestParam Long projectId) {
+    public ResponseResult<List<DateRangesPriceVo>> view(@RequestParam String projectId) {
 
         TourismDatePrice tourismDatePrice = new TourismDatePrice();
         tourismDatePrice.setProjectId(projectId);

+ 3 - 3
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/RestaurantFoodTypeController.java

@@ -59,7 +59,7 @@ public class RestaurantFoodTypeController {
     @SaCheckPermission("restaurantFoodType.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody RestaurantFoodTypeDto restaurantFoodTypeDto) {
+    public ResponseResult<String> add(@MyRequestBody RestaurantFoodTypeDto restaurantFoodTypeDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(restaurantFoodTypeDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -263,7 +263,7 @@ public class RestaurantFoodTypeController {
      */
     @SaCheckPermission("restaurantFoodType.view")
     @GetMapping("/view")
-    public ResponseResult<RestaurantFoodTypeVo> view(@RequestParam Long id) {
+    public ResponseResult<RestaurantFoodTypeVo> view(@RequestParam String id) {
         RestaurantFoodType restaurantFoodType = restaurantFoodTypeService.getByIdWithRelation(id, MyRelationParam.full());
         if (restaurantFoodType == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -308,7 +308,7 @@ public class RestaurantFoodTypeController {
      * @return 应答结果对象,包含字典形式的数据集合。
      */
     @GetMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestParam List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestParam List<String> dictIds) {
         List<RestaurantFoodType> resultList = restaurantFoodTypeService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(
                 MyCommonUtil.toDictDataList(resultList, RestaurantFoodType::getId, RestaurantFoodType::getName));

+ 13 - 13
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTourismProjectTravelNotesController.java

@@ -70,7 +70,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(
+    public ResponseResult<String> add(
             @MyRequestBody TourTourismProjectTravelNotesDto tourTourismProjectTravelNotesDto,
             @MyRequestBody TourTourismTravelNotesFileDto tourTourismTravelNotesFileDto,
             @MyRequestBody TourTourismTravelNotesContentDto tourTourismTravelNotesContentDto) {
@@ -97,7 +97,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.update")
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Long> update(
+    public ResponseResult<String> update(
             @MyRequestBody TourTourismProjectTravelNotesDto tourTourismProjectTravelNotesDto,
             @MyRequestBody TourTourismTravelNotesFileDto tourTourismTravelNotesFileDto,
             @MyRequestBody TourTourismTravelNotesContentDto tourTourismTravelNotesContentDto) {
@@ -126,7 +126,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.delete")
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long id) {
+    public ResponseResult<Void> delete(@MyRequestBody String id) {
         if (MyCommonUtil.existBlankArgument(id)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -142,11 +142,11 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.delete")
     @OperationLog(type = SysOperationLogType.DELETE_BATCH)
     @PostMapping("/deleteBatch")
-    public ResponseResult<Void> deleteBatch(@MyRequestBody List<Long> idList) {
+    public ResponseResult<Void> deleteBatch(@MyRequestBody List<String> idList) {
         if (MyCommonUtil.existBlankArgument(idList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        for (Long id : idList) {
+        for (String id : idList) {
             ResponseResult<Void> responseResult = this.doDelete(id);
             if (!responseResult.isSuccess()) {
                 return responseResult;
@@ -245,7 +245,7 @@ public class TourTourismProjectTravelNotesController {
      */
     @SaCheckPermission("tourTourismProjectTravelNotes.view")
     @GetMapping("/view")
-    public ResponseResult<TourTourismProjectTravelNotesVo> view(@RequestParam Long id) {
+    public ResponseResult<TourTourismProjectTravelNotesVo> view(@RequestParam String id) {
         TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourTourismProjectTravelNotes == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -266,7 +266,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.update")
     @PostMapping("/listNotInTourTravelNotesProjectRelation")
     public ResponseResult<MyPageData<TourismProjectVo>> listNotInTourTravelNotesProjectRelation(
-            @MyRequestBody Long id,
+            @MyRequestBody String id,
             @MyRequestBody TourismProjectDto tourismProjectDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -295,7 +295,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.view")
     @PostMapping("/listTourTravelNotesProjectRelation")
     public ResponseResult<MyPageData<TourismProjectVo>> listTourTravelNotesProjectRelation(
-            @MyRequestBody(required = true) Long id,
+            @MyRequestBody(required = true) String id,
             @MyRequestBody TourismProjectDto tourismProjectDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -323,7 +323,7 @@ public class TourTourismProjectTravelNotesController {
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addTourTravelNotesProjectRelation")
     public ResponseResult<Void> addTourTravelNotesProjectRelation(
-            @MyRequestBody Long travelNotesId,
+            @MyRequestBody String travelNotesId,
             @MyRequestBody List<TourTravelNotesProjectRelationDto> tourTravelNotesProjectRelationDtoList) {
 
         //先验证绑定的项目是否超过三个
@@ -381,7 +381,7 @@ public class TourTourismProjectTravelNotesController {
     @SaCheckPermission("tourTourismProjectTravelNotes.update")
     @GetMapping("/viewTourTravelNotesProjectRelation")
     public ResponseResult<TourTravelNotesProjectRelationVo> viewTourTravelNotesProjectRelation(
-            @RequestParam Long travelNotesId, @RequestParam Long projectId) {
+            @RequestParam String travelNotesId, @RequestParam String projectId) {
         TourTravelNotesProjectRelation tourTravelNotesProjectRelation = tourTourismProjectTravelNotesService.getTourTravelNotesProjectRelation(travelNotesId, projectId);
         if (tourTravelNotesProjectRelation == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -401,7 +401,7 @@ public class TourTourismProjectTravelNotesController {
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteTourTravelNotesProjectRelation")
     public ResponseResult<Void> deleteTourTravelNotesProjectRelation(
-            @MyRequestBody Long travelNotesId, @MyRequestBody Long projectId) {
+            @MyRequestBody String travelNotesId, @MyRequestBody String projectId) {
         if (MyCommonUtil.existBlankArgument(travelNotesId, projectId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -422,7 +422,7 @@ public class TourTourismProjectTravelNotesController {
     @OperationLog(type = SysOperationLogType.DELETE_M2M_BATCH)
     @PostMapping("/deleteTourTravelNotesProjectRelationList")
     public ResponseResult<Void> deleteTourTravelNotesProjectRelationList(
-            @MyRequestBody Long travelNotesId, @MyRequestBody List<Long> projectIdList) {
+            @MyRequestBody String travelNotesId, @MyRequestBody List<String> projectIdList) {
         if (MyCommonUtil.existBlankArgument(travelNotesId, projectIdList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -573,7 +573,7 @@ public class TourTourismProjectTravelNotesController {
         return ResponseResult.success(new Tuple2<>(tourTourismProjectTravelNotes, relationData));
     }
 
-    private ResponseResult<Void> doDelete(Long id) {
+    private ResponseResult<Void> doDelete(String id) {
         String errorMessage;
         // 验证关联Id的数据合法性
         TourTourismProjectTravelNotes originalTourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(id);

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourTravelNotesProjectRelationController.java

@@ -45,7 +45,7 @@ public class TourTravelNotesProjectRelationController {
     @SaCheckPermission("tourTravelNotesProjectRelation.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody TourTravelNotesProjectRelationDto tourTravelNotesProjectRelationDto) {
+    public ResponseResult<String> add(@MyRequestBody TourTravelNotesProjectRelationDto tourTravelNotesProjectRelationDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(tourTravelNotesProjectRelationDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -152,7 +152,7 @@ public class TourTravelNotesProjectRelationController {
      */
     @SaCheckPermission("tourTravelNotesProjectRelation.view")
     @GetMapping("/view")
-    public ResponseResult<TourTravelNotesProjectRelationVo> view(@RequestParam Long id) {
+    public ResponseResult<TourTravelNotesProjectRelationVo> view(@RequestParam String id) {
         TourTravelNotesProjectRelation tourTravelNotesProjectRelation = tourTravelNotesProjectRelationService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourTravelNotesProjectRelation == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismContentController.java

@@ -45,7 +45,7 @@ public class TourismContentController {
     @SaCheckPermission("tourismContent.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody TourismContentDto tourismContentDto) {
+    public ResponseResult<String> add(@MyRequestBody TourismContentDto tourismContentDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(tourismContentDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -152,7 +152,7 @@ public class TourismContentController {
      */
     @SaCheckPermission("tourismContent.view")
     @GetMapping("/view")
-    public ResponseResult<TourismContentVo> view(@RequestParam Long id) {
+    public ResponseResult<TourismContentVo> view(@RequestParam String id) {
         TourismContent tourismContent = tourismContentService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismContent == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismDatePriceController.java

@@ -48,7 +48,7 @@ public class TourismDatePriceController {
     @SaCheckPermission("tourismDatePrice.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody TourismDatePriceDto tourismDatePriceDto) {
+    public ResponseResult<String> add(@MyRequestBody TourismDatePriceDto tourismDatePriceDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(tourismDatePriceDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -168,7 +168,7 @@ public class TourismDatePriceController {
      */
     @SaCheckPermission("tourismDatePrice.view")
     @GetMapping("/view")
-    public ResponseResult<TourismDatePriceVo> view(@RequestParam Long id) {
+    public ResponseResult<TourismDatePriceVo> view(@RequestParam String id) {
         TourismDatePrice tourismDatePrice = tourismDatePriceService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismDatePrice == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismFileController.java

@@ -62,7 +62,7 @@ public class TourismFileController {
     @SaCheckPermission("tourismFile.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody TourismFileDto tourismFileDto) {
+    public ResponseResult<String> add(@MyRequestBody TourismFileDto tourismFileDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(tourismFileDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -169,7 +169,7 @@ public class TourismFileController {
      */
     @SaCheckPermission("tourismFile.view")
     @GetMapping("/view")
-    public ResponseResult<TourismFileVo> view(@RequestParam Long id) {
+    public ResponseResult<TourismFileVo> view(@RequestParam String id) {
         TourismFile tourismFile = tourismFileService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismFile == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

+ 7 - 7
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourismProjectController.java

@@ -69,7 +69,7 @@ public class TourismProjectController {
     @SaCheckPermission("tourismProject.add")
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(
+    public ResponseResult<String> add(
             @MyRequestBody TourismProjectDto tourismProjectDto,
             @MyRequestBody TourismFileDto tourismFileDto,
             @MyRequestBody TourismContentDto tourismContentDto) throws Exception {
@@ -96,7 +96,7 @@ public class TourismProjectController {
     @SaCheckPermission("tourismProject.update")
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Long> update(
+    public ResponseResult<String> update(
             @MyRequestBody TourismProjectDto tourismProjectDto,
             @MyRequestBody TourismFileDto tourismFileDto,
             @MyRequestBody TourismContentDto tourismContentDto) throws Exception {
@@ -125,7 +125,7 @@ public class TourismProjectController {
     @SaCheckPermission("tourismProject.delete")
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long id) {
+    public ResponseResult<Void> delete(@MyRequestBody String id) {
         if (MyCommonUtil.existBlankArgument(id)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -141,11 +141,11 @@ public class TourismProjectController {
     @SaCheckPermission("tourismProject.delete")
     @OperationLog(type = SysOperationLogType.DELETE_BATCH)
     @PostMapping("/deleteBatch")
-    public ResponseResult<Void> deleteBatch(@MyRequestBody List<Long> idList) {
+    public ResponseResult<Void> deleteBatch(@MyRequestBody List<String> idList) {
         if (MyCommonUtil.existBlankArgument(idList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        for (Long id : idList) {
+        for (String id : idList) {
             ResponseResult<Void> responseResult = this.doDelete(id);
             if (!responseResult.isSuccess()) {
                 return responseResult;
@@ -267,7 +267,7 @@ public class TourismProjectController {
      */
     @SaCheckPermission("tourismProject.view")
     @GetMapping("/view")
-    public ResponseResult<TourismProjectVo> view(@RequestParam Long id) {
+    public ResponseResult<TourismProjectVo> view(@RequestParam String id) {
         TourismProject tourismProject = tourismProjectService.getByIdWithRelation(id, MyRelationParam.full());
         if (tourismProject == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -419,7 +419,7 @@ public class TourismProjectController {
         return ResponseResult.success(new Tuple2<>(tourismProject, relationData));
     }
 
-    private ResponseResult<Void> doDelete(Long id) {
+    private ResponseResult<Void> doDelete(String id) {
         String errorMessage;
         // 验证关联Id的数据合法性
         TourismProject originalTourismProject = tourismProjectService.getById(id);

+ 3 - 3
application-webadmin/src/main/java/com/tourism/webadmin/back/dao/TourismProjectMapper.java

@@ -40,7 +40,7 @@ public interface TourismProjectMapper extends BaseDaoMapper<TourismProject> {
      * @return 从表数据列表。
      */
     List<TourismProject> getTourismProjectListByTravelNotesId(
-            @Param("travelNotesId") Long travelNotesId,
+            @Param("travelNotesId") String travelNotesId,
             @Param("tourismProjectFilter") TourismProject tourismProjectFilter,
             @Param("orderBy") String orderBy);
 
@@ -53,7 +53,7 @@ public interface TourismProjectMapper extends BaseDaoMapper<TourismProject> {
      * @return 从表数据列表。
      */
     List<TourismProject> getTourismProjectListByTravelNotesIds(
-            @Param("travelNotesIds") List<Long> travelNotesIds,
+            @Param("travelNotesIds") List<String> travelNotesIds,
             @Param("tourismProjectFilter") TourismProject tourismProjectFilter,
             @Param("orderBy") String orderBy);
 
@@ -66,7 +66,7 @@ public interface TourismProjectMapper extends BaseDaoMapper<TourismProject> {
      * @return 与主表没有建立关联的从表数据列表。
      */
     List<TourismProject> getNotInTourismProjectListByTravelNotesId(
-            @Param("travelNotesId") Long travelNotesId,
+            @Param("travelNotesId") String travelNotesId,
             @Param("tourismProjectFilter") TourismProject tourismProjectFilter,
             @Param("orderBy") String orderBy);
 }

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/dto/TourBookInfoDto.java

@@ -75,7 +75,7 @@ public class TourBookInfoDto {
      * NOTE: 可支持等于操作符的列表数据过滤。
      */
     @Schema(description = "预定种类的id。可支持等于操作符的列表数据过滤。")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 成人价格。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/RestaurantFoodInfo.java

@@ -36,7 +36,7 @@ public class RestaurantFoodInfo extends BaseModel {
      * 饭馆美食种类id。
      */
     @TableField(value = "food_type_id")
-    private Long foodTypeId;
+    private String foodTypeId;
 
     /**
      * 菜品名称。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/model/RestaurantFoodType.java

@@ -27,7 +27,7 @@ public class RestaurantFoodType extends BaseModel {
      * 主键id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 种类名称。
@@ -39,7 +39,7 @@ public class RestaurantFoodType extends BaseModel {
      * 餐馆id。
      */
     @TableField(value = "restaurant_id")
-    private Long restaurantId;
+    private String restaurantId;
 
     /**
      * 是否启用,0禁用,1启用。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourBookInfo.java

@@ -70,7 +70,7 @@ public class TourBookInfo extends BaseModel {
      * 预定种类的id。
      */
     @TableField(value = "project_id")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourOrder.java

@@ -104,7 +104,7 @@ public class TourOrder extends BaseModel {
      * 旅游项目。
      */
     @TableField(value = "project_id")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 项目简述。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismProjectTravelNotes.java

@@ -31,7 +31,7 @@ public class TourTourismProjectTravelNotes extends BaseModel {
      * 主键id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 项目标题。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismTravelNotesContent.java

@@ -32,7 +32,7 @@ public class TourTourismTravelNotesContent extends BaseModel {
      * 关联表id。
      */
     @TableField(value = "association_id")
-    private Long associationId;
+    private String associationId;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTourismTravelNotesFile.java

@@ -55,7 +55,7 @@ public class TourTourismTravelNotesFile extends BaseModel {
      * 关联表id。
      */
     @TableField(value = "association_table_id")
-    private Long associationTableId;
+    private String associationTableId;
 
     /**
      * 上传时间。

+ 3 - 3
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourTravelNotesProjectRelation.java

@@ -21,19 +21,19 @@ public class TourTravelNotesProjectRelation extends BaseModel {
      * Id主键。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 游记id。
      */
     @TableField(value = "travel_notes_id")
-    private Long travelNotesId;
+    private String travelNotesId;
 
     /**
      * 项目id。
      */
     @TableField(value = "project_id")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismContent.java

@@ -22,7 +22,7 @@ public class TourismContent extends BaseModel {
      * 主键id。
      */
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private String id;
 
     /**
      * 富文本内容。
@@ -34,7 +34,7 @@ public class TourismContent extends BaseModel {
      * 关联表id。
      */
     @TableField(value = "association_id")
-    private Long associationId;
+    private String associationId;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismDatePrice.java

@@ -25,13 +25,13 @@ public class TourismDatePrice extends BaseModel {
      * id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 旅游项目信息。
      */
     @TableField(value = "project_id")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 出发日期。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismFile.java

@@ -25,7 +25,7 @@ public class TourismFile extends BaseModel {
      * 主键id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 文件名称。
@@ -56,7 +56,7 @@ public class TourismFile extends BaseModel {
      * 关联表id。
      */
     @TableField(value = "association_table_id")
-    private Long associationTableId;
+    private String associationTableId;
 
     /**
      * 上传时间。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismProject.java

@@ -31,7 +31,7 @@ public class TourismProject extends BaseModel {
      * 主键id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 项目标题。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/RestaurantFoodTypeService.java

@@ -12,7 +12,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface RestaurantFoodTypeService extends IBaseService<RestaurantFoodType, Long> {
+public interface RestaurantFoodTypeService extends IBaseService<RestaurantFoodType, String> {
 
     /**
      * 保存新增对象。

+ 6 - 6
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismProjectTravelNotesService.java

@@ -12,7 +12,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourTourismProjectTravelNotesService extends IBaseService<TourTourismProjectTravelNotes, Long> {
+public interface TourTourismProjectTravelNotesService extends IBaseService<TourTourismProjectTravelNotes, String> {
 
     /**
      * 保存新增对象。
@@ -63,7 +63,7 @@ public interface TourTourismProjectTravelNotesService extends IBaseService<TourT
      * @param id 主键Id。
      * @return 成功返回true,否则false。
      */
-    boolean remove(Long id);
+    boolean remove(String id);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。
@@ -92,7 +92,7 @@ public interface TourTourismProjectTravelNotesService extends IBaseService<TourT
      * @param tourTravelNotesProjectRelationList 多对多关联表对象集合。
      * @param travelNotesId 主表Id。
      */
-    void addTourTravelNotesProjectRelationList(List<TourTravelNotesProjectRelation> tourTravelNotesProjectRelationList, Long travelNotesId);
+    void addTourTravelNotesProjectRelationList(List<TourTravelNotesProjectRelation> tourTravelNotesProjectRelationList, String travelNotesId);
 
     /**
      * 更新中间表数据。
@@ -109,7 +109,7 @@ public interface TourTourismProjectTravelNotesService extends IBaseService<TourT
      * @param projectId 从表Id。
      * @return 中间表对象。
      */
-    TourTravelNotesProjectRelation getTourTravelNotesProjectRelation(Long travelNotesId, Long projectId);
+    TourTravelNotesProjectRelation getTourTravelNotesProjectRelation(String travelNotesId, String projectId);
 
     /**
      * 移除单条多对多关系。
@@ -118,7 +118,7 @@ public interface TourTourismProjectTravelNotesService extends IBaseService<TourT
      * @param projectId 从表Id。
      * @return 成功返回true,否则false。
      */
-    boolean removeTourTravelNotesProjectRelation(Long travelNotesId, Long projectId);
+    boolean removeTourTravelNotesProjectRelation(String travelNotesId, String projectId);
 
     /**
      * 批量移除单条多对多关系。
@@ -127,5 +127,5 @@ public interface TourTourismProjectTravelNotesService extends IBaseService<TourT
      * @param projectIdList 从表Id列表。
      * @return 成功返回true,否则false。
      */
-    void removeTourTravelNotesProjectRelationList(Long travelNotesId, List<Long> projectIdList);
+    void removeTourTravelNotesProjectRelationList(String travelNotesId, List<String> projectIdList);
 }

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismTravelNotesContentService.java

@@ -51,7 +51,7 @@ public interface TourTourismTravelNotesContentService extends IBaseService<TourT
      * @param associationId 从表关联字段。
      * @return 删除数量。
      */
-    int removeByAssociationId(Long associationId);
+    int removeByAssociationId(String associationId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTourismTravelNotesFileService.java

@@ -51,7 +51,7 @@ public interface TourTourismTravelNotesFileService extends IBaseService<TourTour
      * @param associationTableId 从表关联字段。
      * @return 删除数量。
      */
-    int removeByAssociationTableId(Long associationTableId);
+    int removeByAssociationTableId(String associationTableId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourTravelNotesProjectRelationService.java

@@ -11,7 +11,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourTravelNotesProjectRelationService extends IBaseService<TourTravelNotesProjectRelation, Long> {
+public interface TourTravelNotesProjectRelationService extends IBaseService<TourTravelNotesProjectRelation, String> {
 
     /**
      * 保存新增对象。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismContentService.java

@@ -11,7 +11,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourismContentService extends IBaseService<TourismContent, Long> {
+public interface TourismContentService extends IBaseService<TourismContent, String> {
 
     /**
      * 保存新增对象。
@@ -51,7 +51,7 @@ public interface TourismContentService extends IBaseService<TourismContent, Long
      * @param associationId 从表关联字段。
      * @return 删除数量。
      */
-    int removeByAssociationId(Long associationId);
+    int removeByAssociationId(String associationId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismDatePriceService.java

@@ -11,7 +11,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourismDatePriceService extends IBaseService<TourismDatePrice, Long> {
+public interface TourismDatePriceService extends IBaseService<TourismDatePrice, String> {
 
     /**
      * 保存新增对象。

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismFileService.java

@@ -11,7 +11,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourismFileService extends IBaseService<TourismFile, Long> {
+public interface TourismFileService extends IBaseService<TourismFile, String> {
 
     /**
      * 保存新增对象。
@@ -51,7 +51,7 @@ public interface TourismFileService extends IBaseService<TourismFile, Long> {
      * @param associationTableId 从表关联字段。
      * @return 删除数量。
      */
-    int removeByAssociationTableId(Long associationTableId);
+    int removeByAssociationTableId(String associationTableId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。

+ 5 - 5
application-webadmin/src/main/java/com/tourism/webadmin/back/service/TourismProjectService.java

@@ -13,7 +13,7 @@ import java.util.*;
  * @author 吃饭睡觉
  * @date 2024-09-06
  */
-public interface TourismProjectService extends IBaseService<TourismProject, Long> {
+public interface TourismProjectService extends IBaseService<TourismProject, String> {
 
     /**
      * 保存新增对象。
@@ -72,7 +72,7 @@ public interface TourismProjectService extends IBaseService<TourismProject, Long
      * @param id 主键Id。
      * @return 成功返回true,否则false。
      */
-    boolean remove(Long id);
+    boolean remove(String id);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询,因此在仅仅获取单表数据的场景下,效率更高。
@@ -103,7 +103,7 @@ public interface TourismProjectService extends IBaseService<TourismProject, Long
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<TourismProject> getNotInTourismProjectListByTravelNotesId(Long travelNotesId, TourismProject filter, String orderBy);
+    List<TourismProject> getNotInTourismProjectListByTravelNotesId(String travelNotesId, TourismProject filter, String orderBy);
 
     /**
      * 在多对多关系中,当前Service的数据表为从表,返回与指定主表主键Id存在对多对关系的列表。
@@ -113,7 +113,7 @@ public interface TourismProjectService extends IBaseService<TourismProject, Long
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<TourismProject> getTourismProjectListByTravelNotesId(Long travelNotesId, TourismProject filter, String orderBy);
+    List<TourismProject> getTourismProjectListByTravelNotesId(String travelNotesId, TourismProject filter, String orderBy);
 
     /**
      * 在多对多关系中,当前Service的数据表为从表,返回与指定主表主键Id列表存在对多对关系的列表。
@@ -123,7 +123,7 @@ public interface TourismProjectService extends IBaseService<TourismProject, Long
      * @param orderBy 排序参数。
      * @return key是主表的主键Id,value是多对多从表的对象列表。
      */
-    Map<Long, List<TourismProject>> getTourismProjectListMapByTourTourismProjectTravelNotesList(
+    Map<String, List<TourismProject>> getTourismProjectListMapByTourTourismProjectTravelNotesList(
             List<TourTourismProjectTravelNotes> tourTourismProjectTravelNotesList, TourismProject filter, String orderBy);
 
     /**

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/RestaurantFoodTypeServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("restaurantFoodTypeService")
-public class RestaurantFoodTypeServiceImpl extends BaseService<RestaurantFoodType, Long> implements RestaurantFoodTypeService {
+public class RestaurantFoodTypeServiceImpl extends BaseService<RestaurantFoodType, String> implements RestaurantFoodTypeService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -151,7 +151,7 @@ public class RestaurantFoodTypeServiceImpl extends BaseService<RestaurantFoodTyp
 
     private RestaurantFoodType buildDefaultValue(RestaurantFoodType restaurantFoodType) {
         if (restaurantFoodType.getId() == null) {
-            restaurantFoodType.setId(idGenerator.nextLongId());
+            restaurantFoodType.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(restaurantFoodType);
         restaurantFoodType.setDataState(GlobalDeletedFlag.NORMAL);

+ 8 - 8
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismProjectTravelNotesServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.*;
 @Slf4j
 @MyDataSource(DataSourceType.MAIN)
 @Service("tourTourismProjectTravelNotesService")
-public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTourismProjectTravelNotes, Long> implements TourTourismProjectTravelNotesService {
+public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTourismProjectTravelNotes, String> implements TourTourismProjectTravelNotesService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -121,7 +121,7 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long id) {
+    public boolean remove(String id) {
         if (tourTourismProjectTravelNotesMapper.deleteById(id) == 0) {
             return false;
         }
@@ -151,9 +151,9 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addTourTravelNotesProjectRelationList(List<TourTravelNotesProjectRelation> tourTravelNotesProjectRelationList, Long travelNotesId) {
+    public void addTourTravelNotesProjectRelationList(List<TourTravelNotesProjectRelation> tourTravelNotesProjectRelationList, String travelNotesId) {
         for (TourTravelNotesProjectRelation tourTravelNotesProjectRelation : tourTravelNotesProjectRelationList) {
-            tourTravelNotesProjectRelation.setId(idGenerator.nextLongId());
+            tourTravelNotesProjectRelation.setId(idGenerator.nextStringId());
             tourTravelNotesProjectRelation.setTravelNotesId(travelNotesId);
             MyModelUtil.fillCommonsForInsert(tourTravelNotesProjectRelation);
             tourTravelNotesProjectRelation.setDataState(GlobalDeletedFlag.NORMAL);
@@ -174,7 +174,7 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
     }
 
     @Override
-    public TourTravelNotesProjectRelation getTourTravelNotesProjectRelation(Long travelNotesId, Long projectId) {
+    public TourTravelNotesProjectRelation getTourTravelNotesProjectRelation(String travelNotesId, String projectId) {
         TourTravelNotesProjectRelation filter = new TourTravelNotesProjectRelation();
         filter.setTravelNotesId(travelNotesId);
         filter.setProjectId(projectId);
@@ -183,7 +183,7 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeTourTravelNotesProjectRelation(Long travelNotesId, Long projectId) {
+    public boolean removeTourTravelNotesProjectRelation(String travelNotesId, String projectId) {
         TourTravelNotesProjectRelation filter = new TourTravelNotesProjectRelation();
         filter.setTravelNotesId(travelNotesId);
         filter.setProjectId(projectId);
@@ -192,7 +192,7 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeTourTravelNotesProjectRelationList(Long travelNotesId, List<Long> projectIdList) {
+    public void removeTourTravelNotesProjectRelationList(String travelNotesId, List<String> projectIdList) {
         LambdaQueryWrapper<TourTravelNotesProjectRelation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TourTravelNotesProjectRelation::getTravelNotesId, travelNotesId);
         queryWrapper.in(TourTravelNotesProjectRelation::getProjectId, projectIdList);
@@ -212,7 +212,7 @@ public class TourTourismProjectTravelNotesServiceImpl extends BaseService<TourTo
 
     private TourTourismProjectTravelNotes buildDefaultValue(TourTourismProjectTravelNotes tourTourismProjectTravelNotes) {
         if (tourTourismProjectTravelNotes.getId() == null) {
-            tourTourismProjectTravelNotes.setId(idGenerator.nextLongId());
+            tourTourismProjectTravelNotes.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(tourTourismProjectTravelNotes);
         tourTourismProjectTravelNotes.setDataState(GlobalDeletedFlag.NORMAL);

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismTravelNotesContentServiceImpl.java

@@ -78,7 +78,7 @@ public class TourTourismTravelNotesContentServiceImpl extends BaseService<TourTo
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int removeByAssociationId(Long associationId) {
+    public int removeByAssociationId(String associationId) {
         TourTourismTravelNotesContent deletedObject = new TourTourismTravelNotesContent();
         deletedObject.setAssociationId(associationId);
         return tourTourismTravelNotesContentMapper.delete(new QueryWrapper<>(deletedObject));

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTourismTravelNotesFileServiceImpl.java

@@ -81,7 +81,7 @@ public class TourTourismTravelNotesFileServiceImpl extends BaseService<TourTouri
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int removeByAssociationTableId(Long associationTableId) {
+    public int removeByAssociationTableId(String associationTableId) {
         TourTourismTravelNotesFile deletedObject = new TourTourismTravelNotesFile();
         deletedObject.setAssociationTableId(associationTableId);
         return tourTourismTravelNotesFileMapper.delete(new QueryWrapper<>(deletedObject));

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourTravelNotesProjectRelationServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.*;
 @Slf4j
 @MyDataSource(DataSourceType.MAIN)
 @Service("tourTravelNotesProjectRelationService")
-public class TourTravelNotesProjectRelationServiceImpl extends BaseService<TourTravelNotesProjectRelation, Long> implements TourTravelNotesProjectRelationService {
+public class TourTravelNotesProjectRelationServiceImpl extends BaseService<TourTravelNotesProjectRelation, String> implements TourTravelNotesProjectRelationService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -95,7 +95,7 @@ public class TourTravelNotesProjectRelationServiceImpl extends BaseService<TourT
 
     private TourTravelNotesProjectRelation buildDefaultValue(TourTravelNotesProjectRelation tourTravelNotesProjectRelation) {
         if (tourTravelNotesProjectRelation.getId() == null) {
-            tourTravelNotesProjectRelation.setId(idGenerator.nextLongId());
+            tourTravelNotesProjectRelation.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(tourTravelNotesProjectRelation);
         tourTravelNotesProjectRelation.setDataState(GlobalDeletedFlag.NORMAL);

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismContentServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("tourismContentService")
-public class TourismContentServiceImpl extends BaseService<TourismContent, Long> implements TourismContentService {
+public class TourismContentServiceImpl extends BaseService<TourismContent, String> implements TourismContentService {
 
     @Autowired
     private TourismContentMapper tourismContentMapper;
@@ -75,7 +75,7 @@ public class TourismContentServiceImpl extends BaseService<TourismContent, Long>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int removeByAssociationId(Long associationId) {
+    public int removeByAssociationId(String associationId) {
         TourismContent deletedObject = new TourismContent();
         deletedObject.setAssociationId(associationId);
         return tourismContentMapper.delete(new QueryWrapper<>(deletedObject));

+ 2 - 2
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismDatePriceServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("tourismDatePriceService")
-public class TourismDatePriceServiceImpl extends BaseService<TourismDatePrice, Long> implements TourismDatePriceService {
+public class TourismDatePriceServiceImpl extends BaseService<TourismDatePrice, String> implements TourismDatePriceService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -108,7 +108,7 @@ public class TourismDatePriceServiceImpl extends BaseService<TourismDatePrice, L
 
     private TourismDatePrice buildDefaultValue(TourismDatePrice tourismDatePrice) {
         if (tourismDatePrice.getId() == null) {
-            tourismDatePrice.setId(idGenerator.nextLongId());
+            tourismDatePrice.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(tourismDatePrice);
         tourismDatePrice.setDataState(GlobalDeletedFlag.NORMAL);

+ 3 - 3
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismFileServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("tourismFileService")
-public class TourismFileServiceImpl extends BaseService<TourismFile, Long> implements TourismFileService {
+public class TourismFileServiceImpl extends BaseService<TourismFile, String> implements TourismFileService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -78,7 +78,7 @@ public class TourismFileServiceImpl extends BaseService<TourismFile, Long> imple
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int removeByAssociationTableId(Long associationTableId) {
+    public int removeByAssociationTableId(String associationTableId) {
         TourismFile deletedObject = new TourismFile();
         deletedObject.setAssociationTableId(associationTableId);
         return tourismFileMapper.delete(new QueryWrapper<>(deletedObject));
@@ -101,7 +101,7 @@ public class TourismFileServiceImpl extends BaseService<TourismFile, Long> imple
 
     private TourismFile buildDefaultValue(TourismFile tourismFile) {
         if (tourismFile.getId() == null) {
-            tourismFile.setId(idGenerator.nextLongId());
+            tourismFile.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(tourismFile);
         tourismFile.setDataState(GlobalDeletedFlag.NORMAL);

+ 7 - 7
application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourismProjectServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("tourismProjectService")
-public class TourismProjectServiceImpl extends BaseService<TourismProject, Long> implements TourismProjectService {
+public class TourismProjectServiceImpl extends BaseService<TourismProject, String> implements TourismProjectService {
 
     @Autowired
     private IdGeneratorWrapper idGenerator;
@@ -163,7 +163,7 @@ public class TourismProjectServiceImpl extends BaseService<TourismProject, Long>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long id) {
+    public boolean remove(String id) {
         if (tourismProjectMapper.deleteById(id) == 0) {
             return false;
         }
@@ -192,7 +192,7 @@ public class TourismProjectServiceImpl extends BaseService<TourismProject, Long>
     }
 
     @Override
-    public List<TourismProject> getNotInTourismProjectListByTravelNotesId(Long travelNotesId, TourismProject filter, String orderBy) {
+    public List<TourismProject> getNotInTourismProjectListByTravelNotesId(String travelNotesId, TourismProject filter, String orderBy) {
         List<TourismProject> resultList;
         if (travelNotesId != null) {
             resultList = tourismProjectMapper.getNotInTourismProjectListByTravelNotesId(travelNotesId, filter, orderBy);
@@ -204,7 +204,7 @@ public class TourismProjectServiceImpl extends BaseService<TourismProject, Long>
     }
 
     @Override
-    public List<TourismProject> getTourismProjectListByTravelNotesId(Long travelNotesId, TourismProject filter, String orderBy) {
+    public List<TourismProject> getTourismProjectListByTravelNotesId(String travelNotesId, TourismProject filter, String orderBy) {
         List<TourismProject> resultList =
                 tourismProjectMapper.getTourismProjectListByTravelNotesId(travelNotesId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
@@ -218,9 +218,9 @@ public class TourismProjectServiceImpl extends BaseService<TourismProject, Long>
     }
 
     @Override
-    public Map<Long, List<TourismProject>> getTourismProjectListMapByTourTourismProjectTravelNotesList(
+    public Map<String, List<TourismProject>> getTourismProjectListMapByTourTourismProjectTravelNotesList(
             List<TourTourismProjectTravelNotes> tourTourismProjectTravelNotesList, TourismProject filter, String orderBy) {
-        List<Long> travelNotesIds = tourTourismProjectTravelNotesList.stream().map(TourTourismProjectTravelNotes::getId).collect(Collectors.toList());
+        List<String> travelNotesIds = tourTourismProjectTravelNotesList.stream().map(TourTourismProjectTravelNotes::getId).collect(Collectors.toList());
         List<TourismProject> resultList =
                 tourismProjectMapper.getTourismProjectListByTravelNotesIds(travelNotesIds, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
@@ -270,7 +270,7 @@ public class TourismProjectServiceImpl extends BaseService<TourismProject, Long>
 
     private TourismProject buildDefaultValue(TourismProject tourismProject) {
         if (tourismProject.getId() == null) {
-            tourismProject.setId(idGenerator.nextLongId());
+            tourismProject.setId(idGenerator.nextStringId());
         }
         MyModelUtil.fillCommonsForInsert(tourismProject);
         tourismProject.setDataState(GlobalDeletedFlag.NORMAL);

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/vo/RestaurantFoodInfoVo.java

@@ -73,7 +73,7 @@ public class RestaurantFoodInfoVo extends BaseVo {
      * 用户所在部门Id。
      */
     @Schema(description = "用户所在部门Id")
-    private Long restaurantId;
+    private String restaurantId;
 
     /**
      * 打包费。

+ 1 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourOrderVo.java

@@ -103,7 +103,7 @@ public class TourOrderVo extends BaseVo {
      * 旅游项目。
      */
     @Schema(description = "旅游项目")
-    private Long projectId;
+    private String projectId;
 
     /**
      * 项目简述。