添加草莓500里的文件

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -27,13 +27,21 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_MDSK_ARTISTS_RELATION = "sweet:mdsk:artists:relation:uid:";
     public final static String REDIS_KEY_SWEET_MDSK_SHOP = "sweet:mdsk:artists:shop:manual:";
 
-    public final static String REDIS_KEY_SWEET_TFC_MANUAL_PUSH_LIST = "sweet:mdsk:manual:pushList";
-    public final static String REDIS_KEY_SWEET_TFC_MANUAL_TIME_LIST = "sweet:mdsk:manual:timeList:manual:";
-    public final static String REDIS_KEY_SWEET_TFC_MANUAL_NOTIFY_LIST = "sweet:mdsk:manual:notify:manual:";
-    public final static String REDIS_KEY_SWEET_TFC_MANUAL_RICH_TEXT = "sweet:mdsk:manual:richText:manual:";
-    public final static String REDIS_KEY_SWEET_TFC_MANUAL_SORT = "sweet:mdsk:manual:sort:manual:";
-    public final static String REDIS_KEY_SWEET_TFC_ARTISTS_RELATION = "sweet:mdsk:artists:relation:uid:";
-    public final static String REDIS_KEY_SWEET_TFC_SHOP = "sweet:mdsk:artists:shop:manual:";
+    public final static String REDIS_KEY_SWEET_FIVE_MANUAL_PUSH_LIST = "sweet:five:manual:pushList";
+    public final static String REDIS_KEY_SWEET_FIVE_MANUAL_TIME_LIST = "sweet:five:manual:timeList:manual:";
+    public final static String REDIS_KEY_SWEET_FIVE_MANUAL_NOTIFY_LIST = "sweet:five:manual:notify:manual:";
+    public final static String REDIS_KEY_SWEET_FIVE_MANUAL_RICH_TEXT = "sweet:five:manual:richText:manual:";
+    public final static String REDIS_KEY_SWEET_FIVE_MANUAL_SORT = "sweet:five:manual:sort:manual:";
+    public final static String REDIS_KEY_SWEET_FIVE_ARTISTS_RELATION = "sweet:five:artists:relation:uid:";
+    public final static String REDIS_KEY_SWEET_FIVE_SHOP = "sweet:five:artists:shop:manual:";
+
+    public final static String REDIS_KEY_SWEET_TFC_MANUAL_PUSH_LIST = "sweet:tfc:manual:pushList";
+    public final static String REDIS_KEY_SWEET_TFC_MANUAL_TIME_LIST = "sweet:tfc:manual:timeList:manual:";
+    public final static String REDIS_KEY_SWEET_TFC_MANUAL_NOTIFY_LIST = "sweet:tfc:manual:notify:manual:";
+    public final static String REDIS_KEY_SWEET_TFC_MANUAL_RICH_TEXT = "sweet:tfc:manual:richText:manual:";
+    public final static String REDIS_KEY_SWEET_TFC_MANUAL_SORT = "sweet:tfc:manual:sort:manual:";
+    public final static String REDIS_KEY_SWEET_TFC_ARTISTS_RELATION = "sweet:tfc:artists:relation:uid:";
+    public final static String REDIS_KEY_SWEET_TFC_SHOP = "sweet:tfc:artists:shop:manual:";
 
     // 积分活动
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST = "sweet:integralActivity:list";

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetManualArtistsFiveService.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.sweet.service.five;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualArtistsMdsk;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualArtistsFive;
 
 /**
  * <p>
@@ -14,12 +14,13 @@ import com.liquidnet.service.sweet.entity.SweetManualArtistsMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetManualArtistsFiveService extends IService<SweetManualArtistsMdsk> {
-    ResponseDto<PageInfo<SweetManualArtistListMDSKDto>> getList(Integer page, Integer size, String manualId);
+public interface ISweetManualArtistsFiveService extends IService<SweetManualArtistsFive> {
+    
+    ResponseDto<PageInfo<SweetManualArtistListFiveDto>> getList(Integer page, Integer size, String manualId);
 
     ResponseDto<Boolean> add(String manualId,String artistId, String stageId,String performanceStart,String performanceEnd,String signatureStart,String signatureEnd);
 
-    ResponseDto<SweetManualArtistListMDSKDto> details(String manualRelationId);
+    ResponseDto<SweetManualArtistListFiveDto> details(String manualRelationId);
 
     ResponseDto<Boolean> change(String manualRelationId,String manualId,String artistId, String stageId,String performanceStart,String performanceEnd,String signatureStart,String signatureEnd);
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetManualFiveService.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.sweet.service.five;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.dto.SweetManualMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualMdsk;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualFive;
 
 /**
  * <p>
@@ -14,11 +14,11 @@ import com.liquidnet.service.sweet.entity.SweetManualMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetManualFiveService extends IService<SweetManualMdsk> {
+public interface ISweetManualFiveService extends IService<SweetManualFive> {
 
-    ResponseDto<PageInfo<SweetManualMDSKDto>> getManualList(int page, int size, String name);
+    ResponseDto<PageInfo<SweetManualFiveDto>> getManualList(int page, int size, String name);
 
-    ResponseDto<SweetManualMDSKDto> details(String manualId);
+    ResponseDto<SweetManualFiveDto> details(String manualId);
 
     //关闭开启
     ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status);

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetManualNotifyFiveService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.sweet.service.five;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyFive;
 
 /**
  * <p>
@@ -13,12 +13,12 @@ import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetManualNotifyFiveService extends IService<SweetManualNotifyMdsk> {
-    ResponseDto<PageInfo<SweetManualNotifyMdsk>> getList(Integer page, Integer size, String title, String manualId);
+public interface ISweetManualNotifyFiveService extends IService<SweetManualNotifyFive> {
+    ResponseDto<PageInfo<SweetManualNotifyFive>> getList(Integer page, Integer size, String title, String manualId);
 
     ResponseDto<Boolean> add(String manualId,String title, String content);
 
-    ResponseDto<SweetManualNotifyMdsk> details(String manualId);
+    ResponseDto<SweetManualNotifyFive> details(String manualId);
 
     ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content);
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetManualShopFiveService.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.sweet.service.five;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
 
 import java.util.List;
 
@@ -14,10 +14,10 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetManualShopFiveService extends IService<SweetManualShopMdsk> {
-    ResponseDto<List<SweetManualShopMdsk>> getList(String manualId, Integer type);
+public interface ISweetManualShopFiveService extends IService<SweetManualShopFive> {
+    ResponseDto<List<SweetManualShopFive>> getList(String manualId, Integer type);
 
-    ResponseDto<SweetManualShopMdsk> details(String manualShopId);
+    ResponseDto<SweetManualShopFive> details(String manualShopId);
 
     ResponseDto<Boolean> add(String manualId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetManualSortFiveService.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.sweet.service.five;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualSortFive;
 
 /**
  * <p>
@@ -12,8 +12,8 @@ import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetManualSortFiveService extends IService<SweetManualSortMdsk> {
-    ResponseDto<SweetManualSortMdsk> get(String manualId);
+public interface ISweetManualSortFiveService extends IService<SweetManualSortFive> {
+    ResponseDto<SweetManualSortFive> get(String manualId);
 
     ResponseDto<Boolean> add(String manualId,String content);
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetRichtextFiveService.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.sweet.service.five;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
+import com.liquidnet.service.sweet.entity.SweetRichtextFive;
 
 /**
  * <p>
@@ -12,8 +12,8 @@ import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetRichtextFiveService extends IService<SweetRichtextMdsk> {
-    ResponseDto<SweetRichtextMdsk> get(String manualId, Integer type);
+public interface ISweetRichtextFiveService extends IService<SweetRichtextFive> {
+    ResponseDto<SweetRichtextFive> get(String manualId, Integer type);
 
     ResponseDto<Boolean> add(String manualId,String details, String local, String pirUrl, Integer type);
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/five/ISweetUserRelationFiveService.java

 package com.liquidnet.service.sweet.service.five;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
+import com.liquidnet.service.sweet.entity.SweetUserRelationFive;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface ISweetUserRelationFiveService extends IService<SweetUserRelationMdsk> {
+public interface ISweetUserRelationFiveService extends IService<SweetUserRelationFive> {
 
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetManualShopFiveAllVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
+import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class SweetManualShopFiveAllVo implements Serializable ,Cloneable {
+    @ApiModelProperty("推荐")
+    private List<SweetManualShopFive> recommend;
+    @ApiModelProperty("吃喝")
+    private List<SweetManualShopFive> eat;
+    @ApiModelProperty("玩乐")
+    private List<SweetManualShopFive> play;
+
+    private static final SweetManualShopFiveAllVo obj = new SweetManualShopFiveAllVo();
+    public static SweetManualShopFiveAllVo getNew() {
+        try {
+            return (SweetManualShopFiveAllVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualShopFiveAllVo();
+        }
+    }
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualArtistsFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualArtistsMdsk;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualArtistStageListFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualArtistStageListFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualArtistsFive;
 
 import java.util.List;
 import java.util.Map;
@@ -16,12 +18,12 @@ import java.util.Map;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetManualArtistsFiveMapper extends BaseMapper<SweetManualArtistsMdsk> {
+public interface SweetManualArtistsFiveMapper extends BaseMapper<SweetManualArtistsFive> {
 
-    List<SweetManualArtistListMDSKDto> getManualList(Map<String, Object> map);
+    List<SweetManualArtistListFiveDto> getManualList(Map<String, Object> map);
 
-    SweetManualArtistListMDSKDto getManualDetails(Map<String, Object> map);
+    SweetManualArtistListFiveDto getManualDetails(Map<String, Object> map);
 
-    List<SweetManualArtistStageListMDSKDto> getStageNameList(Map<String, Object> map);
+    List<SweetManualArtistStageListFiveDto> getStageNameList(Map<String, Object> map);
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.dto.SweetManualAppletMDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualMdsk;
+import com.liquidnet.service.sweet.dto.SweetManualAppletFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualAppletFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualFive;
 
 import java.util.List;
 import java.util.Map;
@@ -16,12 +18,12 @@ import java.util.Map;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetManualFiveMapper extends BaseMapper<SweetManualMdsk> {
+public interface SweetManualFiveMapper extends BaseMapper<SweetManualFive> {
 
-    List<SweetManualMDSKDto> getManualList(Map<String,Object> map);
+    List<SweetManualFiveDto> getManualList(Map<String,Object> map);
 
-    SweetManualMDSKDto getManualDetails(Map<String,Object> map);
+    SweetManualFiveDto getManualDetails(Map<String,Object> map);
 
-    List<SweetManualAppletMDSKDto> getManualAppletDto();
+    List<SweetManualAppletFiveDto> getManualAppletDto();
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualNotifyFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyFive;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyFive;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetManualNotifyFiveMapper extends BaseMapper<SweetManualNotifyMdsk> {
+public interface SweetManualNotifyFiveMapper extends BaseMapper<SweetManualNotifyFive> {
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualShopFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetManualShopFiveMapper extends BaseMapper<SweetManualShopMdsk> {
+public interface SweetManualShopFiveMapper extends BaseMapper<SweetManualShopFive> {
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualSortFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
+import com.liquidnet.service.sweet.entity.SweetManualSortFive;
+import com.liquidnet.service.sweet.entity.SweetManualSortFive;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetManualSortFiveMapper extends BaseMapper<SweetManualSortMdsk> {
+public interface SweetManualSortFiveMapper extends BaseMapper<SweetManualSortFive> {
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetRichtextFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
+import com.liquidnet.service.sweet.entity.SweetRichtextFive;
+import com.liquidnet.service.sweet.entity.SweetRichtextFive;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetRichtextFiveMapper extends BaseMapper<SweetRichtextMdsk> {
+public interface SweetRichtextFiveMapper extends BaseMapper<SweetRichtextFive> {
 
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationFiveMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
+import com.liquidnet.service.sweet.entity.SweetUserRelationFive;
+import com.liquidnet.service.sweet.entity.SweetUserRelationFive;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
  * @author liquidnet
  * @since 2021-08-09
  */
-public interface SweetUserRelationFiveMapper extends BaseMapper<SweetUserRelationMdsk> {
+public interface SweetUserRelationFiveMapper extends BaseMapper<SweetUserRelationFive> {
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetAppletFiveController.java

@@ -2,15 +2,13 @@ package com.liquidnet.service.sweet.controller.five;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.dto.SweetManualAppletMDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistList2MDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
-import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
-import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
+import com.liquidnet.service.sweet.dto.*;
+import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.utils.ObjectUtil;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
 import com.liquidnet.service.sweet.utils.RedisMDSKDataUtils;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
+import com.liquidnet.service.sweet.vo.SweetManualShopFiveAllVo;
 import com.liquidnet.service.sweet.vo.SweetManualShopMdskAllVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -29,17 +27,17 @@ import java.util.Map;
 public class SweetAppletFiveController {
 
     @Autowired
-    private RedisMDSKDataUtils redisDataUtils;
+    private RedisFiveDataUtils redisDataUtils;
 
     @GetMapping("timeSelect")
     @ApiOperation("场次选择")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "名称", required = true),
     })
-    public ResponseDto<List<SweetManualAppletMDSKDto>> timeSelect(@RequestParam String name) {
-        List<SweetManualAppletMDSKDto> dto = redisDataUtils.getPushList();
-        List<SweetManualAppletMDSKDto> vo = ObjectUtil.getSweetManualAppletMDSKDtoList();
-        for (SweetManualAppletMDSKDto item : dto) {
+    public ResponseDto<List<SweetManualAppletFiveDto>> timeSelect(@RequestParam String name) {
+        List<SweetManualAppletFiveDto> dto = redisDataUtils.getPushList();
+        List<SweetManualAppletFiveDto> vo = ObjectUtil.getSweetManualAppletFiveDtoList();
+        for (SweetManualAppletFiveDto item : dto) {
             if (item.getTitle().contains(name) || item.getTitle().contains("M_DSK")) {
                 vo.add(item);
             }
@@ -52,7 +50,7 @@ public class SweetAppletFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
     })
-    public ResponseDto<SweetManualAppletMDSKDto> details(@RequestParam() String manualId) {
+    public ResponseDto<SweetManualAppletFiveDto> details(@RequestParam() String manualId) {
         return ResponseDto.success(redisDataUtils.getAppletPerformance(manualId));
     }
 
@@ -61,7 +59,7 @@ public class SweetAppletFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
     })
-    public ResponseDto<List<SweetManualNotifyMdsk>> notify(@RequestParam() String manualId) {
+    public ResponseDto<List<SweetManualNotifyFive>> notify(@RequestParam() String manualId) {
         return ResponseDto.success(redisDataUtils.getNotifyRedisData(manualId));
     }
 
@@ -85,7 +83,7 @@ public class SweetAppletFiveController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = false),
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
     })
-    public ResponseDto<SweetManualArtistList2MDSKDto> timeList(@RequestParam String manualId,
+    public ResponseDto<SweetManualArtistList2FiveDto> timeList(@RequestParam String manualId,
                                                                @RequestParam(required = false) String dateTime,
                                                                @RequestParam(required = false) String stage,
                                                                @RequestParam Integer isSign,
@@ -93,13 +91,13 @@ public class SweetAppletFiveController {
                                                                @RequestParam(required = false) Integer size,
                                                                @RequestParam String uid) {
         try {
-            List<SweetManualArtistListMDSKDto> allReturnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
-            List<SweetManualArtistListMDSKDto> returnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
+            List<SweetManualArtistListFiveDto> allReturnArtist = ObjectUtil.getSweetManualArtistListFiveDtoList();
+            List<SweetManualArtistListFiveDto> returnArtist = ObjectUtil.getSweetManualArtistListFiveDtoList();
 
-            SweetManualArtistList2MDSKDto data = redisDataUtils.getTimeList(manualId);
+            SweetManualArtistList2FiveDto data = redisDataUtils.getTimeList(manualId);
             SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
 
-            List<SweetManualArtistListMDSKDto> artistData = data.getData();
+            List<SweetManualArtistListFiveDto> artistData = data.getData();
 
             int startPosition = 0;
             int endPosition = 0;
@@ -116,7 +114,7 @@ public class SweetAppletFiveController {
                 }
             }
 
-            for (SweetManualArtistListMDSKDto item : artistData) {
+            for (SweetManualArtistListFiveDto item : artistData) {
                 boolean isSave = true;
                 if (isSign == 1) {
                     if (item.getSignatureStart() == null) {
@@ -145,7 +143,7 @@ public class SweetAppletFiveController {
             }
 
             for (int i = 0; i < allReturnArtist.size(); i++) {
-                SweetManualArtistListMDSKDto item = allReturnArtist.get(i);
+                SweetManualArtistListFiveDto item = allReturnArtist.get(i);
                 if (page != null && i >= startPosition && i < endPosition) {
 
                     item.setIsWatch(0);
@@ -194,7 +192,7 @@ public class SweetAppletFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
     })
-    public ResponseDto<SweetRichtextMdsk> richText(@RequestParam() String manualId,
+    public ResponseDto<SweetRichtextFive> richText(@RequestParam() String manualId,
                                                    @RequestParam() String type) {
         return ResponseDto.success(redisDataUtils.getRichTextRedisData(manualId, type));
     }
@@ -266,15 +264,15 @@ public class SweetAppletFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true)
     })
-    public ResponseDto<SweetManualArtistListMDSKDto> artistsDetails(@RequestParam String artistsId,
+    public ResponseDto<SweetManualArtistListFiveDto> artistsDetails(@RequestParam String artistsId,
                                                                     @RequestParam String manualId,
                                                                     @RequestParam String uid) {
-        SweetManualArtistList2MDSKDto data = redisDataUtils.getTimeList(manualId);
-        List<SweetManualArtistListMDSKDto> dataList = data.getData();
+        SweetManualArtistList2FiveDto data = redisDataUtils.getTimeList(manualId);
+        List<SweetManualArtistListFiveDto> dataList = data.getData();
         SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
 
-        SweetManualArtistListMDSKDto vo = SweetManualArtistListMDSKDto.getNew();
-        for (SweetManualArtistListMDSKDto item : dataList) {
+        SweetManualArtistListFiveDto vo = SweetManualArtistListFiveDto.getNew();
+        for (SweetManualArtistListFiveDto item : dataList) {
             if (item.getArtistId().equalsIgnoreCase(artistsId)) {
                 item.setIsWatch(0);
                 item.setIsSign(0);
@@ -310,15 +308,15 @@ public class SweetAppletFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
     })
-    public ResponseDto<SweetManualShopMdskAllVo> manualShop(@RequestParam String manualId) {
-        List<SweetManualShopMdsk> shopList = redisDataUtils.getManualShopRedisData(manualId);
+    public ResponseDto<SweetManualShopFiveAllVo> manualShop(@RequestParam String manualId) {
+        List<SweetManualShopFive> shopList = redisDataUtils.getManualShopRedisData(manualId);
 
-        List<SweetManualShopMdsk> recommend = ObjectUtil.getSweetManualShopMdskList();
-        List<SweetManualShopMdsk> eat = ObjectUtil.getSweetManualShopMdskList();
-        List<SweetManualShopMdsk> play = ObjectUtil.getSweetManualShopMdskList();
-        SweetManualShopMdskAllVo vo = SweetManualShopMdskAllVo.getNew();
+        List<SweetManualShopFive> recommend = ObjectUtil.getSweetManualShopFiveList();
+        List<SweetManualShopFive> eat = ObjectUtil.getSweetManualShopFiveList();
+        List<SweetManualShopFive> play = ObjectUtil.getSweetManualShopFiveList();
+        SweetManualShopFiveAllVo vo = SweetManualShopFiveAllVo.getNew();
 
-        for (SweetManualShopMdsk item : shopList) {
+        for (SweetManualShopFive item : shopList) {
             if (item.getIsRecommend().equals(1)) {
                 recommend.add(item);
             }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetManualArtistsFiveController.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
-import com.liquidnet.service.sweet.service.ISweetManualArtistsMdskService;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListFiveDto;
+import com.liquidnet.service.sweet.service.five.ISweetManualArtistsFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册艺人_MDSK")
+@Api(tags = "电子手册艺人_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-manual-artists")
+@RequestMapping("/Five/sweet-manual-artists")
 public class SweetManualArtistsFiveController {
 
     @Autowired
-    private ISweetManualArtistsMdskService sweetManualArtistsMdskService;
+    private ISweetManualArtistsFiveService sweetManualArtistsFiveService;
 
     @GetMapping("getList")
     @ApiOperation("宣传手册艺人列表")
@@ -35,10 +35,10 @@ public class SweetManualArtistsFiveController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "manaulId", value = "手册id", required = true),
     })
-    public ResponseDto<PageInfo<SweetManualArtistListMDSKDto>> getList(@RequestParam() Integer page,
+    public ResponseDto<PageInfo<SweetManualArtistListFiveDto>> getList(@RequestParam() Integer page,
                                                                        @RequestParam() Integer size,
                                                                        @RequestParam() String manualId) {
-        return sweetManualArtistsMdskService.getList(page, size, manualId);
+        return sweetManualArtistsFiveService.getList(page, size, manualId);
     }
 
     @GetMapping("details")
@@ -46,8 +46,8 @@ public class SweetManualArtistsFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualRelationId", value = "手册艺人id", required = true),
     })
-    public ResponseDto<SweetManualArtistListMDSKDto> details(@RequestParam() String manualRelationId) {
-        return sweetManualArtistsMdskService.details(manualRelationId);
+    public ResponseDto<SweetManualArtistListFiveDto> details(@RequestParam() String manualRelationId) {
+        return sweetManualArtistsFiveService.details(manualRelationId);
     }
 
     @PostMapping("add")
@@ -68,7 +68,7 @@ public class SweetManualArtistsFiveController {
                                     @RequestParam( required = false) String performanceEnd,
                                     @RequestParam( required = false) String signatureStart,
                                     @RequestParam( required = false) String signatureEnd) {
-        return sweetManualArtistsMdskService.add(manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
+        return sweetManualArtistsFiveService.add(manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
     }
 
     @PostMapping("change")
@@ -91,7 +91,7 @@ public class SweetManualArtistsFiveController {
                                        @RequestParam( required = false) String performanceEnd,
                                        @RequestParam( required = false) String signatureStart,
                                        @RequestParam(required = false) String signatureEnd) {
-        return sweetManualArtistsMdskService.change(manualRelationId, manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
+        return sweetManualArtistsFiveService.change(manualRelationId, manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
     }
 
     @DeleteMapping("delete")
@@ -102,7 +102,7 @@ public class SweetManualArtistsFiveController {
     })
     public ResponseDto<Boolean> delete(@RequestParam() String manualRelationId,
                                        @RequestParam() String manualId) {
-        return sweetManualArtistsMdskService.delete(manualRelationId, manualId);
+        return sweetManualArtistsFiveService.delete(manualRelationId, manualId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetManualFiveController.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.dto.SweetManualMDSKDto;
-import com.liquidnet.service.sweet.service.ISweetManualMdskService;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.service.five.ISweetManualFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册_MDSK")
+@Api(tags = "电子手册_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-manual")
+@RequestMapping("/Five/sweet-manual")
 public class SweetManualFiveController {
     @Autowired
-    private ISweetManualMdskService sweetManualMdskService;
+    private ISweetManualFiveService sweetManualFiveService;
 
     @GetMapping("list")
     @ApiOperation("宣传手册列表")
@@ -34,10 +34,10 @@ public class SweetManualFiveController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "姓名", required = false),
     })
-    public ResponseDto<PageInfo<SweetManualMDSKDto>> getList(@RequestParam() Integer page,
+    public ResponseDto<PageInfo<SweetManualFiveDto>> getList(@RequestParam() Integer page,
                                                              @RequestParam() Integer size,
                                                              @RequestParam(required = false) String name) {
-        return sweetManualMdskService.getManualList(page, size, name);
+        return sweetManualFiveService.getManualList(page, size, name);
     }
 
 
@@ -46,8 +46,8 @@ public class SweetManualFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id"),
     })
-    public ResponseDto<SweetManualMDSKDto> details(@RequestParam(required = false) String manualId) {
-        return sweetManualMdskService.details(manualId);
+    public ResponseDto<SweetManualFiveDto> details(@RequestParam(required = false) String manualId) {
+        return sweetManualFiveService.details(manualId);
     }
 
     @PostMapping("changeRelease")
@@ -58,7 +58,7 @@ public class SweetManualFiveController {
     })
     public ResponseDto<Boolean> changeRelease(@RequestParam() String manualId,
                                               @RequestParam() Integer isRelease) {
-        return sweetManualMdskService.changeRelease(manualId, isRelease);
+        return sweetManualFiveService.changeRelease(manualId, isRelease);
     }
 
     @PostMapping("changeStatus")
@@ -71,6 +71,6 @@ public class SweetManualFiveController {
     public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
                                              @RequestParam() String performancesId,
                                              @RequestParam() Integer status) {
-        return sweetManualMdskService.changeStatus(manualId, performancesId, status);
+        return sweetManualFiveService.changeStatus(manualId, performancesId, status);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetManualNotifyFiveController.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
-import com.liquidnet.service.sweet.service.ISweetManualNotifyMdskService;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyFive;
+import com.liquidnet.service.sweet.service.five.ISweetManualNotifyFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册通知_MDSK")
+@Api(tags = "电子手册通知_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-manual-notify")
+@RequestMapping("/Five/sweet-manual-notify")
 public class SweetManualNotifyFiveController {
 
     @Autowired
-    ISweetManualNotifyMdskService sweetManualNotifyMdskService;
+    ISweetManualNotifyFiveService sweetManualNotifyFiveService;
 
     @GetMapping("list")
     @ApiOperation("通知列表")
@@ -36,11 +36,11 @@ public class SweetManualNotifyFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "通知标题 不查询从传递null", required = false),
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
     })
-    public ResponseDto<PageInfo<SweetManualNotifyMdsk>> getList(@RequestParam() Integer page,
+    public ResponseDto<PageInfo<SweetManualNotifyFive>> getList(@RequestParam() Integer page,
                                                                 @RequestParam() Integer size,
                                                                 @RequestParam( required = false) String name,
                                                                 @RequestParam() String manualId) {
-        return sweetManualNotifyMdskService.getList(page, size, name, manualId);
+        return sweetManualNotifyFiveService.getList(page, size, name, manualId);
     }
 
     @PostMapping("add")
@@ -53,7 +53,7 @@ public class SweetManualNotifyFiveController {
     public ResponseDto<Boolean> add(@RequestParam() String manualId,
                                     @RequestParam() String title,
                                     @RequestParam() String content) {
-        return sweetManualNotifyMdskService.add(manualId, title, content);
+        return sweetManualNotifyFiveService.add(manualId, title, content);
     }
 
     @GetMapping("detail")
@@ -61,8 +61,8 @@ public class SweetManualNotifyFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualNotifyId", value = "通知id", required = true),
     })
-    public ResponseDto<SweetManualNotifyMdsk> detail(@RequestParam() String manualNotifyId) {
-        return sweetManualNotifyMdskService.details(manualNotifyId);
+    public ResponseDto<SweetManualNotifyFive> detail(@RequestParam() String manualNotifyId) {
+        return sweetManualNotifyFiveService.details(manualNotifyId);
     }
 
     @PostMapping("change")
@@ -77,7 +77,7 @@ public class SweetManualNotifyFiveController {
                                        @RequestParam() String manualNotifyId,
                                        @RequestParam() String title,
                                        @RequestParam() String content) {
-        return sweetManualNotifyMdskService.change(manualId, manualNotifyId, title, content);
+        return sweetManualNotifyFiveService.change(manualId, manualNotifyId, title, content);
     }
 
     @DeleteMapping("delete")
@@ -86,7 +86,7 @@ public class SweetManualNotifyFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualNotifyId", value = "手册通知id", required = true),
     })
     public ResponseDto<Boolean> delete(@RequestParam() String manualNotifyId) {
-        return sweetManualNotifyMdskService.delete(manualNotifyId);
+        return sweetManualNotifyFiveService.delete(manualNotifyId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetManualShopFiveController.java

@@ -2,8 +2,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
-import com.liquidnet.service.sweet.service.ISweetManualShopMdskService;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
+import com.liquidnet.service.sweet.service.five.ISweetManualShopFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,13 +21,13 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册吃喝玩乐_MDSK")
+@Api(tags = "电子手册吃喝玩乐_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-manual-shop")
+@RequestMapping("/Five/sweet-manual-shop")
 public class SweetManualShopFiveController {
 
     @Autowired
-    ISweetManualShopMdskService sweetManualShopMdskService;
+    ISweetManualShopFiveService sweetManualShopFiveService;
 
     @GetMapping("list")
     @ApiOperation("列表")
@@ -35,9 +35,9 @@ public class SweetManualShopFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true),
     })
-    public ResponseDto<List<SweetManualShopMdsk>> getList(@RequestParam String manualId,
+    public ResponseDto<List<SweetManualShopFive>> getList(@RequestParam String manualId,
                                                           @RequestParam Integer type) {
-        return sweetManualShopMdskService.getList(manualId, type);
+        return sweetManualShopFiveService.getList(manualId, type);
     }
 
     @GetMapping("details")
@@ -45,8 +45,8 @@ public class SweetManualShopFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
     })
-    public ResponseDto<SweetManualShopMdsk> details(@RequestParam String manualShopId) {
-        return sweetManualShopMdskService.details(manualShopId);
+    public ResponseDto<SweetManualShopFive> details(@RequestParam String manualShopId) {
+        return sweetManualShopFiveService.details(manualShopId);
     }
 
     @PostMapping("add")
@@ -67,7 +67,7 @@ public class SweetManualShopFiveController {
                                     @RequestParam Integer type,
                                     @RequestParam Integer isRecommend,
                                     @RequestParam Integer sort) {
-        return sweetManualShopMdskService.add(manualId, title, picUrl, describes, type, isRecommend, sort);
+        return sweetManualShopFiveService.add(manualId, title, picUrl, describes, type, isRecommend, sort);
     }
 
     @PostMapping("change")
@@ -90,7 +90,7 @@ public class SweetManualShopFiveController {
                                        @RequestParam Integer type,
                                        @RequestParam Integer isRecommend,
                                        @RequestParam Integer sort) {
-        return sweetManualShopMdskService.change(manualShopId, manualId, title, picUrl, describes, type, isRecommend, sort);
+        return sweetManualShopFiveService.change(manualShopId, manualId, title, picUrl, describes, type, isRecommend, sort);
     }
 
 
@@ -102,7 +102,7 @@ public class SweetManualShopFiveController {
     })
     public ResponseDto<Boolean> delete(@RequestParam() String manualShopId,
                                        @RequestParam String manualId) {
-        return sweetManualShopMdskService.delete(manualShopId, manualId);
+        return sweetManualShopFiveService.delete(manualShopId, manualId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetManualSortFiveController.java

@@ -2,8 +2,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
-import com.liquidnet.service.sweet.service.ISweetManualSortMdskService;
+import com.liquidnet.service.sweet.entity.SweetManualSortFive;
+import com.liquidnet.service.sweet.service.five.ISweetManualSortFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,13 +19,13 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册显示tag_MDSK")
+@Api(tags = "电子手册显示tag_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-manual-sort")
+@RequestMapping("/Five/sweet-manual-sort")
 public class SweetManualSortFiveController {
 
     @Autowired
-    private ISweetManualSortMdskService sweetManualSortMdskService;
+    private ISweetManualSortFiveService sweetManualSortFiveService;
 
 
     @PostMapping("add")
@@ -36,7 +36,7 @@ public class SweetManualSortFiveController {
     })
     public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
                                              @RequestParam() String content) {
-        return sweetManualSortMdskService.add(manualId, content);
+        return sweetManualSortFiveService.add(manualId, content);
     }
 
     @GetMapping("get")
@@ -44,8 +44,8 @@ public class SweetManualSortFiveController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true)
     })
-    public ResponseDto<SweetManualSortMdsk> changeStatus(@RequestParam() String manualId) {
-        return sweetManualSortMdskService.get(manualId);
+    public ResponseDto<SweetManualSortFive> changeStatus(@RequestParam() String manualId) {
+        return sweetManualSortFiveService.get(manualId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/five/SweetRichtextFiveController.java

@@ -2,8 +2,8 @@ package com.liquidnet.service.sweet.controller.five;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
-import com.liquidnet.service.sweet.service.ISweetRichtextMdskService;
+import com.liquidnet.service.sweet.entity.SweetRichtextFive;
+import com.liquidnet.service.sweet.service.five.ISweetRichtextFiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,13 +19,13 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-08-09
  */
-@Api(tags = "电子手册 富文本_MDSK")
+@Api(tags = "电子手册 富文本_Five")
 @RestController
-@RequestMapping("/mdsk/sweet-richtext")
+@RequestMapping("/Five/sweet-richtext")
 public class SweetRichtextFiveController {
 
     @Autowired
-    ISweetRichtextMdskService sweetRichtextMdskService;
+    ISweetRichtextFiveService sweetRichtextFiveService;
 
     @GetMapping("get")
     @ApiOperation("富文本详情")
@@ -33,9 +33,9 @@ public class SweetRichtextFiveController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
     })
-    public ResponseDto<SweetRichtextMdsk> get(@RequestParam() String manualId,
+    public ResponseDto<SweetRichtextFive> get(@RequestParam() String manualId,
                                               @RequestParam() Integer type) {
-        return sweetRichtextMdskService.get(manualId, type);
+        return sweetRichtextFiveService.get(manualId, type);
     }
 
     @PostMapping("add")
@@ -52,7 +52,7 @@ public class SweetRichtextFiveController {
                                     @RequestParam(required = false) String local,
                                     @RequestParam(required = false) String picUrl,
                                     @RequestParam() Integer type) {
-        return sweetRichtextMdskService.add(manualId, details, local, picUrl, type);
+        return sweetRichtextFiveService.add(manualId, details, local, picUrl, type);
     }
 
     @PostMapping("change")
@@ -69,7 +69,7 @@ public class SweetRichtextFiveController {
                                        @RequestParam(required = false) String local,
                                        @RequestParam(required = false) String picUrl,
                                        @RequestParam() Integer type) {
-        return sweetRichtextMdskService.change(manualId, details, local, picUrl, type);
+        return sweetRichtextFiveService.change(manualId, details, local, picUrl, type);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetManualArtistsFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualArtistsFive;
+import com.liquidnet.service.sweet.mapper.SweetManualArtistsFiveMapper;
+import com.liquidnet.service.sweet.mapper.SweetManualArtistsFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetManualArtistsFiveService;
+import com.liquidnet.service.sweet.service.ISweetManualArtistsTFCService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 电子宣传手册艺人表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetManualArtistsFiveServiceImpl extends ServiceImpl<SweetManualArtistsFiveMapper, SweetManualArtistsFive> implements ISweetManualArtistsFiveService {
+    @Autowired
+    private SweetManualArtistsFiveMapper sweetManualArtistsFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<PageInfo<SweetManualArtistListFiveDto>> getList(Integer page, Integer size, String manualId) {
+        PageInfo<SweetManualArtistListFiveDto> pageInfoTmp;
+        try {
+            PageHelper.startPage(page, size);
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("manualId", manualId);
+            List<SweetManualArtistListFiveDto> voList = sweetManualArtistsFiveMapper.getManualList(map);
+            pageInfoTmp = new PageInfo(voList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success(pageInfoTmp);
+    }
+
+    @Override
+    public ResponseDto<Boolean> add(String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
+        try {
+            SweetManualArtistsFive sweetManualNotify = SweetManualArtistsFive.getNew();
+            sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
+            sweetManualNotify.setManualId(manualId);
+            sweetManualNotify.setStageId(stageId);
+            sweetManualNotify.setArtistsId(artistId);
+            sweetManualNotify.setPerformanceEnd(performanceEnd != null ? DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd) : null);
+            sweetManualNotify.setPerformanceStart(performanceStart != null ? DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceStart) : null);
+            sweetManualNotify.setSignatureStart(signatureStart != null ? DateUtil.Formatter.yyyyMMddHHmmss.parse(signatureStart) : null);
+            sweetManualNotify.setSignatureEnd(signatureEnd != null ? DateUtil.Formatter.yyyyMMddHHmmss.parse(signatureEnd) : null);
+            sweetManualNotify.setCreatedAt(LocalDateTime.now());
+            sweetManualArtistsFiveMapper.insert(sweetManualNotify);
+
+            redisDataUtils.deleteTimeListRedisData(manualId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<SweetManualArtistListFiveDto> details(String manualRelationId) {
+        try {
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("manualRelationId", manualRelationId);
+            SweetManualArtistListFiveDto dto = sweetManualArtistsFiveMapper.getManualDetails(map);
+            return ResponseDto.success(dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> change(String manualRelationId, String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
+        try {
+            SweetManualArtistsFive sweetManualNotify = SweetManualArtistsFive.getNew();
+            sweetManualNotify.setStageId(stageId);
+            sweetManualNotify.setArtistsId(artistId);
+            sweetManualNotify.setPerformanceEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd));
+            sweetManualNotify.setPerformanceStart(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceStart));
+            sweetManualNotify.setSignatureStart(DateUtil.Formatter.yyyyMMddHHmmss.parse(signatureStart));
+            sweetManualNotify.setSignatureEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(signatureEnd));
+            sweetManualNotify.setUpdatedAt(LocalDateTime.now());
+            sweetManualArtistsFiveMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualArtistsFive.class).eq(SweetManualArtistsFive::getManualRelationId, manualRelationId));
+
+            redisDataUtils.deleteTimeListRedisData(manualId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> delete(String manualRelationId, String manualId) {
+        try {
+            SweetManualArtistsFive sweetManualNotify = SweetManualArtistsFive.getNew();
+            sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
+            sweetManualNotify.setStatus(0);
+            sweetManualNotify.setUpdatedAt(LocalDateTime.now());
+            sweetManualArtistsFiveMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualArtistsFive.class).eq(SweetManualArtistsFive::getManualRelationId, manualRelationId));
+
+            redisDataUtils.deleteTimeListRedisData(manualId);
+
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetManualFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualFive;
+import com.liquidnet.service.sweet.mapper.SweetManualFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetManualFiveService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 电子宣传手册表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetManualFiveServiceImpl extends ServiceImpl<SweetManualFiveMapper, SweetManualFive> implements ISweetManualFiveService {
+
+    @Autowired
+    private SweetManualFiveMapper sweetManualFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<PageInfo<SweetManualFiveDto>> getManualList(int page, int size, String name) {
+        PageInfo<SweetManualFiveDto> pageInfoTmp;
+        try {
+            PageHelper.startPage(page, size);
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("title", name);
+            List<SweetManualFiveDto> voList = sweetManualFiveMapper.getManualList(map);
+            for (int i = 0; i < voList.size(); i++) {
+                SweetManualFiveDto vo = voList.get(i);
+                if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
+                    if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                        vo.setStatus(9);
+                    } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                        vo.setStatus(10);
+                    } else {
+                        vo.setStatus(6);
+                    }
+                }
+            }
+            pageInfoTmp = new PageInfo(voList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure(ErrorMapping.get(20104));
+        }
+        return ResponseDto.success(pageInfoTmp);
+    }
+
+    @Override
+    public ResponseDto<SweetManualFiveDto> details(String manualId) {
+        SweetManualFiveDto vo;
+        try {
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("manualId", manualId);
+            vo = sweetManualFiveMapper.getManualDetails(map);
+            if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
+                if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                    vo.setStatus(9);
+                } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                    vo.setStatus(10);
+                } else {
+                    vo.setStatus(6);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure(ErrorMapping.get(20104));
+        }
+        return ResponseDto.success(vo);
+    }
+
+    @Override
+    public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) {
+        try {
+            int count = sweetManualFiveMapper.selectCount(Wrappers.lambdaUpdate(SweetManualFive.class).eq(SweetManualFive::getManualId, manualId));
+            SweetManualFive sweetManual = SweetManualFive.getNew();
+            if (count > 0) {//修改
+                sweetManual.setStatus(status);
+                sweetManual.setUpdatedAt(LocalDateTime.now());
+                sweetManualFiveMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManualFive.class).eq(SweetManualFive::getManualId, manualId));
+            } else {//创建
+                sweetManual.setManualId(IDGenerator.nextSnowId());
+                sweetManual.setPerformanceId(performancesId);
+                sweetManual.setStatus(status);
+                sweetManual.setIsRelease(0);
+                sweetManual.setCreatedAt(LocalDateTime.now());
+                sweetManualFiveMapper.insert(sweetManual);
+            }
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+        redisDataUtils.deletePushListRedisData();
+        return ResponseDto.success();
+    }
+
+    @Override
+    public ResponseDto<Boolean> changeRelease(String manualId, Integer isRelease) {
+        try {
+            SweetManualFive sweetManual = SweetManualFive.getNew();
+            sweetManual.setIsRelease(isRelease);
+            sweetManual.setUpdatedAt(LocalDateTime.now());
+            sweetManualFiveMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManualFive.class).eq(SweetManualFive::getManualId, manualId));
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+        redisDataUtils.deletePushListRedisData();
+        return ResponseDto.success();
+    }
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetManualNotifyFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyFive;
+import com.liquidnet.service.sweet.mapper.SweetManualNotifyFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetManualNotifyFiveService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 电子宣传手册通知表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetManualNotifyFiveServiceImpl extends ServiceImpl<SweetManualNotifyFiveMapper, SweetManualNotifyFive> implements ISweetManualNotifyFiveService {
+
+    @Autowired
+    private SweetManualNotifyFiveMapper sweetManualNotifyFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<PageInfo<SweetManualNotifyFive>> getList(Integer page, Integer size, String title, String manualId) {
+        PageInfo<SweetManualNotifyFive> pageInfo = null;
+        try {
+            PageHelper.startPage(page, size);
+            List<SweetManualNotifyFive> data;
+            if (title != null) {
+                data = sweetManualNotifyFiveMapper.selectList(Wrappers.lambdaQuery(SweetManualNotifyFive.class).like(SweetManualNotifyFive::getTitle, title).eq(SweetManualNotifyFive::getManualId, manualId).eq(SweetManualNotifyFive::getStatus, 1));
+            } else {
+                data = sweetManualNotifyFiveMapper.selectList(Wrappers.lambdaQuery(SweetManualNotifyFive.class).eq(SweetManualNotifyFive::getManualId, manualId).eq(SweetManualNotifyFive::getStatus, 1));
+            }
+            pageInfo = new PageInfo(data);
+            return ResponseDto.success(pageInfo);
+        } catch (Exception e) {
+            return ResponseDto.success(pageInfo);
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> add(String manualId, String title, String content) {
+        try {
+            SweetManualNotifyFive sweetManualNotify = SweetManualNotifyFive.getNew();
+            sweetManualNotify.setManualNotifyId(IDGenerator.nextSnowId());
+            sweetManualNotify.setManualId(manualId);
+            sweetManualNotify.setTitle(title);
+            sweetManualNotify.setContent(content);
+            sweetManualNotify.setCreatedAt(LocalDateTime.now());
+            sweetManualNotifyFiveMapper.insert(sweetManualNotify);
+
+            List<SweetManualNotifyFive> oldData = redisDataUtils.getNotifyRedisData(manualId);
+            oldData.add(sweetManualNotify);
+            redisDataUtils.setNotifyRedisData(manualId, oldData);
+
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<SweetManualNotifyFive> details(String manualNotifyId) {
+        try {
+            return ResponseDto.success(sweetManualNotifyFiveMapper.selectOne(Wrappers.lambdaQuery(SweetManualNotifyFive.class).eq(SweetManualNotifyFive::getManualNotifyId, manualNotifyId).eq(SweetManualNotifyFive::getStatus, 1)));
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> change(String manualId, String manualNotifyId, String title, String content) {
+        try {
+            SweetManualNotifyFive sweetManualNotify = SweetManualNotifyFive.getNew();
+            sweetManualNotify.setTitle(title);
+            sweetManualNotify.setContent(content);
+            sweetManualNotify.setUpdatedAt(LocalDateTime.now());
+            sweetManualNotifyFiveMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotifyFive.class).eq(SweetManualNotifyFive::getManualNotifyId, manualNotifyId));
+
+            List<SweetManualNotifyFive> oldData = redisDataUtils.getNotifyRedisData(manualId);
+            for (SweetManualNotifyFive item : oldData) {
+                if (item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)) {
+                    item.setTitle(title);
+                    item.setContent(content);
+                    item.setUpdatedAt(LocalDateTime.now());
+                }
+            }
+            redisDataUtils.setNotifyRedisData(manualId, oldData);
+
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> delete(String manualNotifyId) {
+        try {
+            SweetManualNotifyFive sweetManualNotify = SweetManualNotifyFive.getNew();
+            sweetManualNotify.setStatus(0);
+            sweetManualNotify.setUpdatedAt(LocalDateTime.now());
+            sweetManualNotifyFiveMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotifyFive.class).eq(SweetManualNotifyFive::getManualNotifyId, manualNotifyId));
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetManualShopFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
+import com.liquidnet.service.sweet.mapper.SweetManualShopFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetManualShopFiveService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 电子宣传手册商铺表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetManualShopFiveServiceImpl extends ServiceImpl<SweetManualShopFiveMapper, SweetManualShopFive> implements ISweetManualShopFiveService {
+
+    @Autowired
+    private SweetManualShopFiveMapper sweetManualShopFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<List<SweetManualShopFive>> getList(String manualId, Integer type) {
+        try {
+            List<SweetManualShopFive> data = sweetManualShopFiveMapper.selectList(Wrappers.lambdaQuery(SweetManualShopFive.class).eq(SweetManualShopFive::getManualId, manualId).eq(SweetManualShopFive::getType, type).eq(SweetManualShopFive::getStatus, 1));
+            return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<SweetManualShopFive> details(String manualShopId) {
+        try {
+            SweetManualShopFive data = sweetManualShopFiveMapper.selectOne(Wrappers.lambdaQuery(SweetManualShopFive.class).eq(SweetManualShopFive::getManualShopId, manualShopId).eq(SweetManualShopFive::getStatus, 1));
+            return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> add(String manualId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
+        try {
+            SweetManualShopFive sweetManualShop = SweetManualShopFive.getNew();
+            sweetManualShop.setManualShopId(IDGenerator.nextSnowId());
+            sweetManualShop.setManualId(manualId);
+            sweetManualShop.setTitle(title);
+            sweetManualShop.setPicUrl(picUrl);
+            sweetManualShop.setDescribes(describe);
+            sweetManualShop.setType(type);
+            sweetManualShop.setIsRecommend(isRecommend);
+            sweetManualShop.setSort(sort);
+            sweetManualShop.setStatus(1);
+            sweetManualShopFiveMapper.insert(sweetManualShop);
+            redisDataUtils.setManualShopRedisData(manualId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> change(String manualShopId,String manualId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
+        try {
+            SweetManualShopFive sweetManualShop = SweetManualShopFive.getNew();
+            sweetManualShop.setTitle(title);
+            sweetManualShop.setPicUrl(picUrl);
+            sweetManualShop.setDescribes(describe);
+            sweetManualShop.setType(type);
+            sweetManualShop.setIsRecommend(isRecommend);
+            sweetManualShop.setSort(sort);
+            sweetManualShopFiveMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShopFive.class).eq(SweetManualShopFive::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> delete(String manualShopId,String manualId) {
+        try {
+            SweetManualShopFive sweetManualShop = SweetManualShopFive.getNew();
+            sweetManualShop.setStatus(0);
+            sweetManualShopFiveMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShopFive.class).eq(SweetManualShopFive::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetManualSortFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.entity.SweetManualSortFive;
+import com.liquidnet.service.sweet.mapper.SweetManualSortFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetManualSortFiveService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册显示内容表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetManualSortFiveServiceImpl extends ServiceImpl<SweetManualSortFiveMapper, SweetManualSortFive> implements ISweetManualSortFiveService {
+
+    @Autowired
+    private SweetManualSortFiveMapper sweetManualSortFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<SweetManualSortFive> get(String manualId) {
+        try {
+            return ResponseDto.success(sweetManualSortFiveMapper.selectOne(Wrappers.lambdaQuery(SweetManualSortFive.class).eq(SweetManualSortFive::getManualId, manualId)));
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> add(String manualId, String content) {
+        try {
+            int count = sweetManualSortFiveMapper.selectCount(Wrappers.lambdaUpdate(SweetManualSortFive.class).eq(SweetManualSortFive::getManualId, manualId));
+            if (count > 0) {
+                SweetManualSortFive sweetManualSort = SweetManualSortFive.getNew();
+                sweetManualSort.setManualId(manualId);
+                sweetManualSort.setShowPosition(content);
+                sweetManualSort.setUpdatedAt(LocalDateTime.now());
+                sweetManualSortFiveMapper.update(sweetManualSort, Wrappers.lambdaUpdate(SweetManualSortFive.class).eq(SweetManualSortFive::getManualId, manualId));
+            } else {
+                SweetManualSortFive sweetManualSort = SweetManualSortFive.getNew();
+                sweetManualSort.setManualId(manualId);
+                sweetManualSort.setShowPosition(content);
+                sweetManualSort.setCreatedAt(LocalDateTime.now());
+                sweetManualSortFiveMapper.insert(sweetManualSort);
+            }
+            redisDataUtils.deleteSortRedisData(manualId);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success();
+    }
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetRichtextFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.entity.SweetRichtextFive;
+import com.liquidnet.service.sweet.mapper.SweetRichtextFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetRichtextFiveService;
+import com.liquidnet.service.sweet.utils.RedisFiveDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册富文本表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetRichtextFiveServiceImpl extends ServiceImpl<SweetRichtextFiveMapper, SweetRichtextFive> implements ISweetRichtextFiveService {
+
+    @Autowired
+    private SweetRichtextFiveMapper sweetRichtextFiveMapper;
+    @Autowired
+    private RedisFiveDataUtils redisDataUtils;
+
+    @Override
+    public ResponseDto<SweetRichtextFive> get(String manualId, Integer type) {
+        try {
+            return ResponseDto.success(sweetRichtextFiveMapper.selectOne(Wrappers.lambdaQuery(SweetRichtextFive.class).eq(SweetRichtextFive::getManualId, manualId).eq(SweetRichtextFive::getType, type)));
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) {
+        try {
+            int count = sweetRichtextFiveMapper.selectCount(Wrappers.lambdaQuery(SweetRichtextFive.class).eq(SweetRichtextFive::getManualId, manualId).eq(SweetRichtextFive::getType, type));
+            if(count>0){
+                return ResponseDto.failure("不能重复添加");
+            }
+            SweetRichtextFive sweetRichtext = SweetRichtextFive.getNew();
+            sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
+            sweetRichtext.setManualId(manualId);
+            if (type == 5) {
+                sweetRichtext.setLocal(local);
+                sweetRichtext.setDetails(details);
+            } else if (type == 2) {
+                sweetRichtext.setPicUrl(pirUrl);
+            }else{
+                sweetRichtext.setDetails(details);
+            }
+            sweetRichtext.setType(type);
+            sweetRichtext.setCreatedAt(LocalDateTime.now());
+            sweetRichtextFiveMapper.insert(sweetRichtext);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success();
+    }
+
+    @Override
+    public ResponseDto<Boolean> change(String manualId, String details, String local, String pirUrl, Integer type) {
+        try {
+            SweetRichtextFive sweetRichtext = SweetRichtextFive.getNew();
+            sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
+            sweetRichtext.setManualId(manualId);
+            sweetRichtext.setDetails(details);
+            if (type == 5) {
+                sweetRichtext.setLocal(local);
+            } else if (type == 2) {
+                sweetRichtext.setPicUrl(pirUrl);
+            }
+            sweetRichtext.setType(type);
+            sweetRichtext.setCreatedAt(LocalDateTime.now());
+            sweetRichtextFiveMapper.update(sweetRichtext, Wrappers.lambdaUpdate(SweetRichtextFive.class).eq(SweetRichtextFive::getManualId, manualId).eq(SweetRichtextFive::getType, type));
+
+            redisDataUtils.setRichTextRedisData(manualId,type.toString(),sweetRichtext);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success();
+    }
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/five/SweetUserRelationFiveServiceImpl.java

+package com.liquidnet.service.sweet.service.impl.five;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.sweet.entity.SweetUserRelationFive;
+import com.liquidnet.service.sweet.mapper.SweetUserRelationFiveMapper;
+import com.liquidnet.service.sweet.service.five.ISweetUserRelationFiveService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Service
+public class SweetUserRelationFiveServiceImpl extends ServiceImpl<SweetUserRelationFiveMapper, SweetUserRelationFive> implements ISweetUserRelationFiveService {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/ObjectUtil.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
 import com.liquidnet.service.sweet.entity.SweetManualShop;
+import com.liquidnet.service.sweet.entity.SweetManualShopFive;
 import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
 import com.liquidnet.service.sweet.entity.SweetManualShopTfc;
 import com.liquidnet.service.sweet.vo.SweetCItyVoteStatVo;
@@ -19,6 +20,10 @@ public class ObjectUtil {
     private static final ArrayList<SweetManualArtistListMDSKDto> sweetManualArtistListMDSKDtoList = new ArrayList<>();
     private static final ArrayList<SweetManualShopMdsk> sweetManualShopMDSKList = new ArrayList<>();
 
+    private static final ArrayList<SweetManualAppletFiveDto> sweetManualAppletFiveDtoList = new ArrayList<>();
+    private static final ArrayList<SweetManualArtistListFiveDto> sweetManualArtistListFiveDtoList = new ArrayList<>();
+    private static final ArrayList<SweetManualShopFive> sweetManualShopFiveList = new ArrayList<>();
+
     private static final ArrayList<SweetManualAppletTFCDto> sweetManualAppletTFCDtoList = new ArrayList<>();
     private static final ArrayList<SweetManualArtistListTFCDto> sweetManualArtistListTFCDtoList = new ArrayList<>();
     private static final ArrayList<SweetManualShopTfc> sweetManualShopTFCList = new ArrayList<>();
@@ -44,6 +49,10 @@ public class ObjectUtil {
         return (ArrayList<SweetManualAppletMDSKDto>) sweetManualAppletMDSKDtoList.clone();
     }
 
+    public static ArrayList<SweetManualAppletFiveDto> getSweetManualAppletFiveDtoList() {
+        return (ArrayList<SweetManualAppletFiveDto>) sweetManualAppletFiveDtoList.clone();
+    }
+
     public static ArrayList<SweetManualAppletTFCDto> getSweetManualAppletTFCDtoList() {
         return (ArrayList<SweetManualAppletTFCDto>) sweetManualAppletTFCDtoList.clone();
     }
@@ -64,6 +73,14 @@ public class ObjectUtil {
         return (ArrayList<SweetManualShopMdsk>) sweetManualShopMDSKList.clone();
     }
 
+    public static ArrayList<SweetManualArtistListFiveDto> getSweetManualArtistListFiveDtoList() {
+        return (ArrayList<SweetManualArtistListFiveDto>) sweetManualArtistListFiveDtoList.clone();
+    }
+
+    public static ArrayList<SweetManualShopFive> getSweetManualShopFiveList() {
+        return (ArrayList<SweetManualShopFive>) sweetManualShopFiveList.clone();
+    }
+
     public static ArrayList<SweetCItyVoteStatVo> getSweetCItyVoteStatVoList() {
         return (ArrayList<SweetCItyVoteStatVo>) sweetCItyVoteStatVoList.clone();
     }