地图完成

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

@@ -236,10 +236,12 @@ public class TaBuildingController extends BaseController {
     @ApiOperation(value = "依据项目ID 查户型", notes = "依据项目ID 查户型")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "apartmentType", value = "类型"),
     })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
-    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
-        return taBuildingService.buildingApartmentBuildingId(id);
+    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id,
+                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType){
+        return taBuildingService.buildingApartmentBuildingId(id, apartmentType);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaUv;
@@ -11,6 +12,9 @@ import org.springframework.web.bind.annotation.*;
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,4 +44,39 @@ public class TaUvController extends BaseController {
 
         return taUvService.getListOf(id, typeOf, pageNumber, pageSize);
     }
+
+
+    /**
+     * 测试：重复插入数据 ta_uv 表
+     */
+    //@RequestMapping(value = "/admin/test/uv", method = RequestMethod.GET)
+    public  ResponseBean testUv(HttpServletRequest request, @RequestParam("beUv") String beUv, @RequestParam("num") Integer num){
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("be_uv", beUv);
+        queryWrapper.eq("tagert_type", "project");
+        List<TaUv> list = taUvService.list(queryWrapper);
+
+//        TaUv uv = new TaUv();
+//        uv.setPersonId("8a79cdad85182211abeab6adcafd5830");
+//        uv.setNameOrnick("党党");
+//        uv.setPhotoOravatar("https://wx.qlogo.cn/mmopen/vi_32/ywmrMa0pkIVrPwNAedLt58eKMlicQSHce2M0TUBJFdFIH5pYPPMVfbKJHJJNicDfVrfRVuGXpn3xseJCTTT5nqibg/132");
+//        uv.setBeUv("2dd1dadd467751adcc106cb7cb1ab76d");
+//        uv.setTagertType("project");
+//        uv.setCreateDate(LocalDateTime.of(2019, 9, 9, 10, 10));
+//        taUvService.save(uv);
+
+        int i = 0;
+        for (int t = 0; t < num; t++) {
+            List<TaUv> collect = list.stream().map(e -> {
+                e.setCreateDate(LocalDateTime.of(2019, 9, 9, 10, 10));
+                e.setUvId(null);
+                return e;
+            }).collect(Collectors.toList());
+
+            taUvService.saveBatch(collect);
+        }
+
+        return responseBean;
+    }
 }

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

@@ -198,7 +198,10 @@ public class TaBuilding implements Serializable {
      */
     private Integer mapScope;
 
-
+    /**
+     * 地图数据
+     */
+    private String mapJson;
 
     /**
      * 图片

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

@@ -90,7 +90,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
     ResponseBean buildingApartmentAdd(String parameter);
 
     /**
-     * 户型添加
+     * 户型修改
      * @param parameter
      * @return
      */
@@ -141,7 +141,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingApartmentBuildingId(String id);
+    ResponseBean buildingApartmentBuildingId(String id, String apartmentType);
 
     /**
      * 户型删除

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

@@ -625,12 +625,29 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingApartmentBuildingId(String id) {
+    public ResponseBean buildingApartmentBuildingId(String id, String apartmentType) {
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", id);
         buildingApartmentQueryWrapper.eq("status",1);
+        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType),"apartment_type",apartmentType);
         buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartment= taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
+        buildingApartment.forEach(e -> {
+            QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
+            ApartmentImgQueryWrapper.eq("apartment_id", e.getApartmentId());
+            List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+
+            List<TaBuildingImg> buildingImag = buildingImg.stream().map(img -> {
+                QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", img.getImgId());
+                buildingImgQueryWrapper.eq("img_type", "aparment");
+                return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
+            }).collect(Collectors.toList());
+
+            e.setBuildingImgList(buildingImag);
+
+        });
+
         return ResponseBean.success(buildingApartment);
     }