轮播图开屏广告

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

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TdCity;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -53,6 +56,9 @@ public class ExtendContentController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITdCityService iTdCityService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -72,22 +78,39 @@ public class ExtendContentController extends BaseController {
     @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 = "cityId", required = false) Integer cityId,
                                           @RequestParam(value = "buildingId", required = false) String buildingId,
                                           @RequestParam(value = "contentType", required = false) String contentType,
                                           @RequestParam(value = "showPosition", required = false) String showPosition,
                                           @RequestParam(value = "status", required = false) Integer status,
                                           @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
+            ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(cityId != null, "city_id", cityId);
             queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
             queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
             queryWrapper.eq(StringUtils.isNotBlank(contentType), "content_type", contentType);
             queryWrapper.eq(StringUtils.isNotBlank(showPosition), "show_position", showPosition);
-            queryWrapper.eq(null!=status, "status", status);
+            queryWrapper.ne("status",9);
+            queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
+
+            result.getRecords().forEach(e -> {
+                QueryWrapper<TdCity> tdCityQueryWrapper = new QueryWrapper<>();
+                tdCityQueryWrapper.eq("id", e.getCityId());
+                TdCity tdCity = iTdCityService.getOne(tdCityQueryWrapper);
+                QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+                taBuildingQueryWrapper.eq("building_id", e.getBuildingId());
+                TaBuilding taBuilding = iTaBuildingService.getOne(taBuildingQueryWrapper);
+                e.setCityName(tdCity.getName());
+                if (taBuilding != null){
+                    e.setBuildingName(taBuilding.getBuildingName());
+                }
+            });
+            result.setRecords(result.getRecords());
             responseBean.addSuccess(result);
             return responseBean;
     }
@@ -130,8 +153,10 @@ public class ExtendContentController extends BaseController {
     })
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent, HttpServletRequest request){
-        Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
-        extendContent.setCityId(cityId);
+        if (extendContent.getCityId() == null){
+            Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+            extendContent.setCityId(cityId);
+        }
         extendContent.setCreateDate(LocalDateTime.now());
         extendContent.setOrgId(getOrgId(request));
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
@@ -173,7 +198,7 @@ public class ExtendContentController extends BaseController {
      */
     @ApiOperation(value = "后台轮播图保存", notes = "后台轮播图保存")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "payh",value = "轮播图id"),
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "轮播图id"),
             @ApiImplicitParam(dataType = "ExtendContent", name = "extendContent", paramType = "body",value = "轮播图内容")
     })
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
@@ -198,6 +223,31 @@ public class ExtendContentController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 删除对象，逻辑删除，修改状态为9
+     * @param id  实体ID
+     * @return
+     */
+    @ApiOperation(value = "后台轮播图删除", notes = "后台轮播图删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "轮播图id")
+    })
+    @RequestMapping(value="/admin/extendContentDelete/{id}",method= RequestMethod.PUT)
+    public ResponseBean extendContentUpdate(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        ExtendContent extendContent = new ExtendContent();
+        extendContent.setContentId(id);
+        extendContent.setStatus(9);
+        try {
+            iExtendContentService.updateById(extendContent);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -55,6 +55,12 @@ public class ExtendContent implements Serializable {
     @TableField(exist = false)
     private String targetName;
 
+    @TableField(exist = false)
+    private String cityName;
+
+    @TableField(exist = false)
+    private String buildingName;
+
     /**
      * 图片
      */

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

@@ -29,6 +29,9 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     @Override
     public ResponseBean extendContentAdd(ExtendContent extendContent) {
         ResponseBean responseBean= new ResponseBean<>();
+        if (extendContent.getStatus() == null){
+            extendContent.setStatus(0);
+        }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
         return  responseBean;