Merge branch 'test'

# Conflicts:
#	src/main/resources/logback-spring.xml

src/main/java/com/cdf/CdfApplication.java

@@ -1,11 +1,14 @@
 package com.cdf;
 
 import com.alibaba.fastjson.JSONObject;
+import com.cdf.common.CacheUtil;
 import com.cdf.httpClient.client.FdkkClient;
 import com.cdf.httpClient.request.FdkkLoginRequest;
 import com.cdf.httpClient.response.FdkkResponse;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
@@ -17,17 +20,22 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @MapperScan("com.cdf.**.mapper")
 @ComponentScan(basePackages = {"com.cdf.*","com.fdkankan.*"})
 @EnableScheduling
-public class CdfApplication implements ApplicationContextAware {
+public class CdfApplication implements CommandLineRunner {
 
 
-    static ApplicationContext applicationContext;
+    @Value("${spring.profiles.active:test}")
+    private String activeYaml;
+    @Value("${local.file.path:/home/test}")
+    private String localFilePath;
 
     public static void main(String[] args) {
         SpringApplication.run(CdfApplication.class, args);
     }
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
+    public void run(String... args) throws Exception {
+        CacheUtil.activeYaml = activeYaml;
+        CacheUtil.localFilePath = localFilePath;
+
     }
 }

src/main/java/com/cdf/common/CacheUtil.java

@@ -0,0 +1,9 @@
+package com.cdf.common;
+
+public class CacheUtil {
+
+    public static String activeYaml;
+
+    public static String localFilePath ;
+
+}

src/main/java/com/cdf/common/ResultCode.java

@@ -34,6 +34,10 @@ public enum ResultCode {
 
     PRODUCT_SOURCE_NOT_EXIST(9001,"对接系统店铺不存在"),
     PRODUCT_SOURCE_NOT_DEL(9003,"店铺存在关联数据，不能删除。"),
+
+    DOWN_TEMPLATE_ERROR(10001,"下载模版出错"),
+    UPLOAD_EXCEL_ERROR(10002,"上传excel文件出错"),
+    UPLOAD_EXCEL_CHECK_ERROR(10003,"上传文件未校验"),
     ;
 
     public int code;

src/main/java/com/cdf/controller/SceneSourceDataController.java

@@ -1,21 +0,0 @@
-package com.cdf.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-07
- */
-@RestController
-@RequestMapping("/sceneSourceData")
-public class SceneSourceDataController {
-
-}
-

src/main/java/com/cdf/controller/api/CdfHkProductApiController.java

@@ -82,7 +82,7 @@ public class CdfHkProductApiController {
          */
         List<SkuListVo> skuList = cdfHKClient.getSkuList(productId, productSourceId);
         for (SkuListVo o : skuList) {
-            o.setUrl(o.getUrl() + "&spuId=" + productId +"&storeId="+productSource);
+            o.setUrl(o.getUrl() + "&spuId=" + productId +"&storeId="+productSourceId);
         }
         productById.setSkuList(skuList);
         return ResultData.ok(productById);

src/main/java/com/cdf/controller/back/BrandController.java

@@ -0,0 +1,62 @@
+package com.cdf.controller.back;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.common.PageInfo;
+import com.cdf.common.ResultData;
+import com.cdf.entity.Brand;
+import com.cdf.entity.HotOutline;
+import com.cdf.request.BaseRequest;
+import com.cdf.request.BrandApiParam;
+import com.cdf.service.IBrandService;
+import com.cdf.service.impl.ExcelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@RestController
+@RequestMapping("/back/brand")
+public class BrandController {
+
+    @Autowired
+    IBrandService brandService;
+    @Autowired
+    ExcelService excelService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody BrandApiParam param){
+        return ResultData.ok(brandService.pageList(param));
+    }
+
+    @GetMapping("updateBrandInfo")
+    public ResultData updateBrandInfo() throws Exception {
+        new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    brandService.updateBrandInfo();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }.run();
+        return ResultData.ok();
+    }
+
+    @GetMapping("/downBrandExcel")
+    public void downBrandExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        excelService.downBrandExcel(request,response);
+    }
+}
+

src/main/java/com/cdf/controller/back/ExcelController.java

@@ -0,0 +1,57 @@
+package com.cdf.controller.back;
+
+
+import com.cdf.common.ResultData;
+import com.cdf.request.UploadHotsParam;
+import com.cdf.service.IBrandService;
+import com.cdf.service.impl.ExcelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.HashSet;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@RestController
+@RequestMapping("/back/excel")
+public class ExcelController extends BaseLogController{
+
+    @Autowired
+    ExcelService hotsService;
+
+    /**
+     * 下载导入模版
+     * type  0 外框设置 ，1 瀑布流， 2，精选推荐设置 ，3 品牌推荐设置
+     */
+    @GetMapping("/downTemplate")
+    public void downInTemplate(@RequestParam(required = false,defaultValue = "0") Integer type,
+                                     @RequestParam(required = false) String sceneNum,
+                                     HttpServletRequest req,HttpServletResponse resp)  {
+        hotsService.downTemplate(type,sceneNum,req,resp);
+    }
+
+    @PostMapping("/checkFile")
+    public ResultData checkFile(@RequestBody UploadHotsParam param){
+        param.setToken(getToken());
+
+        return ResultData.ok(hotsService.checkFile(param));
+    }
+
+    @PostMapping("/uploadExcel")
+    public ResultData uploadExcel(@RequestBody UploadHotsParam param){
+        param.setToken(getToken());
+        hotsService.uploadExcel(param);
+        return ResultData.ok();
+    }
+
+}
+

src/main/java/com/cdf/controller/back/HotOutlineController.java

@@ -0,0 +1,73 @@
+package com.cdf.controller.back;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.Brand;
+import com.cdf.entity.HotOutline;
+import com.cdf.exception.BusinessException;
+import com.cdf.request.BaseRequest;
+import com.cdf.service.IBrandService;
+import com.cdf.service.IHotOutlineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@RestController
+@RequestMapping("/back/hotOutline")
+public class HotOutlineController {
+
+    @Autowired
+    IHotOutlineService hotOutlineService;
+    @Autowired
+    IBrandService brandService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody BaseRequest param){
+        LambdaQueryWrapper<HotOutline> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(HotOutline::getCreateTime);
+        Page<HotOutline> page = hotOutlineService.page(new Page<>(param.getPageNum(), param.getPageSize()),wrapper);
+        return ResultData.ok(PageInfo.PageInfo(page));
+    }
+
+    @PostMapping("/add")
+    public ResultData add(@RequestBody HotOutline hotOutline){
+        hotOutlineService.save(hotOutline);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/del")
+    public ResultData del(@RequestBody HotOutline hotOutline){
+        if(hotOutline.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        hotOutlineService.removeById(hotOutline.getId());
+        return ResultData.ok();
+    }
+
+    @PostMapping("/detail")
+    public ResultData detail(@RequestBody HotOutline hotOutline){
+        if(hotOutline.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        List<Brand> brands = brandService.getByHotOutlineId(hotOutline.getId());
+        return ResultData.ok(brands);
+    }
+}
+

src/main/java/com/cdf/controller/back/SceneRecommendController.java

@@ -0,0 +1,80 @@
+package com.cdf.controller.back;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.HotOutline;
+import com.cdf.entity.SceneRecommend;
+import com.cdf.exception.BusinessException;
+import com.cdf.request.BaseRequest;
+import com.cdf.service.IHotOutlineService;
+import com.cdf.service.ISceneRecommendService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-15
+ */
+@RestController
+@RequestMapping("/back/sceneRecommend")
+public class SceneRecommendController {
+
+
+    @Autowired
+    ISceneRecommendService sceneRecommendService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody BaseRequest param){
+        LambdaQueryWrapper<SceneRecommend> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(SceneRecommend::getCreateTime);
+        Page<SceneRecommend> page = sceneRecommendService.page(new Page<>(param.getPageNum(), param.getPageSize()),wrapper);
+        return ResultData.ok(PageInfo.PageInfo(page));
+    }
+
+    @PostMapping("/addOrUpdate")
+    public ResultData addOrUpdate(@RequestBody SceneRecommend sceneRecommend){
+        if(StringUtils.isBlank(sceneRecommend.getSceneNum())){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        SceneRecommend bySceneNum = sceneRecommendService.getBySceneNum(sceneRecommend.getSceneNum());
+        if(bySceneNum != null){
+            sceneRecommend.setId(bySceneNum.getId());
+        }
+        sceneRecommendService.saveOrUpdate(sceneRecommend);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/del")
+    public ResultData del(@RequestBody SceneRecommend sceneRecommend){
+        if(StringUtils.isBlank(sceneRecommend.getSceneNum())){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        SceneRecommend bySceneNum = sceneRecommendService.getBySceneNum(sceneRecommend.getSceneNum());
+        if(bySceneNum != null){
+            sceneRecommendService.removeById(bySceneNum.getId());
+        }
+        return ResultData.ok();
+    }
+
+    @PostMapping("/getInfo")
+    public ResultData getInfo(@RequestBody SceneRecommend sceneRecommend){
+        if(StringUtils.isBlank(sceneRecommend.getSceneNum())){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        return ResultData.ok(sceneRecommendService.getBySceneNum(sceneRecommend.getSceneNum()));
+    }
+}
+

src/main/java/com/cdf/controller/service/FdkkSceneController.java

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.ResultCode;
 import com.cdf.entity.NumRegion;
 import com.cdf.entity.ProductSource;
+import com.cdf.entity.SceneRecommend;
 import com.cdf.entity.SceneSource;
 import com.cdf.exception.BusinessException;
 import com.cdf.httpClient.client.FdkkClient;
 import com.cdf.service.IFdkkUserService;
+import com.cdf.service.ISceneRecommendService;
 import com.cdf.service.ISceneSourceService;
 import com.cdf.service.impl.FdkkSceneEditService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,8 @@ public class FdkkSceneController {
     private IFdkkUserService fdkkUserService;
     @Autowired
     private ISceneSourceService sceneSourceService;
+    @Autowired
+    ISceneRecommendService sceneRecommendService;
 
     @GetMapping("/getInfo")
     public JSONObject getInfo(@RequestParam(required = false) String num){
@@ -45,6 +49,8 @@ public class FdkkSceneController {
                 data.put("cdfRegionData",numRegion);
                 ProductSource productSource = sceneSourceService.getByNum(num);
                 data.put("cdfProductSource",productSource);
+                SceneRecommend bySceneNum = sceneRecommendService.getBySceneNum(num);
+                data.put("sceneRecommend",bySceneNum);
             }
             return info;
 

src/main/java/com/cdf/entity/Brand.java

@@ -0,0 +1,79 @@
+package com.cdf.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Getter
+@Setter
+@TableName("t_brand")
+public class Brand implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 第三方品牌Id
+     */
+    @TableField("cdf_brand_id")
+    private String cdfBrandId;
+
+    /**
+     * 中文名称
+     */
+    @TableField("zh_name")
+    private String zhName;
+
+    /**
+     * 繁体名称
+     */
+    @TableField("ft_name")
+    private String ftName;
+
+    /**
+     * 英文名称
+     */
+    @TableField("en_name")
+    private String enName;
+
+    /**
+     * 品牌logo
+     */
+    @TableField("brand_logo")
+    private String brandLogo;
+
+    /**
+     * 外框Id
+     */
+    @TableField("outline_id")
+    private Integer outlineId;
+
+    @TableField("tb_status")
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/cdf/entity/HotOutline.java

@@ -0,0 +1,56 @@
+package com.cdf.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Getter
+@Setter
+@TableName("t_hot_outline")
+public class HotOutline implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 外框名称
+     */
+    @TableField("outline_name")
+    private String outlineName;
+
+    /**
+     * 外框图片
+     */
+    @TableField("outline_image")
+    private String outlineImage;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/cdf/entity/HotRecommend.java

@@ -0,0 +1,67 @@
+package com.cdf.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-13
+ */
+@Getter
+@Setter
+@TableName("t_hot_recommend")
+public class HotRecommend implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 场景
+     */
+    @TableField("scene_num")
+    private String sceneNum;
+
+    /**
+     * 热点id
+     */
+    @TableField("sid")
+    private String sid;
+
+    /**
+     * 是否精选推荐，0否，1是
+     */
+    @TableField("recommend_selection")
+    private Integer recommendSelection;
+
+    /**
+     * 是否品牌推荐，0否，1是
+     */
+    @TableField("recommend_brand")
+    private Integer recommendBrand;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/cdf/entity/HotRelation.java

@@ -43,6 +43,9 @@ public class HotRelation implements Serializable {
     @TableField("product_source_id")
     private Integer productSourceId;
 
+    @TableField("brand_id")
+    private String brandId;
+
     @TableField("tb_status")
     private Boolean tbStatus;
 

src/main/java/com/cdf/entity/SceneRecommend.java

@@ -0,0 +1,59 @@
+package com.cdf.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-15
+ */
+@Getter
+@Setter
+@TableName("t_scene_recommend")
+public class SceneRecommend implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 精选推荐描述
+     */
+    @TableField("selection_msg")
+    private String selectionMsg;
+
+    /**
+     * 品牌推荐描述
+     */
+    @TableField("brand_msg")
+    private String brandMsg;
+
+    /**
+     * 场景码
+     */
+    @TableField("scene_num")
+    private String sceneNum;
+
+    @TableField("tb_status")
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}

src/main/java/com/cdf/generate/AutoGenerate.java

@@ -20,26 +20,9 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"", getTables(new String[]{
-                "t_scene_source_data"
+                "t_scene_recommend"
         }));
 
-//        generate(path,"goods", getTables(new String[]{
-//                        "t_camera","t_camera_detail","t_camera_out","t_camera_space","t_camera_version",
-//                        "t_company","t_goods","t_goods_sku","t_cart","t_goods_spec",
-//                        "t_goods_spec_value","t_goods_spu_spec","t_sn_code"
-//        }));
-
-//        generate(path,"order", getTables(new String[]{
-//                        "t_increment_order","t_invoice","t_order","t_order_item",
-//                        "t_pre_sale","t_space_sdk","t_trade_log","t_commerce_order","t_download_order","t_expansion_order"
-//        }));
-//        generate(path,"order", getTables(new String[]{
-//                        "t_virtual_order"
-//        }));
-
-//        generate(path,"user", getTables(new String[]{
-//                        "t_user","t_user_increment","t_manager","t_province","t_increment_type","t_intercom_message","t_receiver_info"
-//        }));
     }
 
     public static List<String> getTables(String [] tableNames){

src/main/java/com/cdf/httpClient/request/FdkkHotData.java

@@ -15,4 +15,5 @@ public class FdkkHotData {
     private String hotContent;
 
     private Integer productSourceId;
+    private String brandId;
 }

src/main/java/com/cdf/httpClient/util/CdfOpenApiUtil.java

@@ -0,0 +1,67 @@
+package com.cdf.httpClient.util;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.common.PageInfo;
+import com.cdf.httpClient.vo.*;
+import com.cdf.util.DateUtil;
+
+import java.util.*;
+
+public class CdfOpenApiUtil {
+
+    public static final String CDF_APPID= "A0Dbor9KPFOqvLGnTM";
+    public static final String CDF_AUTH_CODE= "JxRUrnlnnU4fNyMJlsdMTvtnOBqBuAo5";
+    public static final String CDF_APP_SECRET= "sbYX7hQwaB0GlR1BO0jxDvJVs687VUlI";
+
+    public static String createSign( SortedMap<Object,Object> parameters, String key){
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<Object, Object>> es = parameters.entrySet();  //所有参与传参的参数按照accsii排序（升序）
+        Iterator<Map.Entry<Object, Object>> it = es.iterator();
+        while(it.hasNext()) {
+            Map.Entry entry = (Map.Entry)it.next();
+            String k = (String)entry.getKey();
+            Object v = entry.getValue();
+            //空值不传递，不参与签名组串
+            if(null != v && !"".equals(v)) {
+                sb.append(k).append("=").append(v).append("&");
+            }
+        }
+        //System.out.println("字符串:"+sb.toString());
+        sb.append("app_secret=").append(key);
+        //MD5加密,结果转换为大写字符
+        System.out.println(sb.toString());
+        return MD5Util.MD5Encode(sb.toString(), "UTF-8").toUpperCase();
+    }
+
+    public static PageInfo<List<CdfBrand>> getBrandList(Long pageNum, Long pageSize){
+        SortedMap<Object,Object> map = new TreeMap<>();
+        map.put("app_id",CDF_APPID);
+        map.put("auth_code",CDF_AUTH_CODE);
+        map.put("method","sq.brand.list.get");
+        map.put("sign_method","MD5");
+        map.put("nonce_str","3g3jJVfI9CWwKMr45x9SkB0gbi9kAn28");
+        CdfBrandParam cdfBrandParam = new CdfBrandParam(pageNum,pageSize,null);
+        map.put("biz_content",JSONObject.toJSONString(cdfBrandParam));
+        map.put("timestamp", DateUtil.getDateStr(new Date()));
+        String sign = createSign(map, CDF_APP_SECRET);
+        map.put("sign",sign);
+        String jsonString = JSONObject.toJSONString(map);
+        System.out.println(jsonString);
+        String post = HttpUtil.post("https://open.cdfmembers.com/apigateway/v1?app_id="+CDF_APPID+"&method=sq.brand.list.get", jsonString);
+        System.out.println(post);
+        CdfResp resp = JSONObject.parseObject(post, CdfResp.class);
+        if(resp.getCode() == 0000){
+            JSONObject content = resp.getContent();
+            CdfBrandResult brandResult = content.toJavaObject(CdfBrandResult.class);
+            Long totalCount = brandResult.getTotal_count();
+            List<CdfBrand> brands1 =  brandResult.getBrand_list();
+            return PageInfo.PageInfo(pageNum, pageSize, totalCount, brands1);
+        }
+        return null;
+
+    }
+
+
+
+}

src/main/java/com/cdf/httpClient/util/MD5Util.java

@@ -0,0 +1,42 @@
+package com.cdf.httpClient.util;
+
+import java.security.MessageDigest;
+
+public class MD5Util {
+
+    private static String byteArrayToHexString(byte b[]) {
+        StringBuffer resultSb = new StringBuffer();
+        for (int i = 0; i < b.length; i++)
+            resultSb.append(byteToHexString(b[i]));
+
+        return resultSb.toString();
+    }
+
+    private static String byteToHexString(byte b) {
+        int n = b;
+        if (n < 0)
+            n += 256;
+        int d1 = n / 16;
+        int d2 = n % 16;
+        return hexDigits[d1] + hexDigits[d2];
+    }
+
+    public static String MD5Encode(String origin, String charsetname) {
+        String resultString = null;
+        try {
+            resultString = new String(origin);
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            if (charsetname == null || "".equals(charsetname))
+                resultString = byteArrayToHexString(md.digest(resultString
+                        .getBytes()));
+            else
+                resultString = byteArrayToHexString(md.digest(resultString
+                        .getBytes(charsetname)));
+        } catch (Exception exception) {
+        }
+        return resultString;
+    }
+
+    private static final String hexDigits[] = { "0", "1", "2", "3", "4", "5",
+            "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
+}

src/main/java/com/cdf/httpClient/vo/CdfBrand.java

@@ -0,0 +1,15 @@
+package com.cdf.httpClient.vo;
+
+import lombok.Data;
+
+@Data
+public class CdfBrand {
+
+    private String brand_tc_name;
+    private String brand_en_name;
+    private String brand_name;
+    private String logo;
+
+    private String brand_id;
+
+}

src/main/java/com/cdf/httpClient/vo/CdfBrandParam.java

@@ -0,0 +1,14 @@
+package com.cdf.httpClient.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class CdfBrandParam {
+    private Long page_no;
+    private Long page_rows;
+    private List<Integer> brand_ids ;
+}

src/main/java/com/cdf/httpClient/vo/CdfBrandResult.java

@@ -0,0 +1,11 @@
+package com.cdf.httpClient.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CdfBrandResult {
+    private Long total_count;
+    private List<CdfBrand> brand_list;
+}

src/main/java/com/cdf/httpClient/vo/CdfResp.java

@@ -0,0 +1,11 @@
+package com.cdf.httpClient.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+@Data
+public class CdfResp {
+    private Integer code;
+    private String message;
+    private JSONObject content;
+}

src/main/java/com/cdf/mapper/IBrandMapper.java

@@ -0,0 +1,18 @@
+package com.cdf.mapper;
+
+import com.cdf.entity.Brand;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Mapper
+public interface IBrandMapper extends BaseMapper<Brand> {
+
+}

src/main/java/com/cdf/mapper/IHotOutlineMapper.java

@@ -0,0 +1,18 @@
+package com.cdf.mapper;
+
+import com.cdf.entity.HotOutline;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Mapper
+public interface IHotOutlineMapper extends BaseMapper<HotOutline> {
+
+}

src/main/java/com/cdf/mapper/IHotRecommendMapper.java

@@ -0,0 +1,18 @@
+package com.cdf.mapper;
+
+import com.cdf.entity.HotRecommend;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-13
+ */
+@Mapper
+public interface IHotRecommendMapper extends BaseMapper<HotRecommend> {
+
+}

src/main/java/com/cdf/mapper/ISceneRecommendMapper.java

@@ -0,0 +1,18 @@
+package com.cdf.mapper;
+
+import com.cdf.entity.SceneRecommend;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-15
+ */
+@Mapper
+public interface ISceneRecommendMapper extends BaseMapper<SceneRecommend> {
+
+}

src/main/java/com/cdf/request/BrandApiParam.java

@@ -0,0 +1,9 @@
+package com.cdf.request;
+
+import com.cdf.request.BaseRequest;
+import lombok.Data;
+
+@Data
+public class BrandApiParam extends BaseRequest {
+    private String keyword;
+}

src/main/java/com/cdf/request/UploadHotsParam.java

@@ -0,0 +1,14 @@
+package com.cdf.request;
+
+import lombok.Data;
+
+@Data
+public class UploadHotsParam {
+    private String filePath;
+    /**
+     * 0瀑布流导入，1精选推荐导入，2品牌推荐导入
+     */
+    private Integer type;
+
+    private String token;
+}

src/main/java/com/cdf/response/BrandApiVo.java

@@ -0,0 +1,17 @@
+package com.cdf.response;
+
+import lombok.Data;
+
+@Data
+public class BrandApiVo {
+    private Integer id ;
+    private String cdfBrandId;
+    private String zhName;
+    private String ftName;
+    private String enName;
+    private String brandLogo;
+    private Integer outlineId;
+    private String outlineName;
+    private String outlineImage;
+
+}

src/main/java/com/cdf/response/BrandExcelVo.java

@@ -0,0 +1,17 @@
+package com.cdf.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class BrandExcelVo {
+
+    @ExcelProperty("品牌Id")
+    private String cdfBrandId;
+    @ExcelProperty("中文名称")
+    private String zhName;
+    @ExcelProperty("繁体名称")
+    private String ftName;
+    @ExcelProperty("英文名称")
+    private String enName;
+}

src/main/java/com/cdf/response/HotExcelVo.java

@@ -0,0 +1,15 @@
+package com.cdf.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class HotExcelVo {
+
+    @ExcelProperty("热点Id")
+    private String sid;
+    @ExcelProperty("热点名称")
+    private String title;
+}

src/main/java/com/cdf/response/HotUploadTemplate.java

@@ -0,0 +1,24 @@
+package com.cdf.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+public class HotUploadTemplate {
+
+    @ExcelProperty("场景码")
+    private String sceneNum;
+
+    @ExcelProperty("热点ID")
+    private String sid;
+
+    @ExcelProperty("热点标题")
+    private String hotTitle;
+
+    public HotUploadTemplate(String sceneNum, String sid, String hotTitle) {
+        this.sceneNum = sceneNum;
+        this.sid = sid;
+        this.hotTitle = hotTitle;
+    }
+}

src/main/java/com/cdf/response/OutlineUploadTemplate.java

@@ -0,0 +1,23 @@
+package com.cdf.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+public class OutlineUploadTemplate {
+
+    @ExcelProperty("外框ID")
+    private String outlineId;
+    @ExcelProperty("品牌ID")
+    private String brandId;
+
+    public OutlineUploadTemplate(String outlineId) {
+        this.outlineId = outlineId;
+    }
+
+    public OutlineUploadTemplate(String outlineId, String brandId) {
+        this.outlineId = outlineId;
+        this.brandId = brandId;
+    }
+}

src/main/java/com/cdf/response/ProductUploadTemplate.java

@@ -0,0 +1,26 @@
+package com.cdf.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+public class ProductUploadTemplate {
+
+    @ExcelProperty("场景码")
+    private String sceneNum;
+
+    @ExcelProperty("热点ID")
+    private String sid;
+
+    @ExcelProperty("热点标题")
+    private String hotTitle;
+
+    @ExcelProperty("店铺ID")
+    private String shopId;
+
+    @ExcelProperty("商品P码")
+    private String productId;
+
+
+}

src/main/java/com/cdf/schedule/ScheduleTask.java

@@ -1,22 +1,23 @@
 package com.cdf.schedule;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cdf.common.PageInfo;
+import com.cdf.entity.Brand;
 import com.cdf.entity.PageData;
-import com.cdf.entity.SceneSource;
 import com.cdf.entity.SceneSourceData;
 import com.cdf.entity.TotalData;
+import com.cdf.httpClient.util.CdfOpenApiUtil;
+import com.cdf.httpClient.vo.CdfBrand;
+import com.cdf.service.IBrandService;
 import com.cdf.service.IPageDataService;
 import com.cdf.service.ISceneSourceDataService;
-import com.cdf.service.ISceneSourceService;
 import com.cdf.service.ITotalDataService;
 import com.cdf.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.naming.ldap.PagedResultsControl;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -134,4 +135,13 @@ public class ScheduleTask {
         totalDataService.save(totalData);
     }
 
+
+    @Autowired
+    IBrandService brandService;
+
+    @Scheduled(fixedDelay = 24*60*60*1000, initialDelay = 10*1000)
+    public void updateBrand() throws Exception {
+        brandService.updateBrandInfo();
+    }
+
 }

src/main/java/com/cdf/service/IBrandService.java

@@ -0,0 +1,33 @@
+package com.cdf.service;
+
+import com.cdf.entity.Brand;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cdf.request.BrandApiParam;
+import com.cdf.response.BrandApiVo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+public interface IBrandService extends IService<Brand> {
+
+    void updateBrandInfo() throws Exception;
+
+    Object pageList(BrandApiParam param);
+
+    HashMap<String, BrandApiVo> getMapByIds(Set<String> brandIds);
+
+    List<Brand> getByCdfBrandIds(List<String> brandIds);
+
+    void updateBrandOutline(String brandId, String outlineId);
+
+    List<Brand> getByHotOutlineId(Integer outlineId);
+}

src/main/java/com/cdf/service/IHotOutlineService.java

@@ -0,0 +1,20 @@
+package com.cdf.service;
+
+import com.cdf.entity.HotOutline;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+public interface IHotOutlineService extends IService<HotOutline> {
+
+    HashMap<Integer, HotOutline> getMapByIds(List<Integer> outLineIds);
+}

src/main/java/com/cdf/service/IHotRecommendService.java

@@ -0,0 +1,24 @@
+package com.cdf.service;
+
+import com.cdf.entity.HotRecommend;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-13
+ */
+public interface IHotRecommendService extends IService<HotRecommend> {
+
+    HotRecommend getByNumAndSid(String sceneNum, String sid);
+
+    List<HotRecommend> getByNum(String num);
+
+    HashMap<String, HotRecommend> getMapBySids(List<String> sidsList);
+}

src/main/java/com/cdf/service/IHotRelationService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface IHotRelationService extends IService<HotRelation> {
 
     List<HotRelation> getByProductSourceId(Integer productSourceId);
+
+    List<HotRelation> getByNum(String sceneNum);
 }

src/main/java/com/cdf/service/ISceneRecommendService.java

@@ -0,0 +1,17 @@
+package com.cdf.service;
+
+import com.cdf.entity.SceneRecommend;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-15
+ */
+public interface ISceneRecommendService extends IService<SceneRecommend> {
+
+    SceneRecommend getBySceneNum(String sceneNum);
+}

src/main/java/com/cdf/service/impl/BrandServiceImpl.java

@@ -0,0 +1,204 @@
+package com.cdf.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.common.PageInfo;
+import com.cdf.entity.Brand;
+import com.cdf.entity.HotOutline;
+import com.cdf.httpClient.util.CdfOpenApiUtil;
+import com.cdf.httpClient.vo.CdfBrand;
+import com.cdf.mapper.IBrandMapper;
+import com.cdf.request.BrandApiParam;
+import com.cdf.response.BrandApiVo;
+import com.cdf.service.IBrandService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cdf.service.IHotOutlineService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Service
+@Slf4j
+public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implements IBrandService {
+
+    @Autowired
+    IHotOutlineService hotOutlineService;
+    @Override
+    public void updateBrandInfo() throws Exception {
+        Long pageNum = 1L;
+        Long pageSize = 100L;
+        List<CdfBrand> allBrand = new ArrayList<>();
+        PageInfo<List<CdfBrand>> pageInfo = CdfOpenApiUtil.getBrandList(pageNum,pageSize);
+        if(pageInfo == null){
+            return;
+        }
+        Long size = 0L;
+        if(pageInfo.getTotal() % pageSize == 0){
+            size = pageInfo.getTotal() /pageSize;
+        }else {
+            size = pageInfo.getTotal() / pageSize +1;
+        }
+        log.info("cdf品牌总数为{}，一共为{}页",pageInfo.getTotal(),size);
+        for (long i = 1 ; i<= size;i++){
+            Thread.sleep(500L);
+            allBrand.addAll(pageInfo.getList());
+            pageInfo = CdfOpenApiUtil.getBrandList(i,pageSize);
+        }
+        List<Brand> list = this.list();
+        HashMap<String,Brand> brandHashMap = new HashMap<>();
+        for (Brand brand : list) {
+            brandHashMap.put(brand.getCdfBrandId(),brand);
+        }
+        List<Brand> saveList = new ArrayList<>();
+        HashMap<String,CdfBrand> cdfBrandHashMap = new HashMap<>();
+        for (CdfBrand cdfBrand : allBrand) {
+            cdfBrandHashMap.put(cdfBrand.getBrand_id(),cdfBrand);
+        }
+        for (String  brandId : cdfBrandHashMap.keySet()) {
+            CdfBrand cdfBrand = cdfBrandHashMap.get(brandId);
+            if(cdfBrand == null){
+                continue;
+            }
+            Brand brand = brandHashMap.get(cdfBrand.getBrand_id());
+            if(brand == null){
+                brand = new Brand();
+                brand.setCdfBrandId(cdfBrand.getBrand_id());
+            }
+            brand.setZhName(cdfBrand.getBrand_name());
+            brand.setFtName(cdfBrand.getBrand_tc_name());
+            brand.setEnName(cdfBrand.getBrand_en_name());
+            brand.setBrandLogo(cdfBrand.getLogo());
+            saveList.add(brand);
+        }
+        this.saveOrUpdateBatch(saveList);
+
+        List<String> delList = new ArrayList<>();
+        Set<String> cdfBrandIds = saveList.stream().map(Brand::getCdfBrandId).collect(Collectors.toSet());
+        Set<String> dbBrandIds = list.stream().map(Brand::getCdfBrandId).collect(Collectors.toSet());
+        for (String dbBrandId : dbBrandIds) {
+            if(!cdfBrandIds.contains(dbBrandId)){
+                delList.add(dbBrandId);
+            }
+        }
+        if(delList.size() >0){
+            LambdaQueryWrapper<Brand> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(Brand::getCdfBrandId,delList);
+            this.remove(wrapper);
+        }
+    }
+
+    @Override
+    public Object pageList(BrandApiParam param) {
+        LambdaQueryWrapper<Brand> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getKeyword())){
+            wrapper.like(Brand::getZhName,param.getKeyword())
+                    .or()
+                    .like(Brand::getFtName,param.getKeyword())
+                    .or()
+                    .like(Brand::getEnName,param.getKeyword());
+        }
+        wrapper.orderByDesc(Brand::getCreateTime);
+        Page<Brand> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        List<Integer> outLineIds = page.getRecords().stream().map(Brand::getOutlineId).filter(Objects::nonNull).collect(Collectors.toList());
+        HashMap<Integer, HotOutline> map = hotOutlineService.getMapByIds(outLineIds);
+
+        Page<BrandApiVo> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
+        List<BrandApiVo> listVo = new ArrayList<>();
+        for (Brand record : page.getRecords()) {
+            BrandApiVo vo = new BrandApiVo();
+            BeanUtil.copyProperties(record,vo);
+            HotOutline hotOutline = map.get(record.getOutlineId());
+            if(hotOutline != null){
+                vo.setOutlineName(hotOutline.getOutlineName());
+                vo.setOutlineImage(hotOutline.getOutlineImage());
+            }
+            listVo.add(vo);
+        }
+        pageVo.setTotal(page.getTotal());
+        pageVo.setRecords(listVo);
+
+        return PageInfo.PageInfo(pageVo);
+    }
+
+    @Override
+    public HashMap<String, BrandApiVo> getMapByIds(Set<String> brandIds) {
+        HashMap<String, BrandApiVo> map = new HashMap<>();
+        if(!brandIds.isEmpty()){
+            List<Brand> brands = this.getByCdfBrandIds(new ArrayList<>(brandIds));
+            List<Integer> outLineIds = brands.stream().map(Brand::getOutlineId).filter(Objects::nonNull).collect(Collectors.toList());
+            HashMap<Integer, HotOutline> hotOutlineHashMap = hotOutlineService.getMapByIds(outLineIds);
+            for (Brand brand : brands) {
+                BrandApiVo vo = new BrandApiVo();
+                BeanUtil.copyProperties(brand,vo);
+                HotOutline hotOutline = hotOutlineHashMap.get(brand.getOutlineId());
+                if(hotOutline != null){
+                    vo.setOutlineName(hotOutline.getOutlineName());
+                    vo.setOutlineImage(hotOutline.getOutlineImage());
+                }
+                map.put(vo.getCdfBrandId(),vo);
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public List<Brand> getByCdfBrandIds(List<String> brandIds) {
+        if(brandIds != null && brandIds.size() >0){
+            LambdaQueryWrapper<Brand> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(Brand::getCdfBrandId,brandIds);
+            return this.list(wrapper);
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        Long pageNum = 1L;
+        Long pageSize = 100L;
+        List<CdfBrand> allBrand = new ArrayList<>();
+        PageInfo<List<CdfBrand>> pageInfo =CdfOpenApiUtil.getBrandList(pageNum,pageSize);
+        if(pageInfo == null){
+            return;
+        }
+        Long size = 0L;
+        if(pageInfo.getTotal() % pageSize == 0){
+            size = pageInfo.getTotal() /pageSize;
+        }else {
+            size = pageInfo.getTotal() / pageSize +1;
+        }
+        log.info("cdf品牌总数为{}，一共为{}页",pageInfo.getTotal(),size);
+        for (long i = 1 ; i<= size;i++){
+            allBrand.addAll(pageInfo.getList());
+            pageInfo = CdfOpenApiUtil.getBrandList(i,pageSize);
+        }
+        System.out.println(allBrand.size());
+    }
+
+    @Override
+    public void updateBrandOutline(String brandId, String outlineId) {
+        LambdaUpdateWrapper<Brand> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(Brand::getCdfBrandId,brandId);
+        wrapper.set(Brand::getOutlineId,outlineId);
+        this.update(wrapper);
+    }
+
+    @Override
+    public List<Brand> getByHotOutlineId(Integer outlineId) {
+        LambdaQueryWrapper<Brand> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Brand::getOutlineId,outlineId);
+        return this.list(wrapper);
+    }
+}

src/main/java/com/cdf/service/impl/ExcelService.java

@@ -0,0 +1,503 @@
+package com.cdf.service.impl;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.amazonaws.services.ecs.model.Tmpfs;
+import com.cdf.common.CacheUtil;
+import com.cdf.common.ResultCode;
+import com.cdf.entity.*;
+import com.cdf.httpClient.client.CdfClient;
+import com.cdf.httpClient.client.CdfHKClient;
+import com.cdf.httpClient.response.cdf.CdfProduct;
+import com.cdf.httpClient.response.cdf.CdfProductListByIdsRequest;
+import com.cdf.httpClient.response.cdf.CdfProductListByIdsVo;
+import com.cdf.request.UploadHotsParam;
+import com.cdf.response.*;
+import com.cdf.exception.BusinessException;
+import com.cdf.service.*;
+import com.cdf.util.ExcelUtil;
+import com.cdf.util.UploadToCdfOssUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class ExcelService {
+
+    @Resource
+    private UploadToCdfOssUtil uploadToCdfOssUtil;
+
+    @Value("${upload.file-path}")
+    private String filePath;
+    @Value("${upload.query-path}")
+    private String queryPath;
+    @Autowired
+    private FdkkSceneEditService fdkkSceneEditService;
+    @Autowired
+    CdfHKClient cdfHKClient;
+    @Autowired
+    IProductSourceService productSourceService;
+    @Autowired
+    private IHotOutlineService hotOutlineService;
+    @Autowired
+    private IBrandService brandService;
+    @Autowired
+    private IHotRelationService hotRelationService;
+    @Autowired
+    private IHotRecommendService hotRecommendService;
+    @Autowired
+    IFdkkUserService fdkkUserService;
+    @Autowired
+    INumRegionService numRegionService;
+
+
+    // 0 外框设置 ，1 瀑布流， 2，精选推荐设置 ，3 品牌推荐设置
+    public void  downTemplate(Integer type,String sceneNum,HttpServletRequest req,HttpServletResponse response)  {
+        if(type == null ){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        try {
+            List<HotUploadTemplate> list = new ArrayList<>();
+            if(type !=0 && StringUtils.isNotBlank(sceneNum)){
+                list = getHotsList(sceneNum);
+            }
+
+            String fileName = "";
+            switch (type){
+                case 0 :
+                    fileName ="导入外框模版";
+                    List<HotOutline> list1 = hotOutlineService.list();
+                    List<OutlineUploadTemplate> OutlineUploadTemplateList = new ArrayList<>();
+                    for (HotOutline hotOutline : list1) {
+                        OutlineUploadTemplate template = new OutlineUploadTemplate(hotOutline.getId().toString());
+                        OutlineUploadTemplateList.add(template);
+                    }
+
+                    this.commonExport(req,response,fileName,OutlineUploadTemplateList, OutlineUploadTemplate.class);
+                    break;
+                case 1 :
+                    HashMap<String,HotUploadTemplate> sidMap = new HashMap<>();
+                    for (HotUploadTemplate hotUploadTemplate : list) {
+                        sidMap.put(hotUploadTemplate.getSid(),hotUploadTemplate);
+                    }
+                    List<HotRelation> hotRelations = hotRelationService.getByNum(sceneNum);
+                    List<String> sids = hotRelations.stream().filter(e -> e.getHotType() == 3).map(HotRelation::getHotId).collect(Collectors.toList());
+                    List<ProductUploadTemplate> resultList = new ArrayList<>();
+                    for (String sid : sids) {
+                        HotUploadTemplate hotUploadTemplate = sidMap.get(sid);
+                        if(hotUploadTemplate == null){
+                            continue;
+                        }
+                        ProductUploadTemplate template = new ProductUploadTemplate();
+                        template.setSceneNum(sceneNum);
+                        template.setSid(sid);
+                        template.setHotTitle(hotUploadTemplate.getHotTitle());
+                        resultList.add(template);
+                    }
+                    fileName ="导入商品瀑布流模版";
+                    this.commonExport(req,response,fileName,resultList, ProductUploadTemplate.class);
+                    break;
+                case 2 :
+                    fileName ="导入精选推荐模版";
+                    this.commonExport(req,response,fileName,list, HotUploadTemplate.class);
+                    break;
+                case 3 :
+                    fileName ="导入品牌推荐模版";
+                    this.commonExport(req,response,fileName,list, HotUploadTemplate.class);
+                    break;
+                default: throw new BusinessException(ResultCode.PARAM_MISS);
+            }
+
+        }catch (Exception e){
+            log.info("导出热点列表出错",e);
+        }
+
+    }
+
+    public void commonExport(HttpServletRequest request, HttpServletResponse response,String name,List<?> result,Class<?> clz) throws Exception {
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), clz).build();
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = name  + ".xlsx";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+        WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
+        excelWriter.write(result, writeSheet);
+        excelWriter.finish();
+    }
+
+    public List<String> checkFile(UploadHotsParam param) {
+        if(StringUtils.isBlank(param.getFilePath()) || param.getType() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        String awsKey = param.getFilePath().replace(queryPath, "");
+        if(!uploadToCdfOssUtil.existKey(awsKey)){
+            throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
+        }
+        String localPath = String.format(CacheUtil.localFilePath, CacheUtil.activeYaml);
+        String localFile = localPath + awsKey;
+        File file = new File(localFile);
+        if (! file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        log.info("checkFile:{}",localFile);
+        uploadToCdfOssUtil.downFromS3(awsKey,localFile);
+        if(!file.exists()){
+            throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
+        }
+
+        List<String> errorList = new ArrayList<>();
+        String resultError = null;
+        switch (param.getType()){
+            case 0:
+                checkUploadOutline(file,errorList);
+                break;
+            case 1:
+                checkUploadProduct(file,errorList);
+                break;
+            case 2 :case 3 :
+                checkHot(file,errorList);
+                break;
+            default:  throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+
+        return errorList;
+    }
+
+
+
+    private void checkUploadOutline(File file, List<String> errorList) {
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        Integer colum = 1;
+        List<String> outlineIds = new ArrayList<>();
+        List<String> outlineIdsDb = new ArrayList<>();
+        List<String> brandIds = new ArrayList<>();
+        List<String> brandIdsDb = new ArrayList<>();
+        for (HashMap<Integer, String> map : excelRowList) {
+            String outlineId = map.get(0);
+            String brandId = map.get(1);
+            if(StringUtils.isNotBlank(outlineId)){
+                outlineIds.add(outlineId);
+            }
+            if(StringUtils.isNotBlank(brandId)){
+                brandIds.add(brandId);
+            }
+        }
+        if(outlineIds.size() >0){
+            List<HotOutline> hotOutlines = hotOutlineService.listByIds(outlineIds);
+            for (HotOutline hotOutline : hotOutlines) {
+                outlineIdsDb.add(hotOutline.getId().toString());
+            }
+        }
+        if(brandIds.size() >0){
+            List<Brand> brands = brandService.getByCdfBrandIds(brandIds);
+            for (Brand brand : brands) {
+                brandIdsDb.add(brand.getCdfBrandId().toString());
+            }
+        }
+
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            String outlineId = map.get(0);
+            String brandId = map.get(1);
+            if(StringUtils.isBlank(outlineId) || StringUtils.isBlank(brandId)){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(!outlineIdsDb.contains(outlineId)){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(!brandIdsDb.contains(brandId)){
+                errorList.add(colum.toString());
+            }
+
+        }
+    }
+
+    private void checkUploadProduct(File file, List<String> errorList){
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        Integer colum = 1;
+        HashMap<String,ProductSource> productSourceHashMap = new HashMap<>();
+        HashMap<String, List<String>> productSourceProductMap = new HashMap<>();
+        HashMap<String, List<String>> resultPMap = new HashMap<>();
+        HashMap<String, List<String>> numMap = new HashMap<>();
+
+        for (HashMap<Integer, String> map : excelRowList) {
+            String sourceId = map.get(3);
+            if(StringUtils.isNotBlank(sourceId)){
+                ProductSource byMchId = productSourceService.getByMchId(sourceId);
+                productSourceHashMap.put(sourceId,byMchId);
+            }
+            String pid = map.get(4);
+            if(StringUtils.isNotBlank(pid)){
+                List<String> pidList = productSourceProductMap.computeIfAbsent(sourceId, k -> new ArrayList<>());
+                pidList.add(pid);
+            }
+        }
+        for (String mchId : productSourceProductMap.keySet()) {
+            ProductSource productSource = productSourceHashMap.get(mchId);
+            JSONArray ids = new JSONArray();
+            ids.addAll(productSourceProductMap.get(mchId));
+            CdfProductListByIdsRequest idsRequest = new CdfProductListByIdsRequest(ids);
+            CdfProductListByIdsVo vos = cdfHKClient.getProductListByIds(productSource.getCdfHost(), productSource.getCdfMchId(), idsRequest);
+            if(vos.getProductCardList()!=null && vos.getProductCardList().size() >0){
+                for (CdfProduct cdfProduct : vos.getProductCardList()) {
+                    List<String> pidList = resultPMap.computeIfAbsent(mchId, k -> new ArrayList<>());
+                    pidList.add(cdfProduct.getId());
+                }
+            }
+        }
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            String sceneNum = map.get(0);
+            String sid = map.get(1);
+            String title = map.get(2);
+            String mchId = map.get(3);
+            String pid = map.get(4);
+            if(StringUtils.isBlank(sceneNum) || StringUtils.isBlank(sid) || StringUtils.isBlank(pid) || StringUtils.isBlank(mchId)){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(numMap.get(sceneNum) == null){
+                List<HotRelation> hotRelations = hotRelationService.getByNum(sceneNum);
+                List<String> sidList = hotRelations.stream().map(HotRelation::getHotId).collect(Collectors.toList());
+                numMap.put(sceneNum,sidList);
+            }
+            if(!numMap.get(sceneNum).contains(sid)){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(!productSourceHashMap.containsKey(mchId)){
+                errorList.add(colum.toString());
+                continue;
+            }
+            List<String> cdfProductList = resultPMap.get(mchId);
+            if(cdfProductList.isEmpty()){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(!cdfProductList.contains(pid)){
+                errorList.add(colum.toString());
+            }
+
+        }
+    }
+    private void checkHot(File file, List<String> errorList) {
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        Integer colum = 1;
+        List<HotUploadTemplate> list = null;
+
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            String sceneNum = map.get(0);
+            String sid = map.get(1);
+            String title = map.get(2);
+            if(StringUtils.isBlank(sceneNum) || StringUtils.isBlank(sid) ){
+                errorList.add(colum.toString());
+                continue;
+            }
+            if(list == null){
+                list  = getHotsList(sceneNum);
+            }
+            if(list .isEmpty()){
+                errorList.add(colum.toString());
+                continue;
+            }
+            List<String> collect = list.stream().map(HotUploadTemplate::getSid).collect(Collectors.toList());
+            if(!collect.contains(sid)){
+                errorList.add(colum.toString());
+            }
+
+        }
+    }
+
+    private  List<HotUploadTemplate> getHotsList(String sceneNum){
+        JSONArray hotJson = fdkkSceneEditService.getCdfHotJson(sceneNum);
+        List<HotUploadTemplate> list = new ArrayList<>();
+        for (Object obj : hotJson) {
+            JSONObject tag = (JSONObject) obj;
+            String sid = tag.getString("sid");
+            String title = tag.getString("title");
+            HotUploadTemplate hotExcelVo = new HotUploadTemplate(sceneNum,sid,title);
+            list.add(hotExcelVo);
+        }
+        return list;
+    }
+
+    public void uploadExcel(UploadHotsParam param) {
+        if(StringUtils.isBlank(param.getFilePath()) || param.getType()== null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        String awsKey = param.getFilePath().replace(queryPath, "");
+        if(!uploadToCdfOssUtil.existKey(awsKey)){
+            throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
+        }
+        String localPath = String.format(CacheUtil.localFilePath, CacheUtil.activeYaml);
+        String localFile = localPath + awsKey;
+        File file = new File(localFile);
+        if(!file.exists()){
+            throw new BusinessException(ResultCode.UPLOAD_EXCEL_CHECK_ERROR);
+        }
+        switch (param.getType()){
+            case 0:
+                uploadOutline(file);
+                break;
+            case 1:
+                uploadProduct(file);
+                break;
+            case 2 :case 3 :
+                uploadHot(file,param.getType());
+                break;
+            default:  throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+
+    }
+
+    private void uploadOutline(File file) {
+        List<String> errorList = new ArrayList<>();
+        this.checkUploadOutline(file,errorList);
+        Integer colum = 1;
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
+            String outlineId = map.get(0);
+            String brandId = map.get(1);
+            if(StringUtils.isNotBlank(outlineId) && StringUtils.isNotBlank(brandId)){
+                brandService.updateBrandOutline(brandId,outlineId);
+            }
+        }
+
+    }
+
+    private void uploadProduct(File file) {
+        List<String> errorList = new ArrayList<>();
+        this.checkUploadProduct(file,errorList);
+        Integer colum = 1;
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        HashMap<String,HashMap<String,HashSet<String>>> numMap = new HashMap<>();
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
+            String sceneNum = map.get(0);
+            String sid = map.get(1);
+            String title = map.get(2);
+            String mchId = map.get(3);
+            String pid = map.get(4);
+            if(StringUtils.isBlank(mchId) || StringUtils.isBlank(sceneNum)  || StringUtils.isBlank(pid) || StringUtils.isBlank(sid)){
+                continue;
+            }
+            numMap.computeIfAbsent(sceneNum, k -> new HashMap<>());
+            numMap.get(sceneNum).computeIfAbsent(sid,k -> new HashSet<>());
+            numMap.get(sceneNum).get(sid).add(pid);
+        }
+        List<HotRelation> updateList = new ArrayList<>();
+        for (String num : numMap.keySet()) {
+            HashMap<String, HashSet<String>> sidMap = numMap.get(num);
+            for (String sid : sidMap.keySet()) {
+                HotRelation hotRelation = hotRelationService.getById(sid);
+                if(hotRelation == null){
+                    continue;
+                }
+                HashSet<String> pidSet = sidMap.get(sid);
+                hotRelation.setRelationIds(JSONArray.toJSONString(pidSet));
+                updateList.add(hotRelation);
+            }
+        }
+        if(!updateList.isEmpty()){
+            hotRelationService.updateBatchById(updateList);
+        }
+
+        for (String num : numMap.keySet()) {
+            NumRegion numRegion = fdkkUserService.getRegionByNum(num);
+            fdkkSceneEditService.writeHotJson(num,numRegion.getRegion());
+        }
+    }
+
+    private void uploadHot(File file,Integer type) {
+        List<String> errorList = new ArrayList<>();
+        this.checkHot(file,errorList);
+        Integer colum = 1;
+        List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
+        HashMap<String,HashSet<String>> numMap = new HashMap<>();
+        for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
+            String sceneNum = map.get(0);
+            String sid = map.get(1);
+            String title = map.get(2);
+            if(StringUtils.isBlank(sid) || StringUtils.isBlank(sceneNum)){
+                continue;
+            }
+
+            numMap.computeIfAbsent(sceneNum, k -> new HashSet<>());
+            numMap.get(sceneNum).add(sid);
+            HotRecommend recommend = hotRecommendService.getByNumAndSid(sceneNum,sid);
+            if(recommend == null){
+                recommend = new HotRecommend();
+                recommend.setSceneNum(sceneNum);
+                recommend.setSid(sid);
+            }
+            if(type == 2){
+                recommend.setRecommendSelection(1);
+            }
+            if(type == 3){
+                recommend.setRecommendBrand(1);
+            }
+            hotRecommendService.saveOrUpdate(recommend);
+        }
+        List<Integer> delIds = new ArrayList<>();
+        for (String num : numMap.keySet()) {
+            List<HotRecommend> list = hotRecommendService.getByNum(num);
+            HashSet<String> strings = numMap.get(num);
+            for (HotRecommend recommend : list) {
+               if(!strings.contains(recommend.getSid())){
+                   delIds.add(recommend.getId());
+               }
+            }
+        }
+        if(!delIds.isEmpty()){
+            hotRecommendService.removeByIds(delIds);
+        }
+        for (String num : numMap.keySet()) {
+            NumRegion numRegion = fdkkUserService.getRegionByNum(num);
+            fdkkSceneEditService.writeHotJson(num,numRegion.getRegion());
+        }
+    }
+
+    public void downBrandExcel(HttpServletRequest request,HttpServletResponse response) throws Exception {
+        List<Brand> list = brandService.list();
+        List<BrandExcelVo> voList = new ArrayList<>();
+        for (Brand brand : list) {
+            BrandExcelVo vo = new BrandExcelVo();
+            BeanUtil.copyProperties(brand,vo);
+            voList.add(vo);
+        }
+
+        this.commonExport(request,response,"品牌信息",voList, BrandExcelVo.class);
+    }
+}

src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -5,10 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.ResultCode;
-import com.cdf.entity.HotRelation;
-import com.cdf.entity.NumRegion;
-import com.cdf.entity.ProductHk;
-import com.cdf.entity.ProductSource;
+import com.cdf.entity.*;
 import com.cdf.exception.BusinessException;
 import com.cdf.httpClient.client.CdfClient;
 import com.cdf.httpClient.client.CdfHKClient;
@@ -19,10 +16,8 @@ import com.cdf.httpClient.request.FdkkUploadRequest;
 import com.cdf.httpClient.request.SceneRequest;
 import com.cdf.httpClient.response.FdkkResponse;
 import com.cdf.httpClient.response.cdf.*;
-import com.cdf.service.IFdkkUserService;
-import com.cdf.service.IHotRelationService;
-import com.cdf.service.IProductHkService;
-import com.cdf.service.IProductSourceService;
+import com.cdf.response.BrandApiVo;
+import com.cdf.service.*;
 import com.cdf.util.*;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
@@ -75,6 +70,10 @@ public class FdkkSceneEditService {
     IFdkkUserService fdkkUserService;
     @Autowired
     IProductSourceService productSourceService;
+    @Autowired
+    IBrandService brandService;
+    @Autowired
+    IHotRecommendService hotRecommendService;
 
 
     public JSONObject getAuth(String num, String token) {
@@ -125,6 +124,7 @@ public class FdkkSceneEditService {
             hotRelation.setNum(fdkkHotRequest.getNum());
             hotRelation.setContent(fdkkHotData.getHotContent());
             hotRelation.setProductSourceId(fdkkHotData.getProductSourceId());
+            hotRelation.setBrandId(fdkkHotData.getBrandId());
             if(update){
                 hotRelationService.updateById(hotRelation);
             }else {
@@ -286,7 +286,9 @@ public class FdkkSceneEditService {
 
         List<String> sidsList = new ArrayList<>();
         HashMap<String,HotRelation> hotRelationMap = new HashMap<>();
+        HashMap<String,HotRecommend> hotRecommendHashMap = new HashMap<>();
         HashMap<Integer,ProductSource> productSourceMap = new HashMap<>();
+        HashMap<String, BrandApiVo> brandMap = new HashMap<>();
         for (Object obj : tags) {
             JSONObject tag = (JSONObject) obj;
             String sid = tag.getString("sid");
@@ -299,6 +301,7 @@ public class FdkkSceneEditService {
                 hotRelationMap.put(hotRelation.getHotId(),hotRelation);
             }
 
+            hotRecommendHashMap = hotRecommendService.getMapBySids(sidsList);
             Set<Integer> productSourceIds = hotRelations.stream().map(HotRelation::getProductSourceId).collect(Collectors.toSet());
             if(productSourceIds.size() >0){
                 productSources = productSourceService.listByIds(productSourceIds);
@@ -306,15 +309,31 @@ public class FdkkSceneEditService {
                     productSourceMap.put(productSource.getId(),productSource);
                 }
             }
+            Set<String> brandIds = new HashSet<>();
+            for (HotRelation hotRelation : hotRelations) {
+                if(StringUtils.isNotBlank(hotRelation.getBrandId())){
+                    brandIds.add(hotRelation.getBrandId());
+                }
+            }
+            brandMap = brandService.getMapByIds(brandIds);
         }
 
         for (Object obj : tags) {
             JSONObject tag = (JSONObject) obj;
             String sid = tag.getString("sid");
+            HotRecommend recommend = hotRecommendHashMap.get(sid);
+            if(recommend != null){
+                tag.put("recommendSelection",recommend.getRecommendSelection());
+                tag.put("recommendBrand",recommend.getRecommendBrand());
+            }
+
             HotRelation hotRelation = hotRelationMap.get(sid);
             if(hotRelation == null){
                 continue;
             }
+            if(hotRelation.getBrandId() != null){
+                tag.put("brand",brandMap.get(hotRelation.getBrandId()));
+            }
             tag.put("hotType",hotRelation.getHotType());
             //0商品，1优惠劵，2第三方跳转，3瀑布流 ,場景关联
             if(hotRelation.getHotType() == null){
@@ -335,6 +354,7 @@ public class FdkkSceneEditService {
             if(hotRelation.getProductSourceId() != null){
                 tag.put("productSource",productSourceMap.get(hotRelation.getProductSourceId()));
             }
+
             resultMap.put(sid,jsonArray);
             requestArray.addAll(jsonArray);
         }

src/main/java/com/cdf/service/impl/HotOutlineServiceImpl.java

@@ -0,0 +1,33 @@
+package com.cdf.service.impl;
+
+import com.cdf.entity.HotOutline;
+import com.cdf.mapper.IHotOutlineMapper;
+import com.cdf.service.IHotOutlineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.time.OffsetTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-06
+ */
+@Service
+public class HotOutlineServiceImpl extends ServiceImpl<IHotOutlineMapper, HotOutline> implements IHotOutlineService {
+
+    @Override
+    public HashMap<Integer, HotOutline> getMapByIds(List<Integer> outLineIds) {
+        HashMap<Integer, HotOutline> map = new HashMap<>();
+        if(!outLineIds.isEmpty()){
+            List<HotOutline> hotOutlines = this.listByIds(outLineIds);
+            hotOutlines.forEach(entity -> map.put(entity.getId(),entity));
+        }
+        return map;
+    }
+}

src/main/java/com/cdf/service/impl/HotRecommendServiceImpl.java

@@ -0,0 +1,51 @@
+package com.cdf.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cdf.entity.HotRecommend;
+import com.cdf.mapper.IHotRecommendMapper;
+import com.cdf.service.IHotRecommendService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-13
+ */
+@Service
+public class HotRecommendServiceImpl extends ServiceImpl<IHotRecommendMapper, HotRecommend> implements IHotRecommendService {
+
+    @Override
+    public HotRecommend getByNumAndSid(String sceneNum, String sid) {
+        LambdaQueryWrapper<HotRecommend> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HotRecommend::getSceneNum,sceneNum);
+        wrapper.eq(HotRecommend::getSid,sid);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public List<HotRecommend> getByNum(String num) {
+        LambdaQueryWrapper<HotRecommend> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HotRecommend::getSceneNum,num);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public HashMap<String, HotRecommend> getMapBySids(List<String> sidsList) {
+        HashMap<String, HotRecommend> map = new HashMap<>();
+        if(!sidsList.isEmpty()){
+            LambdaQueryWrapper<HotRecommend> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(HotRecommend::getSid,sidsList);
+            List<HotRecommend> list = this.list(wrapper);
+            list.forEach(e -> map.put(e.getSid(),e));
+
+        }
+        return map;
+    }
+}

src/main/java/com/cdf/service/impl/HotRelationServiceImpl.java

@@ -26,4 +26,11 @@ public class HotRelationServiceImpl extends ServiceImpl<IHotRelationMapper, HotR
         wrapper.eq(HotRelation::getProductSourceId,productSourceId);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<HotRelation> getByNum(String sceneNum) {
+        LambdaQueryWrapper<HotRelation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HotRelation::getNum,sceneNum);
+        return this.list(wrapper);
+    }
 }

src/main/java/com/cdf/service/impl/SceneRecommendServiceImpl.java

@@ -0,0 +1,27 @@
+package com.cdf.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cdf.entity.SceneRecommend;
+import com.cdf.mapper.ISceneRecommendMapper;
+import com.cdf.service.ISceneRecommendService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-15
+ */
+@Service
+public class SceneRecommendServiceImpl extends ServiceImpl<ISceneRecommendMapper, SceneRecommend> implements ISceneRecommendService {
+
+    @Override
+    public SceneRecommend getBySceneNum(String sceneNum) {
+        LambdaQueryWrapper<SceneRecommend> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneRecommend::getSceneNum,sceneNum);
+        return this.getOne(wrapper);
+    }
+}

src/main/java/com/cdf/util/DateUtil.java

@@ -102,4 +102,7 @@ public class DateUtil {
         }
     }
 
+    public static String getDateStr(Date date) {
+        return new SimpleDateFormat(TIME_FORMAT).format(date);
+    }
 }

src/main/java/com/cdf/util/ExcelUtil.java

@@ -1,5 +1,6 @@
 package com.cdf.util;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -8,54 +9,113 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+@Slf4j
 public class ExcelUtil {
 
-
-    public static List<HashMap<Integer,String>> getExcelRowList(MultipartFile multipartFile) throws IOException {
+    public static List<HashMap<Integer,String>> getExcelRowList(File multipartFile)  {
         //行List,也是最终要返回的List
-        List<HashMap<Integer,String>> rowList=new ArrayList<>();
         Workbook workbook=getExcelWorkBook(multipartFile);
-        Sheet sheet = workbook.getSheetAt(0);
-        if (sheet == null) {
-            throw new IOException("创建Sheet失败！");
-        }
-        //开始遍历行
-        for (int i=1;i<= sheet.getLastRowNum();i++){
-            Row row = sheet.getRow(i);
-            //列List
-            HashMap<Integer,String> map = new HashMap<>();
-            //转换为List数组
-            for (int cellNum=0;cellNum<= row.getLastCellNum();cellNum++){
-                Cell cell = row.getCell(cellNum);
-                if(cell != null){
-                    map.put(cellNum,cell.toString());
+        return getExcelRowList(workbook);
+    }
+
+
+    public static List<HashMap<Integer,String>> getExcelRowList(Workbook workbook)  {
+        //行List,也是最终要返回的List
+        List<HashMap<Integer,String>> rowList = new ArrayList<>();
+        try {
+            Sheet sheet = workbook.getSheetAt(0);
+            if (sheet == null) {
+                throw new IOException("创建Sheet失败！");
+            }
+            //开始遍历行
+            for (int i=1;i<= sheet.getLastRowNum();i++){
+                Row row = sheet.getRow(i);
+                //列List
+                HashMap<Integer,String> map = new HashMap<>();
+                //转换为List数组
+                for (int cellNum=0;cellNum<= row.getLastCellNum();cellNum++){
+                    Cell cell = row.getCell(cellNum);
+                    if(cell != null){
+                        map.put(cellNum,fommartNum(cell.toString().trim()));
+                    }
                 }
+                rowList.add(map);
+            }
+
+        }catch (Exception e){
+            log.info("excel-to-list-error:",e);
+        }finally {
+            try {
+                workbook.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
-            rowList.add(map);
         }
-        workbook.close();
+
         return rowList;
     }
+    public static List<HashMap<Integer,String>> getExcelRowList(MultipartFile multipartFile)  {
+        //行List,也是最终要返回的List
+        Workbook workbook=getExcelWorkBook(multipartFile);
+        return getExcelRowList(workbook);
+    }
+
+
 
 
     //获取WorkBook对象
-    private static Workbook getExcelWorkBook(MultipartFile multipartFile) throws IOException {
-        InputStream inputStream=multipartFile.getInputStream();
-        String originalFileName=multipartFile.getOriginalFilename();
-        assert originalFileName != null;
-        String fileType=originalFileName.substring(originalFileName.lastIndexOf(".")+1);
-        if (fileType.equalsIgnoreCase("xls")) {
-            //xls格式
-            return new HSSFWorkbook(inputStream);
-        } else {
-            //xlsx格式
-            return new XSSFWorkbook(inputStream);
+    private static Workbook getExcelWorkBook(MultipartFile multipartFile){
+        try {
+            InputStream inputStream=multipartFile.getInputStream();
+            String originalFileName=multipartFile.getOriginalFilename();
+            assert originalFileName != null;
+            String fileType=originalFileName.substring(originalFileName.lastIndexOf(".")+1);
+            if (fileType.equalsIgnoreCase("xls")) {
+                //xls格式
+                return new HSSFWorkbook(inputStream);
+            } else {
+                //xlsx格式
+                return new XSSFWorkbook(inputStream);
+            }
+        }catch (Exception e){
+            log.info("excel-to-list-error:",e);
+        }
+        return null;
+
+    }
+    private static Workbook getExcelWorkBook(File file)  {
+        try {
+            FileInputStream fileInputStream = new FileInputStream(file);
+            String fileName = file.getName();
+            String fileType=fileName.substring(fileName.lastIndexOf(".")+1);
+            if (fileType.equalsIgnoreCase("xls")) {
+                //xls格式
+                return new HSSFWorkbook(fileInputStream);
+            } else {
+                //xlsx格式
+                return new XSSFWorkbook(fileInputStream);
+            }
+
+        }catch (Exception e){
+            log.info("excel-to-list-error:",e);
+        }
+        return null;
+    }
+
+    private static  String fommartNum(String value){
+        try {
+            return Double.valueOf(value).intValue() +"";
+        }catch (Exception e){
+            return value;
         }
     }
+
 }

src/main/java/com/cdf/util/UploadToCdfOssUtil.java

@@ -1041,7 +1041,7 @@ public class UploadToCdfOssUtil {
 			.withRegion(Regions.AP_SOUTHEAST_1)
 			.build();
 		try {
-			GetObjectRequest request  = new GetObjectRequest(this.bucket,objectName);
+			GetObjectRequest request  = new GetObjectRequest(this.s3bucket,objectName);
 			s3.getObject(request,new File(localPath));
 			return true;
 		} catch (Exception e) {

src/main/resources/application-eurpord.yaml

@@ -32,6 +32,9 @@ spring:
       shutdown-timeout: 0ms
 logging:
   config: classpath:logback-spring.xml
+  file:
+    path: /home/prod/cdf/logs
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志

src/main/resources/application-local.yaml

@@ -10,7 +10,7 @@ spring:
     name: druidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
-      url: jdbc:mysql://18.156.200.112:3306/cdf_gm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
+      url: jdbc:mysql://18.156.200.112:3306/cdf_gm_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
       username: root
       password: 4Dage@zhongmian#@168
   redis:
@@ -38,27 +38,27 @@ mybatis-plus:
 
 
 fdkk:
-  login-path: http://test.4dkankan.com
-  scene-path: http://test.4dkankan.com
+  login-path: http://testeur.4dkankan.com
+  scene-path: http://testeur.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-local-path: /home/cdf/fdkk/%s
-  qr-code-url: http://test.4dkankan.com/index.html?m=
+  qr-code-url: https://zhongmian.4dage.com/index.html?m=
   aws:
     s3key: AKIAWCV5QFZ3ZNELKYUY
     s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
+    s3bucket: test-4dkankan
 
 cdf:
   aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
+    s3key: AKIAUI25IY4RAEMUZCOQ
+    s3secrey: CeL0IMH+I0qMxLXBRRs3cbRh9DeVOeTMy8wa60o7
+    s3bucket: 4dage-moderate2
 
 upload:
-  type: oss
+  type: aws
   file-path: cdf/file/
-  query-path: https://4dkk.4dage.com/
+  query-path: https://glp-vr.cdfmembers.com/
 
 oss:
   point: http://oss-cn-shenzhen.aliyuncs.com

src/main/resources/application-test.yaml

@@ -33,6 +33,9 @@ spring:
       shutdown-timeout: 0ms
 logging:
   config: classpath:logback-spring.xml
+  file:
+    path: /home/test/cdf/logs
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志

src/main/resources/application.yaml

@@ -27,4 +27,8 @@ forest:
   ## 请求超时时间，单位为毫秒, 默认值为3000
   timeout: 300000
   ## 连接超时时间，单位为毫秒, 默认值为2000
-  connect-timeout: 300000
+  connect-timeout: 300000
+
+local:
+  file:
+    path: /home/%s/cdf/file/

src/main/resources/logback-spring.xml

@@ -4,10 +4,11 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
+	<springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/prod/logs/cdf" />
+	<property name="log.path" value="${LOG_PATH}" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

src/main/resources/mapper/BrandMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cdf.mapper.IBrandMapper">
+
+</mapper>

src/main/resources/mapper/HotOutlineMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cdf.mapper.IHotOutlineMapper">
+
+</mapper>

src/main/resources/mapper/HotRecommendMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cdf.mapper.IHotRecommendMapper">
+
+</mapper>

src/main/resources/mapper/SceneRecommendMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cdf.mapper.ISceneRecommendMapper">
+
+</mapper>