合并

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.TaBuildingMapRelation;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@RestController
+@RequestMapping("/")
+public class TaBuildingMapRelationController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingMapRelationController.class);
+
+    @Autowired
+    public ITaBuildingMapRelationService iTaBuildingMapRelationService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation",method= RequestMethod.GET)
+    public ResponseBean buildingMapRelationList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingMapRelation> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingMapRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingMapRelation> result = iTaBuildingMapRelationService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingMapRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation",method= RequestMethod.POST)
+    public ResponseBean buildingMapRelationAdd(@RequestBody TaBuildingMapRelation taBuildingMapRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingMapRelationService.save(taBuildingMapRelation)){
+                responseBean.addSuccess(taBuildingMapRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/buildingMapRelation/{id}", method= RequestMethod.DELETE)
+    public ResponseBean buildingMapRelationDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaBuildingMapRelationService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingMapRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation/{id}",method= RequestMethod.PUT)
+    public ResponseBean buildingMapRelationUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingMapRelation taBuildingMapRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingMapRelationService.updateById(taBuildingMapRelation)){
+                responseBean.addSuccess(taBuildingMapRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/buildingMapRelation/{id}",method= RequestMethod.GET)
+    public ResponseBean buildingMapRelationGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingMapRelationService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -201,6 +201,7 @@ public class TaBuilding implements Serializable {
     /**
      * 地图数据
      */
+    @TableField(exist = false)
     private String mapJson;
 
     /**

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_building_map_relation")
+public class TaBuildingMapRelation implements Serializable {
+
+    @TableId(value = "map_id", type = IdType.AUTO)
+    private Integer mapId;
+
+    private static final long serialVersionUID = 1L;
+
+    private String buildingId;
+
+    private Integer orgId;
+
+    private String types;
+
+    private String data;
+
+    private String label;
+
+    @TableField(value = "`key`")
+    private String key;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapRelationMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Mapper
+public interface TaBuildingMapRelationMapper extends BaseMapper<TaBuildingMapRelation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+public interface ITaBuildingMapRelationService extends IService<TaBuildingMapRelation> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import com.huiju.estateagents.mapper.TaBuildingMapRelationMapper;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Service
+public class TaBuildingMapRelationServiceImpl extends ServiceImpl<TaBuildingMapRelationMapper, TaBuildingMapRelation> implements ITaBuildingMapRelationService {
+
+}

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

@@ -13,6 +13,7 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.TaPosterService;
@@ -86,6 +87,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private  TaOrgMapper  taOrgMapper;
 
+    @Autowired
+    private ITaBuildingMapRelationService iTaBuildingMapRelationService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
@@ -168,6 +172,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
+
         return ResponseBean.success(building);
     }
 
@@ -247,9 +258,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         shareActivityQueryWrapper.eq("status", 1);
         shareActivityQueryWrapper.in("activity_status", 0, 1);
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
-
         building.setShareActivityList(shareActivityList);
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
 
         return ResponseBean.success(building);
     }
@@ -258,7 +274,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         // 先删除视频
         UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
@@ -328,6 +344,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
+
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            // 先删除
+            QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+            mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+            mapRelationQueryWrapper.eq("org_id", orgId);
+            iTaBuildingMapRelationService.remove(mapRelationQueryWrapper);
+
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
         return ResponseBean.success(building);
     }
 
@@ -350,7 +380,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
@@ -401,9 +431,37 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
+
         return ResponseBean.success(building);
     }
 
+    /**
+     * 批量插入 周边地图数据
+     * @param list
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    private List<TaBuildingMapRelation> insertBuildingMapRelationBeach(List<TaBuildingMapRelation> list, String buildingId, Integer orgId) {
+        List<TaBuildingMapRelation> newList = list.stream().map(e -> {
+            e.setBuildingId(buildingId);
+            e.setOrgId(orgId);
+            e.setStatus(1);
+            e.setCreateDate(LocalDateTime.now());
+            return e;
+        }).collect(Collectors.toList());
+
+        iTaBuildingMapRelationService.saveBatch(newList);
+        return newList;
+    }
+
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
         TaBuilding  building = new TaBuilding();
@@ -449,6 +507,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
+
         //图片数组
         String imgStr = jsonobject.getString("img");
         //转集合

src/main/resources/mapper/TaBuildingMapRelationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.ta.mapper.TaBuildingMapRelationMapper">
+
+</mapper>