魏熙美 5 vuotta sitten
vanhempi
commit
07f653edb1

+ 16
- 0
src/main/java/com/huiju/estateagents/entity/TaBuilding.java Näytä tiedosto

@@ -188,6 +188,16 @@ public class TaBuilding implements Serializable {
188 188
      */
189 189
     private Integer orgId;
190 190
 
191
+    /**
192
+     * 视频url
193
+     */
194
+    private String videoUrl;
195
+
196
+    /**
197
+     * 地图范围
198
+     */
199
+    private Integer mapScope;
200
+
191 201
 
192 202
 
193 203
     /**
@@ -249,4 +259,10 @@ public class TaBuilding implements Serializable {
249 259
      */
250 260
     @TableField(exist = false)
251 261
     private List<TaShareActivity> shareActivityList;
262
+
263
+    /**
264
+     * 列表图
265
+     */
266
+    @TableField(exist = false)
267
+    private List<TaBuildingImg> buildingListImg;
252 268
 }

+ 28
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Näytä tiedosto

@@ -135,6 +135,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
135 135
         List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
136 136
         building.setBuildingImg(buildingImg);
137 137
 
138
+        // 列表图
139
+        QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
140
+        BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
141
+        BuildingListImgQueryWrapper.eq("img_type", "list");
142
+        List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(BuildingListImgQueryWrapper);
143
+        building.setBuildingListImg(buildingListImg);
144
+
145
+
138 146
         // 查询tag
139 147
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
140 148
         BuildingTagQueryWrapper.eq("building_id", id);
@@ -258,6 +266,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
258 266
             insertImgBatch(buildingImgs, building.getBuildingId());
259 267
         }
260 268
 
269
+        // 列表图
270
+        String listImg = object.getString("listImg");
271
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
272
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
273
+            QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
274
+            BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
275
+            BuildingListImgQueryWrapper.eq("img_type", "list");
276
+            taBuildingImgMapper.delete(BuildingListImgQueryWrapper);
277
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
278
+        }
279
+
261 280
 
262 281
         // tag先删除再增加
263 282
         String tagStr = object.getString("tag");
@@ -321,13 +340,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
321 340
             tdCityMapper.updateById(city);
322 341
         }
323 342
 
343
+        // 项目主图
324 344
         String imgStr = object.getString("img");
325 345
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
326
-
327 346
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
328 347
             buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
329 348
         }
330 349
 
350
+        // 列表图
351
+        String listImg = object.getString("listImg");
352
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
353
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
354
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
355
+        }
356
+
357
+        // 标签
331 358
         String tagStr = object.getString("tag");
332 359
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
333 360
         if (CollectionUtils.isNotEmpty(buildingTags)) {