提交

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

     //=================  首屏广告 / 轮播图 start =======================
 
     /**
-     * 首页轮播图类型_活动
+     * 首页 轮播图/广告 类型 ====  活动
      */
     public static final String CAROUSEL_ACTIVITY = "activity";
 
     /**
-     * 首页 轮播图/广告 类型_项目
+     * 首页 轮播图/广告 类型 ==== 项目
      */
     public static final String CAROUSEL_PROJECT = "project";
 
     /**
-     * 首页轮播图类型_资讯
+     * 首页轮播图/广告 类型 ==== 资讯
      */
     public static final String CAROUSEL_NEWS = "news";
 

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

 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.service.IExtendContentService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaBuildingService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 辅助内容表  前端控制器
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    private ITaBuildingDynamicService iTaBuildingDynamicService;
+
 
     /**
      * 分页查询列表
      */
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
     public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "buildingId", required = false) String buildingId,
+                                          @RequestParam(value = "showType", required = false) String showType){
         ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
-            IPage<ExtendContent> result = iExtendContentService.page(pg);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
+            queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
+            queryWrapper.orderByDesc("create_date");
+            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
             return responseBean;
     }
      */
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        extendContent.setCreateDate(LocalDateTime.now());
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
           return responseBean;
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
                                         @RequestBody ExtendContent extendContent){
         ResponseBean responseBean = new ResponseBean();
+        extendContent.setContentId(id);
         try {
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
     public ResponseBean extendContentGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iExtendContentService.getById(id));
+            ExtendContent extendContent = iExtendContentService.getById(id);
+            TaBuildingDynamic taBuildingDynamic = iTaBuildingDynamicService.getById(extendContent.getTargetId());
+            extendContent.setTargetName(taBuildingDynamic.getTitle());
+            responseBean.addSuccess(extendContent);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("extendContentDelete -=- {}",e.toString());

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
      */
     private String targetId;
 
+    @TableField(exist = false)
+    private String targetName;
+
     /**
      * 图片
      */