Merge branch 'test'

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

@@ -70,7 +70,7 @@ public class SceneBackController {
     @PostMapping("/move")
     @SysLog(logType = "場景管理",value = "移動")
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
-        if(param.getParentId().equals(param.getId())){
+        if(param.getParentId() != null && param.getParentId().equals(param.getId())){
             throw new BusinessException(ResultCode.MOVE_FOLDER_ERROR);
         }
         fdkkSceneService.move(param,token);

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

@@ -14,6 +14,6 @@ public class FdkkHotData {
     private List<String> relationIds;
     private String hotContent;
 
-    private Integer productSourceId;
+    private Integer productSourceId =1;
     private String brandId;
 }

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

@@ -13,5 +13,7 @@ public class BrandApiVo {
     private Integer outlineId;
     private String outlineName;
     private String outlineImage;
+    private String createTime;
+    private String updateTime;
 
 }

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

@@ -74,6 +74,20 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
                 continue;
             }
             Brand brand = brandHashMap.get(cdfBrand.getBrand_id());
+            if(brand != null && StringUtils.isNotBlank(brand.getZhName()) && StringUtils.isNotBlank(brand.getFtName())
+                    && StringUtils.isNotBlank(brand.getEnName()) && StringUtils.isNotBlank(brand.getBrandLogo()) &&
+
+                    StringUtils.isNotBlank(cdfBrand.getBrand_tc_name()) && StringUtils.isNotBlank(cdfBrand.getBrand_en_name())
+                    && StringUtils.isNotBlank(cdfBrand.getBrand_name()) && StringUtils.isNotBlank(cdfBrand.getLogo()) &&
+
+                    brand.getZhName().equals(cdfBrand.getBrand_name())
+                    && brand.getFtName().equals(cdfBrand.getBrand_tc_name())
+                    && brand.getEnName().equals(cdfBrand.getBrand_en_name())
+                    && brand.getBrandLogo().equals(cdfBrand.getLogo())){
+
+                continue;
+            }
+
             if(brand == null){
                 brand = new Brand();
                 brand.setCdfBrandId(cdfBrand.getBrand_id());
@@ -82,6 +96,7 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
             brand.setFtName(cdfBrand.getBrand_tc_name());
             brand.setEnName(cdfBrand.getBrand_en_name());
             brand.setBrandLogo(cdfBrand.getLogo());
+            brand.setUpdateTime(null);
             saveList.add(brand);
         }
         this.saveOrUpdateBatch(saveList);
@@ -111,7 +126,7 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
                     .or()
                     .like(Brand::getEnName,param.getKeyword());
         }
-        wrapper.orderByDesc(Brand::getCreateTime);
+        wrapper.orderByDesc(Brand::getCdfBrandId);
         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);
@@ -201,4 +216,6 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
         wrapper.eq(Brand::getOutlineId,outlineId);
         return this.list(wrapper);
     }
+
+
 }

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

@@ -8,6 +8,7 @@ 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cdf.common.CacheUtil;
 import com.cdf.common.ResultCode;
 import com.cdf.entity.*;
@@ -490,7 +491,9 @@ public class ExcelService {
     }
 
     public void downBrandExcel(HttpServletRequest request,HttpServletResponse response) throws Exception {
-        List<Brand> list = brandService.list();
+        LambdaQueryWrapper<Brand> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(Brand::getCdfBrandId);
+        List<Brand> list = brandService.list(wrapper);
         List<BrandExcelVo> voList = new ArrayList<>();
         for (Brand brand : list) {
             BrandExcelVo vo = new BrandExcelVo();