Merge remote-tracking branch 'origin/developerD' into developer

src/main/java/com/caimei365/commodity/mapper/PageMapper.java

@@ -28,6 +28,13 @@ public interface PageMapper {
      */
     Integer getPageTypeSort(Integer pageId);
 
+    /**
+     * 查询页面内容标签
+     * @param pageId
+     * @return
+     */
+    String getPageLabel(Integer pageId);
+
     /**
      * 查询热搜词(单个页面)
      *

src/main/java/com/caimei365/commodity/model/vo/CmPageVo.java

@@ -80,6 +80,10 @@ public class CmPageVo implements Serializable {
      * 背景图方式：1平铺、2填充
      */
     private Integer backgroundImageWay;
+    /**
+     * 页面内容标签
+     */
+    private String contentLabel;
     /**
      * 填充背景类型默认不显示 ：1使用颜色，2使用背景图
      */

src/main/java/com/caimei365/commodity/model/vo/PageDetailVo.java

@@ -75,6 +75,10 @@ public class PageDetailVo implements Serializable {
     private String backgroundImage;
 
     private Integer backgroundImageWay;
+    /**
+     * 页面内容标签
+     */
+    private String contentLabel;
 
     private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -113,6 +113,7 @@ public class PageServiceImpl implements PageService {
         source = source == null ? 1 : source;
         Map<String, Object> map = new HashMap<>(3);
         Integer typeSort = pageMapper.getPageTypeSort(pageId);
+        String contentLabel = pageMapper.getPageLabel(pageId);
         List<HotSearchVo> hotSearchList = pageMapper.getHotSearchByPageId(pageId, source);
         List<PageFloorVo> floorList = pageMapper.getFloorByPageId(pageId, source);
         for (PageFloorVo floor : floorList) {
@@ -124,6 +125,8 @@ public class PageServiceImpl implements PageService {
             floor.setFloorImageList(floorImageList);
         }
         map.put("typeSort", typeSort);
+        log.info("仪器页面数据userId================================》"+userId+"====="+contentLabel);
+        map.put("contentLabel", contentLabel);
         map.put("hotSearchList", hotSearchList);
         map.put("floorList", floorList);
         return ResponseJson.success(map);

src/main/resources/mapper/PageMapper.xml

@@ -7,6 +7,12 @@
         where id = #{pageId}
           and enabledStatus = '1'
     </select>
+    <select id="getPageLabel" resultType="java.lang.String">
+        select contentLabel
+        from cm_page
+        where id = #{pageId}
+          and enabledStatus = '1'
+    </select>
     <select id="getHotSearchByPageId" resultType="com.caimei365.commodity.model.vo.HotSearchVo">
         select
         id, pageId, name, isHot, link, pcStatus, sort, appletsStatus, creationTime
@@ -314,6 +320,7 @@
                a.backgroundColour,
                a.backgroundImage,
                a.backgroundImageWay,
+               a.contentLabel,
                a.backgroundType
         from cm_page a
         where a.id = #{id}
@@ -380,6 +387,7 @@
                backgroundColour,
                backgroundImage,
                backgroundImageWay,
+               contentLabel,
                backgroundType
         from cm_page
         where id = #{pageId}