轮播图，开屏

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

@@ -107,8 +107,31 @@ public class CommConstant {
     /**
      * 活动的当前状态3:结束
      */
-    public static final Integer ACTIVITY_CONDITION_ONE_THREE= 3;
+    public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
 
+    /**
+     * 首页轮播图类型_活动
+     */
+    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 OPEN_SCREEN = "screen";
+
+    /**
+     * 首页轮播图
+     */
+    public static final String CAROUSEL = "banner";
 
 }

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

@@ -46,22 +46,32 @@ public class ExtendContentController extends BaseController {
     public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
+            IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
+            IPage<ExtendContent> result = iExtendContentService.page(pg);
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("extendContentList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+            return responseBean;
+    }
+
+    /**
+     * 根据状态查当前的轮播图
+     * @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);
         return responseBean;
     }
 
+
     /**
      * 保存对象
      * @param extendContent 实体对象
@@ -69,19 +79,9 @@ public class ExtendContentController extends BaseController {
      */
     @RequestMapping(value="/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iExtendContentService.save(extendContent)){
-                responseBean.addSuccess(extendContent);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("extendContentAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
+        ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
+          responseBean.addSuccess(extendContent);
+          return responseBean;
     }
 
     /**

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

@@ -91,7 +91,7 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     /**
-     * 添加活动
+     * 添加活动报名
      * @param taActivityDynamicEnlist
      * @param request
      * @return

src/main/java/com/huiju/estateagents/mapper/ExtendContentMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.ExtendContent;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 辅助内容表  Mapper 接口
@@ -14,5 +16,4 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ExtendContentMapper extends BaseMapper<ExtendContent> {
-
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.ExtendContent;
 
 /**
@@ -13,4 +14,24 @@ import com.huiju.estateagents.entity.ExtendContent;
  */
 public interface IExtendContentService extends IService<ExtendContent> {
 
+    /**
+     * 添加当前
+     * @param extendContent
+     * @return
+     */
+    ResponseBean extendContentAdd(ExtendContent extendContent);
+
+    /**
+     * 根据状态查当前的轮播图
+     * @param extendContent
+     * @return
+     */
+    ResponseBean selectExtendContentList(ExtendContent extendContent);
+
+    /**
+     * 开屏
+     * @param extendContent
+     * @return
+     */
+    ResponseBean selectExtendContentListShowType(ExtendContent extendContent);
 }

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

@@ -1,11 +1,17 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 辅助内容表  服务实现类
@@ -17,4 +23,48 @@ import org.springframework.stereotype.Service;
 @Service
 public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, ExtendContent> implements IExtendContentService {
 
+    @Autowired
+    private ExtendContentMapper extendContentMapper;
+    @Override
+    public ResponseBean extendContentAdd(ExtendContent extendContent) {
+        ResponseBean responseBean= new ResponseBean<>();
+        if ("1".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_ACTIVITY);
+        }else if("2".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
+        }else if ("3".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_INFORMATION);
+        }
+        extendContentMapper.insert(extendContent);
+        responseBean.addSuccess("成功");
+        return  responseBean;
+    }
+
+    @Override
+    public ResponseBean selectExtendContentList(ExtendContent extendContent) {
+        ResponseBean responseBean = new ResponseBean<>();
+        // 查询轮播图
+        QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
+        extendContentQuery.eq("show_position",CommConstant.CAROUSEL);
+        extendContentQuery.eq("content_type",extendContent.getContentType());
+        extendContentQuery.eq("building_id",extendContent.getBuildingId());
+        extendContentQuery.eq("status","1");
+        List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
+        responseBean.addSuccess(taExtendContent);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectExtendContentListShowType(ExtendContent extendContent) {
+        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());
+        extendContentQuery.eq("status","1");
+        ExtendContent taExtendContent = extendContentMapper.selectOne(extendContentQuery);
+        responseBean.addSuccess(taExtendContent);
+        return responseBean;
+    }
 }