feats

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

@@ -44,6 +44,8 @@ public class ExtendContentController extends BaseController {
     @Autowired
     private ITaBuildingDynamicService iTaBuildingDynamicService;
 
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
 
     /**
      * 分页查询列表
@@ -76,8 +78,9 @@ public class ExtendContentController extends BaseController {
                                                   @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);
+                                                  @RequestParam(value = "contentId", required = false) String contentId,
+                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
         return responseBean;
     }
 
@@ -89,6 +92,8 @@ public class ExtendContentController extends BaseController {
      */
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+        extendContent.setCityId(cityId);
         extendContent.setCreateDate(LocalDateTime.now());
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
@@ -129,6 +134,8 @@ public class ExtendContentController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         extendContent.setContentId(id);
         try {
+            Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+            extendContent.setCityId(cityId);
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
             }else {

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

@@ -90,5 +90,5 @@ public class ExtendContent implements Serializable {
      */
     private String buildingId;
 
-
+    private Integer cityId;
 }

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

@@ -34,7 +34,8 @@ public interface IExtendContentService extends IService<ExtendContent> {
      * 开屏
      * @param contentType
      * @param buildingId
+     * @param cityId
      * @return
      */
-    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId);
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId);
 }

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

@@ -59,7 +59,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId) {
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
@@ -71,6 +71,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         // activity(活动) 或 project(项目) 或 news（咨迅）
         extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
         extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
+        extendContentQuery.eq(null != cityId && cityId != 0, "city_id", cityId);
         extendContentQuery.eq("status","1");
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);