Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinFrontBannerVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 轮播图
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@ApiModel(value = "GoblinFrontBannerBuildParam", description = "轮播图param")
+@Data
+public class GoblinFrontBannerVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long mid;
+
+    /**
+     * 图片路径
+     */
+    @ApiModelProperty(value = "图片路径")
+    private String picUrl;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer indexs;
+
+    /**
+     * 1、票务2、H5
+     */
+    @ApiModelProperty(value = "1、票务2、H5")
+    private String jumpType;
+
+    /**
+     * 开启时间
+     */
+    @ApiModelProperty(value = "开启时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime endTime;
+
+    /**
+     * 活动url
+     */
+    @ApiModelProperty(value = "活动url")
+    private String activityUrl;
+
+    /**
+     * 票务名字
+     */
+    @ApiModelProperty(value = "票务名字")
+    private String ticketName;
+
+    /**
+     * 1、首页顶部位置2、首页中部位置
+     */
+    @ApiModelProperty(value = "1、首页顶部位置2、首页中部位置")
+    private Integer bannerType;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updateTime;
+
+    /**
+     * bannerId
+     */
+    @ApiModelProperty(value = "bannerId")
+    private String bannerId;
+
+    /**
+     * 0未删除1已删除
+     */
+    @ApiModelProperty(value = "0未删除1已删除")
+    private Integer delTag;
+
+    private static final GoblinFrontBannerVo obj = new GoblinFrontBannerVo();
+
+    public static GoblinFrontBannerVo getNew() {
+        try {
+            return (GoblinFrontBannerVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinFrontBannerVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontBannerBuildParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -49,12 +50,14 @@ public class GoblinFrontBannerBuildParam implements Serializable {
      * 开启时间
      */
     @ApiModelProperty(value = "开启时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     /**
@@ -79,12 +82,14 @@ public class GoblinFrontBannerBuildParam implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontBannerServiceImpl.java

@@ -137,6 +137,7 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
             }
         }
         //redis
+        redisDataSourceUtil.getRedisGoblinUtil().del(GoblinRedisConst.FRONT_BANNER);
         redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_BANNER,list);
         return true;
     }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontController.java

@@ -3,12 +3,14 @@ package com.liquidnet.service.goblin.controller;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
+import com.liquidnet.service.goblin.dto.vo.GoblinFrontBannerVo;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
 import com.liquidnet.service.goblin.entity.GoblinFrontNavigation;
 import com.liquidnet.service.goblin.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,8 +47,15 @@ public class GoblinFrontController {
                 }
             }
         }
+        ArrayList<GoblinFrontBannerVo> list1= ObjectUtil.goblinFrontBannerVoArrayList();
+        for(GoblinFrontBanner goblinFrontBanner:goblinFrontBannerArrayList){
+            GoblinFrontBannerVo goblinFrontBannerVo=GoblinFrontBannerVo.getNew();
+            BeanUtils.copyProperties(goblinFrontBanner,goblinFrontBannerVo);
+            list1.add(goblinFrontBannerVo);
+        }
+
         //redis里获取banner
-        return ResponseDto.success( goblinFrontBannerArrayList);
+        return ResponseDto.success( list1);
     }
     @GetMapping("getHotWord")
     @ApiOperation("获得热词")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

@@ -3,6 +3,9 @@ package com.liquidnet.service.goblin.util;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.dto.vo.GoblinFrontBannerVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.mongodb.BasicDBObject;
 
@@ -12,6 +15,7 @@ public class ObjectUtil {
     private static final PagedResult<GoblinStoreMgtGoodsListVo> goblinStoreMgtGoodsVoPagedResult = new PagedResult<>();
 
     private static final ArrayList<GoblinFrontBanner> goblinFrontBannerArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinFrontBannerVo> goblinFrontBannerVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfMarketingVo> goblinSelfMarketingVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSpecVo> goblinGoodsSpecVoArrayList = new ArrayList<>();
@@ -25,6 +29,9 @@ public class ObjectUtil {
         return goblinStoreMgtGoodsVoPagedResult.clone();
     }
 
+    public static ArrayList<GoblinFrontBannerVo> goblinFrontBannerVoArrayList() {
+        return (ArrayList<GoblinFrontBannerVo>) goblinFrontBannerVoArrayList.clone();
+    }
     public static ArrayList<GoblinFrontBanner> getGoblinFrontBannerArrayList() {
         return (ArrayList<GoblinFrontBanner>) goblinFrontBannerArrayList.clone();
     }