bugfix

src/main/java/com/caimei365/user/controller/CmBrandLandingApi.java

@@ -11,6 +11,7 @@ import com.caimei365.user.model.dto.ShopUpdateDto;
 import com.caimei365.user.model.po.*;
 import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.*;
+import com.caimei365.user.utils.BeanUtil;
 import com.caimei365.user.utils.DateUtil;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -124,7 +125,7 @@ public class CmBrandLandingApi {
                         cmBrandFilesService.selectCmBrandFilesList(cmBrandFiles));
             });
         }
-        map.put("landing", CmBrandLandingVO.setValues(cmBrandLandings));
+        map.put("landing", BeanUtil.setValues(cmBrandLandings,CmBrandLandingVO.class));
         return ResponseJson.success(map);
     }
 

src/main/java/com/caimei365/user/controller/DistributionApi.java

@@ -10,6 +10,7 @@ import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.BaseService;
 import com.caimei365.user.service.CmDistributionService;
 import com.caimei365.user.service.SellerService;
+import com.caimei365.user.utils.BeanUtil;
 import com.caimei365.user.utils.RequestUtil;
 import com.caimei365.user.utils.ValidateUtil;
 import com.github.pagehelper.PageHelper;
@@ -53,7 +54,7 @@ public class DistributionApi {
         List<CmDistribution> cmDistributionList = cmDistributionService.getCmDistributionList(new CmDistribution()
                 .parentId(cmDistribution.parentId())
         );
-        return ResponseJson.success(CmDistributionVO.setValues(cmDistributionList));
+        return ResponseJson.success(BeanUtil.setValues(cmDistributionList,CmDistributionVO.class));
     }
 
 
@@ -65,10 +66,11 @@ public class DistributionApi {
         if (null == cmDistribution.userId()&&null == cmDistribution.id()) {
             return ResponseJson.error("参数异常：用户Id不能为空！", null);
         }
-        return ResponseJson.success(CmDistributionVO.setValue(cmDistributionService.getByCmDistribution(new CmDistribution()
+        CmDistributionVO cmDistributionVO = BeanUtil.setValue(cmDistributionService.getByCmDistribution(new CmDistribution()
                 .id(cmDistribution.id())
                 .userId(cmDistribution.userId())
-        )));
+        ), CmDistributionVO.class);
+        return ResponseJson.success(cmDistributionVO);
     }
 
     /**

src/main/java/com/caimei365/user/model/vo/CmBrandLandingVO.java

@@ -1,8 +1,10 @@
 package com.caimei365.user.model.vo;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Date;
 
+import com.alibaba.fastjson.JSON;
 import com.caimei365.user.model.po.CmBrandLanding;
 import com.caimei365.user.model.po.CmDistribution;
 import com.caimei365.user.model.vo.CmBrandFilesVO;
@@ -13,6 +15,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.type.Alias;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.BeanUtils;
+import org.springframework.cglib.beans.BeanCopier;
 
 import java.io.Serializable;
 import java.util.List;
@@ -23,7 +27,7 @@ import java.util.List;
  * @author Kaick
  * @date 2023-05-31
  */
-@Accessors(chain  = true )
+@Accessors(chain = true )
 @Data
 @Alias("CmBrandLandingVO")
 public class CmBrandLandingVO implements Serializable
@@ -77,53 +81,26 @@ public class CmBrandLandingVO implements Serializable
     /** pc端status 1启用，0停用 */
     private String pcStatus;
 
-    /** 移动端status 1启用，0停用 */
+    /**
+     * 移动端status 1启用，0停用
+     */
     private String appStatus;
 
-    /** 子级分类： （type=4）{1 大图，2小图}（已弃用），（type=5）{1 大图，2小图，2小图}  */
+    /**
+     * 子级分类： （type=4）{1 大图，2小图}（已弃用），（type=5）{1 大图，2小图，2小图}
+     */
     private String levelType;
 
-    /** 添加时间 */
+    /**
+     * 添加时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date addTime;
 
-    /** 文件资料 */
-    List<CmBrandFilesVO> cmBrandFiles;
-
-    public static List<CmBrandLandingVO> setValues(List<CmBrandLanding> cmBrandLandingList) {
-        List<CmBrandLandingVO> cmBrandLandingVOList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(cmBrandLandingList)) {
-            cmBrandLandingList.forEach(s -> {
-                cmBrandLandingVOList.add(setValue(s));
-            });
-        }
-        return cmBrandLandingVOList;
-    }
-
-    public static CmBrandLandingVO setValue(CmBrandLanding cmBrandLanding) {
-        CmBrandLandingVO cmBrandLandingVO = new CmBrandLandingVO();
-        if(null!=cmBrandLanding) {
-            cmBrandLandingVO.setId(cmBrandLanding.getId());
-            cmBrandLandingVO.setType(cmBrandLanding.getType());
-            cmBrandLandingVO.setAuthUserId(cmBrandLanding.getAuthUserId());
-            cmBrandLandingVO.setAuthorId(cmBrandLanding.getAuthorId());
-            cmBrandLandingVO.setHeadPcBanner(cmBrandLanding.getHeadPcBanner());
-            cmBrandLandingVO.setHeadAppBanner(cmBrandLanding.getHeadAppBanner());
-            cmBrandLandingVO.setJumpStatus(cmBrandLanding.getJumpStatus());
-            cmBrandLandingVO.setJumpPcPicture(cmBrandLanding.getJumpPcPicture());
-            cmBrandLandingVO.setJumpAppPicture(cmBrandLanding.getJumpAppPicture());
-            cmBrandLandingVO.setJumpLink(cmBrandLanding.getJumpLink());
-            cmBrandLandingVO.setTitle(cmBrandLanding.getTitle());
-            cmBrandLandingVO.setContent(cmBrandLanding.getContent());
-            cmBrandLandingVO.setVideo(cmBrandLanding.getVideo());
-            cmBrandLandingVO.setSort(cmBrandLanding.getSort());
-            cmBrandLandingVO.setPcStatus(cmBrandLanding.getPcStatus());
-            cmBrandLandingVO.setAppStatus(cmBrandLanding.getAppStatus());
-            cmBrandLandingVO.setLevelType(cmBrandLanding.getLevelType());
-            cmBrandLandingVO.setAddTime(cmBrandLanding.getAddTime());
-            cmBrandLandingVO.setCmBrandFiles(cmBrandLanding.getCmBrandFiles());
-        }
-        return cmBrandLandingVO;
-    }
+    /**
+     * 文件资料
+     */
+    private List<CmBrandFilesVO> BrandFiles;
+
 
 }

src/main/java/com/caimei365/user/model/vo/CmDistributionVO.java

@@ -84,33 +84,4 @@ public class CmDistributionVO implements Serializable {
      */
     private String parentIds;
 
-    public static List<CmDistributionVO> setValues(List<CmDistribution> cmDistributionList) {
-        List<CmDistributionVO> cmDistributionVOList = new ArrayList<>();
-        if(null!=cmDistributionList) {
-
-            cmDistributionList.forEach(cmDistribution -> {
-                cmDistributionVOList.add(setValue(cmDistribution));
-            });
-        }
-        return cmDistributionVOList;
-    }
-
-    public static CmDistributionVO setValue(CmDistribution cmDistribution) {
-            CmDistributionVO cmDistributionVO = new CmDistributionVO();
-            if(null!=cmDistribution) {
-
-                cmDistributionVO.setId(cmDistribution.getId());
-                cmDistributionVO.setUserId(cmDistribution.getUserId());
-                cmDistributionVO.setName(cmDistribution.getName());
-                cmDistributionVO.setLinkMan(cmDistribution.getLinkMan());
-                cmDistributionVO.setMobile(cmDistribution.getMobile());
-                cmDistributionVO.setSplitCode(cmDistribution.getSplitCode());
-                cmDistributionVO.setStatus(cmDistribution.getStatus());
-                cmDistributionVO.setQrCode(cmDistribution.getQrCode());
-                cmDistributionVO.setImage(cmDistribution.getImage());
-                cmDistributionVO.setParentId(cmDistribution.getParentId());
-                cmDistributionVO.setParentIds(cmDistribution.getParentIds());
-            }
-        return cmDistributionVO;
-    }
 }

src/main/java/com/caimei365/user/utils/BeanUtil.java

@@ -0,0 +1,33 @@
+package com.caimei365.user.utils;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ：Kaick
+ * @date ：Created in 2023/10/27
+ * @description：BeanUtil
+ */
+public class BeanUtil {
+
+    public static <T, S> T setValue(S source, Class<T> clazz) {
+        if (null == source) {
+            return null;
+        }
+        T target = BeanUtils.instantiate(clazz);
+        BeanUtils.copyProperties(source, target);
+        return target;
+    }
+
+    public static <T, S> List<T> setValues(List<S> sourceList, Class<T> target) {
+        if (CollectionUtils.isEmpty(sourceList)) {
+            return null;
+        }
+        List<T> targetList = new ArrayList<>(sourceList.size());
+        sourceList.forEach(s -> targetList.add(setValue(s, target)));
+        return targetList;
+    }
+}