信息中心优化

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -1,10 +1,9 @@
 package com.caimei.www.controller.unlimited;
 
-import com.alibaba.fastjson.JSON;
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.*;
+import com.caimei.www.pojo.vo.CmBrandLandingVO;
 import com.caimei.www.service.page.ArticleService;
 import com.caimei.www.service.page.CmBrandLandingService;
 import com.caimei.www.service.page.ProductService;
@@ -61,8 +60,8 @@ public class ArticleController extends BaseController {
     @GetMapping("/info/center-{id}-{pageNum}.html")
     public String toArticleList(@PathVariable("id") Integer id, @PathVariable("pageNum") Integer pageNum, final Model model) {
         List<BaseLink> typeList = articleService.getArticleTypes();
-        List<CmBrandLandingVO> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(new CmBrandLanding()
-                .setType("4").setAuthorId(id.toString()));
+        List<CmBrandLanding> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(new CmBrandLanding()
+                .setType("5"));
         List<Article> infoSelected = articleService.getArticleSelected(0, 5);
         List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers(null);
@@ -71,7 +70,7 @@ public class ArticleController extends BaseController {
         model.addAttribute("ads", Ads);
         model.addAttribute("labels", data);
         model.addAttribute("articleType", typeList);//导航栏
-        model.addAttribute("articleImages", cmBrandLandingList);//导航栏图片
+        model.addAttribute("articleImages", CmBrandLandingVO.setValues(cmBrandLandingList));//导航栏图片
         model.addAttribute("infoSelected", infoSelected);//精选文章
         model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
         model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
@@ -154,7 +153,7 @@ public class ArticleController extends BaseController {
     public String toArticleSearch(@PathVariable("pageNum") Integer pageNum, final Model model) {
         List<BaseLink> typeList = articleService.getArticleTypes();
         List<BaseLink> data = articleService.getArticleLabels().getData();
-        List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
+        List<ImageLink> Ads = articleService.getLastestInfoAds().getData()  ;
         List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers(null);
         model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品

src/main/java/com/caimei/www/mapper/CmBrandLandingMapper.java

@@ -2,11 +2,9 @@ package com.caimei.www.mapper;
 
 import java.util.List;
 
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.CmBrandLanding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 
 
 /**
@@ -24,7 +22,7 @@ public interface CmBrandLandingMapper
      * @param cmBrandLanding 供应商落地页资源
      * @return 供应商落地页资源集合
      */
-    public List<CmBrandLandingVO> getCmBrandLandingList(CmBrandLanding cmBrandLanding);
+    public List<CmBrandLanding> getCmBrandLandingList(CmBrandLanding cmBrandLanding);
 
     /**
      * 通过Id查询供应商落地页资源对象

src/main/java/com/caimei/www/pojo/link/CmBrandLandingVO.java

@@ -1,74 +0,0 @@
-package com.caimei.www.pojo.link;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.apache.ibatis.type.Alias;
-
-import java.io.Serializable;
-
-/**
- * 供应商落地页资源对象 cm_brand_landing VO对象
- *
- * @author Kaick
- * @date 2023-08-08
- */
-@Accessors(chain  = true )
-@Data
-@Alias("CmBrandLandingVO")
-public class CmBrandLandingVO implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    private String id;
-
-    /** 分类：1成功案例，2增长社区-视频列表，3增长社区-文章列表， 4信息中心导航栏(info_type) */
-    private String type;
-
-    /** 供应商id */
-    private Integer authUserId;
-
-    /** 子级分类： 信息中心导航栏(info_type)：{1 大图，2小图} */
-    private String levelType;
-
-    /** 归属者Id（type字段表Id） */
-    private String authorId;
-
-    /** pc端picture */
-    private String headPcBanner;
-
-    /** 移动端picture */
-    private String headAppBanner;
-
-    /** picture跳转方式状态：0无，1图片，2链接 */
-    private Integer jumpStatus;
-
-    /** pc端picture跳转图片 */
-    private String jumpPcPicture;
-
-    /** 移动端picture跳转图片 */
-    private String jumpAppPicture;
-
-    /** picture跳转链接 */
-    private String jumpLink;
-
-    /** 标题
-     */
-    private String title;
-
-    /** 内容
-     */
-    private String content;
-
-    /** 视频文件 cm_brand_files表id */
-    private String video;
-
-    /** 排序 */
-    private Integer sort;
-
-    /** pc端status 1启用，0停用 */
-    private Integer pcStatus;
-
-    /** 移动端status 1启用，0停用 */
-    private Integer appStatus;
-}

src/main/java/com/caimei/www/pojo/page/CmBrandLanding.java

@@ -57,6 +57,9 @@ public class CmBrandLanding implements Serializable
     /** picture跳转链接 */
     private String jumpLink;
 
+    /** picture跳转链接 */
+    private String jumpAppLink;
+
     /** 标题
  */
     private String title;

src/main/java/com/caimei/www/pojo/vo/CmBrandLandingVO.java

@@ -0,0 +1,124 @@
+package com.caimei.www.pojo.vo;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+import com.caimei.www.pojo.page.CmBrandLanding;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.type.Alias;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.util.CollectionUtils;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 供应商落地页资源对象 cm_brand_landing
+ *
+ * @author Kaick
+ * @date 2023-05-31
+ */
+@Accessors(chain  = true )
+@Data
+@Alias("CmBrandLandingVO")
+public class CmBrandLandingVO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String id;
+
+    /** 分类：1成功案例，2增长社区-视频列表，3增长社区-文章列表， 4信息中心导航栏(info_type)（已弃用） ， 5信息中心首页轮播图 */
+    private String type;
+
+    /** 供应商id */
+    private Integer authUserId;
+
+    /** 归属者Id（type字段表Id） */
+    private String authorId;
+
+    /** pc端picture */
+    private String headPcBanner;
+
+    /** 移动端picture */
+    private String headAppBanner;
+
+    /** picture跳转方式状态：0无，1图片，2链接 */
+    private Integer jumpStatus;
+
+    /** pc端picture跳转图片 */
+    private String jumpPcPicture;
+
+    /** 移动端picture跳转图片 */
+    private String jumpAppPicture;
+
+    /** picture跳转链接 */
+    private String jumpLink;
+
+    /** 标题
+     */
+    private String title;
+
+    /** 内容
+     */
+    private String content;
+
+    /** 视频文件 cm_brand_files表id */
+    private String video;
+
+    /** 排序 */
+    private Integer sort;
+
+    /** pc端status 1启用，0停用 */
+    private Integer pcStatus;
+
+    /** 移动端status 1启用，0停用 */
+    private Integer appStatus;
+
+    /** 子级分类： （type=4）{1 大图，2小图}（已弃用），（type=5）{1 大图，2小图，2小图}  */
+    private String levelType;
+
+    /** 添加时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date addTime;
+
+
+    public static List<CmBrandLandingVO> setValues(List<CmBrandLanding> cmBrandLandingList) {
+        List<CmBrandLandingVO> cmBrandLandingVOList = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(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());
+        }
+        return cmBrandLandingVO;
+    }
+
+}

src/main/java/com/caimei/www/service/page/CmBrandLandingService.java

@@ -1,6 +1,5 @@
 package com.caimei.www.service.page;
 
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.CmBrandLanding;
 
 import java.util.List;
@@ -19,93 +18,6 @@ public interface CmBrandLandingService
      * @param cmBrandLanding 供应商落地页资源
      * @return 供应商落地页资源集合
      */
-    public List<CmBrandLandingVO> getCmBrandLandingList(CmBrandLanding cmBrandLanding);
+    public List<CmBrandLanding> getCmBrandLandingList(CmBrandLanding cmBrandLanding);
 
-    /**
-     * 通过Id查询供应商落地页资源
-     *
-     * @param id 供应商落地页资源主键
-     * @return 供应商落地页资源
-     */
-    public CmBrandLanding getCmBrandLandingById(String id);
-
-    /**
-     * 通过对象查询供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 供应商落地页资源
-     */
-    public CmBrandLanding getByCmBrandLanding(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 通过对象查询供应商落地页资源Id
-     *
-     * @param cmBrandLanding 供应商落地页资源主键
-     * @return String
-     */
-    public String getById(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 通过对象查询供应商落地页资源Ids
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return List<String>
-     */
-    public List<String> getByIds(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 通过对象查询供应商落地页资源记录总数
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 供应商落地页资源Integer
-     */
-    public int getCmBrandLandingCount(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 新增供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 结果
-     */
-    public int addCmBrandLanding(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 修改供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 结果
-     */
-    public int updateCmBrandLanding(CmBrandLanding cmBrandLanding);
-
-    /**
-     * 删除供应商落地页资源信息
-     *
-     * @param id 供应商落地页资源主键
-     * @return 结果
-     */
-    public int delCmBrandLandingById(String id);
-
-    /**
-     * 批量删除供应商落地页资源
-     *
-     * @param ids 需要删除的供应商落地页资源主键集合
-     * @return 结果
-     */
-    public int delCmBrandLandingByIds(String[] ids);
-
-    /**
-     * 批量新增供应商落地页资源
-     *
-     * @param cmBrandLandingList 供应商落地页资源列表
-     * @return 结果
-     */
-    public void batchAddCmBrandLanding(List<CmBrandLanding> cmBrandLandingList);
-
-    /**
-     * 批量修改供应商落地页资源
-     *
-     * @param cmBrandLandingList 供应商落地页资源列表
-     * @return 结果
-     */
-    public void batchUpdateCmBrandLanding(List<CmBrandLanding> cmBrandLandingList);
 }

src/main/java/com/caimei/www/service/page/impl/CmBrandLandingServiceImpl.java

@@ -3,13 +3,11 @@ package com.caimei.www.service.page.impl;
 import java.util.Date;
 import java.util.List;
 
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.CmBrandLanding;
 import com.caimei.www.service.page.CmBrandLandingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.caimei.www.mapper.CmBrandLandingMapper;
-import com.caimei.www.pojo.link.CmBrandLandingVO;
 
 /**
  * 供应商落地页资源Service业务层处理
@@ -30,152 +28,9 @@ public class CmBrandLandingServiceImpl implements CmBrandLandingService
      * @return 供应商落地页资源
      */
     @Override
-    public List<CmBrandLandingVO> getCmBrandLandingList(CmBrandLanding cmBrandLanding)
+    public List<CmBrandLanding> getCmBrandLandingList(CmBrandLanding cmBrandLanding)
     {
         return cmBrandLandingMapper.getCmBrandLandingList(cmBrandLanding);
     }
 
-    /**
-     * 通过Id查询供应商落地页资源
-     *
-     * @param id 供应商落地页资源主键
-     * @return 供应商落地页资源
-     */
-    @Override
-    public CmBrandLanding getCmBrandLandingById(String id)
-    {
-        return cmBrandLandingMapper.getCmBrandLandingById(id);
-    }
-
-    /**
-     * 通过对象查询供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 供应商落地页资源
-     */
-    @Override
-    public CmBrandLanding getByCmBrandLanding(CmBrandLanding cmBrandLanding)
-    {
-        return cmBrandLandingMapper.getByCmBrandLanding(cmBrandLanding);
-    }
-
-    /**
-     * 通过对象查询供应商落地页资源Id
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return String
-     */
-    @Override
-    public String getById(CmBrandLanding cmBrandLanding)
-    {
-        return cmBrandLandingMapper.getById(cmBrandLanding);
-    }
-
-    /**
-     * 通过对象查询供应商落地页资源Ids
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return List<String>
-     */
-    @Override
-    public List<String> getByIds(CmBrandLanding cmBrandLanding)
-    {
-        return cmBrandLandingMapper.getByIds(cmBrandLanding);
-    }
-
-    /**
-     * 通过对象查询供应商落地页资源记录总数
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return int
-     */
-    @Override
-    public int getCmBrandLandingCount(CmBrandLanding cmBrandLanding)
-    {
-        return cmBrandLandingMapper.getCmBrandLandingCount(cmBrandLanding);
-    }
-
-    /**
-     * 新增供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 结果
-     */
-    @Override
-    public int addCmBrandLanding(CmBrandLanding cmBrandLanding)
-    {
-        cmBrandLanding.setAddTime(new Date());
-        return cmBrandLandingMapper.addCmBrandLanding(cmBrandLanding);
-    }
-
-    /**
-     * 修改供应商落地页资源
-     *
-     * @param cmBrandLanding 供应商落地页资源
-     * @return 结果
-     */
-    @Override
-    public int updateCmBrandLanding(CmBrandLanding cmBrandLanding)
-    {
-        cmBrandLanding.setUpdateTime(new Date());
-        return cmBrandLandingMapper.updateCmBrandLanding(cmBrandLanding);
-    }
-
-
-
-    /**
-     * 删除供应商落地页资源信息
-     *
-     * @param id 供应商落地页资源主键
-     * @return 结果
-     */
-    @Override
-    public int delCmBrandLandingById(String id)
-    {
-        return cmBrandLandingMapper.updateCmBrandLanding(new CmBrandLanding().setId(id).setDelFlag(1));
-        //return cmBrandLandingMapper.delCmBrandLandingById(id);
-    }
-
-    /**
-     * 批量删除供应商落地页资源
-     *
-     * @param ids 需要删除的供应商落地页资源主键
-     * @return 结果
-     */
-            @Override
-    public int delCmBrandLandingByIds(String[] ids)
-    {
-        return cmBrandLandingMapper.updateDelCmBrandLandingByIds(ids,1);
-        //return cmBrandLandingMapper.delCmBrandLandingByIds(ids);
-    }
-
-    /**
-     * 批量新增供应商落地页资源
-     *
-     * @param cmBrandLandingList 供应商落地页资源列表
-     * @return 结果
-     */
-    @Override
-    public void batchAddCmBrandLanding(List<CmBrandLanding> cmBrandLandingList)
-    {
-        for (CmBrandLanding cmBrandLanding : cmBrandLandingList)
-        {
-                cmBrandLandingMapper.addCmBrandLanding(cmBrandLanding);
-        }
-    }
-
-    /**
-     * 批量修改供应商落地页资源
-     *
-     * @param cmBrandLandingList 供应商落地页资源列表
-     * @return 结果
-     */
-    @Override
-    public void batchUpdateCmBrandLanding(List<CmBrandLanding> cmBrandLandingList)
-    {
-        for (CmBrandLanding cmBrandLanding : cmBrandLandingList)
-        {
-               cmBrandLandingMapper.updateCmBrandLanding(cmBrandLanding);
-        }
-    }
 }

src/main/resources/mapper/CmBrandLandingMapper.xml

@@ -15,6 +15,7 @@
 		<result property="jumpPcPicture"    column="jumpPcPicture"    />
 		<result property="jumpAppPicture"    column="jumpAppPicture"    />
 		<result property="jumpLink"    column="jumpLink"    />
+		<result property="jumpAppLink"    column="jumpAppLink"    />
 		<result property="title"    column="title"    />
 		<result property="content"    column="content"    />
 		<result property="video"    column="video"    />
@@ -39,6 +40,7 @@
 			cm_brand_landing.jumpPcPicture,
 			cm_brand_landing.jumpAppPicture,
 			cm_brand_landing.jumpLink,
+			cm_brand_landing.jumpAppLink,
 			cm_brand_landing.title,
 			cm_brand_landing.content,
 			cm_brand_landing.video,
@@ -117,7 +119,7 @@
 		limit 0,1
 	</select>
 
-	<select id="getCmBrandLandingList" parameterType="com.caimei.www.pojo.link.CmBrandLandingVO" resultMap="CmBrandLandingResult">
+	<select id="getCmBrandLandingList" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultMap="CmBrandLandingResult">
 		<include refid="selectCmBrandLandingVo"/>
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -179,7 +181,7 @@
 			<if test="addTime != null "> and cm_brand_landing.addTime = #{addTime}</if>
 		</where>
 		group by cm_brand_landing.id
-		order by cm_brand_landing.addTime desc
+		order by cm_brand_landing.sort desc,cm_brand_landing.addTime desc
 	</select>
 
 	<select id="getCmBrandLandingCount" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultType="String">
@@ -243,7 +245,6 @@
 			<if test="updateTime != null "> and cm_brand_landing.updateTime = #{updateTime}</if>
 			<if test="addTime != null "> and cm_brand_landing.addTime = #{addTime}</if>
 		</where>
-		group by cm_brand_landing.id
 	</select>
 
 	<select id="getCmBrandLandingById" parameterType="String" resultMap="CmBrandLandingResult">