首屏 / 广告

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -109,29 +109,43 @@ public class CommConstant {
      */
     public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
 
+    //=================  首屏广告 / 轮播图 start =======================
+
     /**
      * 首页轮播图类型_活动
      */
     public static final String CAROUSEL_ACTIVITY = "activity";
 
     /**
-     * 首页轮播图类型_项目
+     * 首页 轮播图/广告 类型_项目
      */
     public static final String CAROUSEL_PROJECT = "project";
 
     /**
      * 首页轮播图类型_资讯
      */
-    public static final String CAROUSEL_INFORMATION = "information";
+    public static final String CAROUSEL_NEWS = "news";
 
     /**
-     * 开屏
+     * 打开放式_开屏
      */
     public static final String OPEN_SCREEN = "screen";
 
     /**
-     * 首页轮播图
+     * 打开放式_首页轮播图
      */
     public static final String CAROUSEL = "banner";
 
+    /**
+     * 首屏广告_发布位置——商城
+     */
+    public static final String MALL = "mall";
+
+    /**
+     * 首屏广告_发布位置——首页
+     */
+    public static final String BANNER_INDEX = "index";
+
+    //=================  首屏广告 / 轮播图 end =======================
+
 }

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -53,21 +53,16 @@ public class ExtendContentController extends BaseController {
     }
 
     /**
-     * 根据状态查当前的轮播图
-     * @return
-     */
-    @RequestMapping(value="/wx/selectExtendContent",method= RequestMethod.GET)
-    public ResponseBean extendContentList(@RequestBody ExtendContent extendContent ){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentList(extendContent);
-        return responseBean;
-    }
-
-    /**
-     * 根据状态查当前的开屏
+     * 微信 开屏 / 轮播图
      */
-    @RequestMapping(value="/wx/selectExtendContentShowType",method= RequestMethod.GET)
-    public ResponseBean extendContentListShowType(@RequestBody ExtendContent extendContent ){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(extendContent);
+    @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
+    public ResponseBean extendContentListShowType(@PathVariable(value = "showType", required = false) String showType,
+                                                  @RequestParam(value = "showPosition", required = false) String showPosition,
+                                                  @RequestParam(value = "targetId", required = false) String targetId,
+                                                  @RequestParam(value = "contentType", required = false) String contentType,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "contentId", required = false) String contentId){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/service/IExtendContentService.java

@@ -23,15 +23,18 @@ public interface IExtendContentService extends IService<ExtendContent> {
 
     /**
      * 根据状态查当前的轮播图
-     * @param extendContent
+     * @param contentType
+     * @param buildingId
      * @return
      */
-    ResponseBean selectExtendContentList(ExtendContent extendContent);
+    @Deprecated
+    ResponseBean selectExtendContentList(String contentType, String buildingId);
 
     /**
      * 开屏
-     * @param extendContent
+     * @param contentType
+     * @param buildingId
      * @return
      */
-    ResponseBean selectExtendContentListShowType(ExtendContent extendContent);
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId);
 }

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.mapper.ExtendContentMapper;
 import com.huiju.estateagents.service.IExtendContentService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,7 +34,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         }else if("2".equals(extendContent.getContentType())){
             extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
         }else if ("3".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_INFORMATION);
+            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
         }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
@@ -41,13 +42,16 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentList(ExtendContent extendContent) {
+    @Deprecated
+    public ResponseBean selectExtendContentList(String contentType, String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         // 查询轮播图
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
+        // banner 或 screen(首屏广告) ,这里是 banner
         extendContentQuery.eq("show_position",CommConstant.CAROUSEL);
-        extendContentQuery.eq("content_type",extendContent.getContentType());
-        extendContentQuery.eq("building_id",extendContent.getBuildingId());
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq("content_type",contentType);
+        extendContentQuery.eq("building_id",buildingId);
         extendContentQuery.eq("status","1");
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);
@@ -55,13 +59,18 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentListShowType(ExtendContent extendContent) {
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
-        extendContentQuery.eq("show_type",CommConstant.OPEN_SCREEN);
-        extendContentQuery.eq("content_type",extendContent.getContentType());
-        extendContentQuery.eq("building_id",extendContent.getBuildingId());
+        // banner 或 screen(首屏广告) ,这里是 screen
+        extendContentQuery.eq("show_type",showType);
+        extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
+        extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
+        extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
+        extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
         extendContentQuery.eq("status","1");
         ExtendContent taExtendContent = extendContentMapper.selectOne(extendContentQuery);
         responseBean.addSuccess(taExtendContent);