全景图

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -577,4 +577,14 @@ public class CommConstant {
      */
     public static final String DYNAMIC_SHARE = "dynamic_share";
 
+    /**
+     * 户型
+     */
+    public static final String APARTMENT_TYPR_APART = "apart";
+
+    /**
+     * 户型全景图
+     */
+    public static final String PANORAMA_TYPE_APARTMENT = "apartment";
+
 }

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

@@ -0,0 +1,195 @@
+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.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingApartment;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+import com.huiju.estateagents.service.ITaBuildingApartmentService;
+import com.huiju.estateagents.service.ITaBuildingPanoramaService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@RestController
+@RequestMapping("/api")
+public class TaBuildingPanoramaController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingPanoramaController.class);
+
+    @Autowired
+    public ITaBuildingPanoramaService iTaBuildingPanoramaService;
+
+
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/panorama",method= RequestMethod.GET)
+    public ResponseBean taBuildingPanoramaList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingPanorama> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingPanorama> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingPanorama> result = iTaBuildingPanoramaService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取全景图的户型列表
+     * @return
+     */
+    @RequestMapping(value="/panorama/apartment",method= RequestMethod.GET)
+    public ResponseBean getApartmentList(@RequestParam(value ="buildingId") String buildingId,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //获取此楼盘下的所有的户型
+            QueryWrapper<TaBuildingApartment> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("apartment_type",CommConstant.APARTMENT_TYPR_APART);
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("org_id",getOrgId(request));
+            List<TaBuildingApartment> apartmentList = taBuildingApartmentService.list(queryWrapper);
+
+            //获取此楼盘下所有已经有全景图的户型
+            QueryWrapper<TaBuildingPanorama> panoramaQueryWrapper = new QueryWrapper<>();
+            panoramaQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            panoramaQueryWrapper.eq("panorama_type",CommConstant.PANORAMA_TYPE_APARTMENT);
+            panoramaQueryWrapper.eq("building_id",buildingId);
+            panoramaQueryWrapper.eq("org_id",getOrgId(request));
+            List<TaBuildingPanorama> panoramaList = iTaBuildingPanoramaService.list(panoramaQueryWrapper);
+            //去除已经有全景图的户型
+            List<TaBuildingApartment> resultList = apartmentList.stream().filter(x -> !x.getApartmentId().equals(panoramaList.stream().map(e -> e.getApartmentId()))).collect(Collectors.toList());
+
+            responseBean.addSuccess(resultList);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getApartmentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingPanorama 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama",method= RequestMethod.POST)
+    public ResponseBean taBuildingPanoramaAdd(@RequestBody TaBuildingPanorama taBuildingPanorama){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingPanoramaService.save(taBuildingPanorama)){
+                responseBean.addSuccess(taBuildingPanorama);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象--逻辑删除
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/panorama/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaBuildingPanorama taBuildingPanorama = new TaBuildingPanorama();
+            taBuildingPanorama.setPanoramaId(id);
+            taBuildingPanorama.setStatus(CommConstant.STATUS_UNACCALIMED);
+            if(iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingPanorama 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingPanoramaUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingPanorama taBuildingPanorama){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taBuildingPanorama.setPanoramaId(id);
+            if (iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                responseBean.addSuccess(taBuildingPanorama);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/panorama/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingPanoramaGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingPanoramaService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -302,4 +302,10 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private String tags;
+
+    /**
+     * 全景图
+     */
+    @TableField(exist = false)
+    private List<TaBuildingPanorama> panoramaList;
 }

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

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingPanorama implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 全景图ID 全景图ID
+     */
+    @TableId(value = "panorama_id", type = IdType.AUTO)
+    private Integer panoramaId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 户型ID
+     */
+    private String apartmentId;
+
+    /**
+     * 全景图类型 全景图类型building指楼盘全景图，apartment指户型全景图
+     */
+    private String panoramaType;
+
+    /**
+     * 全景内容
+     */
+    private String content;
+
+    /**
+     * 全景封面
+     */
+    private String coverImg;
+
+    /**
+     * 全景图链接地址
+     */
+    private String panoramaLink;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+public interface ITaBuildingPanoramaService extends IService<TaBuildingPanorama> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+import com.huiju.estateagents.mapper.TaBuildingPanoramaMapper;
+import com.huiju.estateagents.service.ITaBuildingPanoramaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@Service
+public class TaBuildingPanoramaServiceImpl extends ServiceImpl<TaBuildingPanoramaMapper, TaBuildingPanorama> implements ITaBuildingPanoramaService {
+
+}

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

@@ -102,6 +102,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     public ITaBuildingIntentionService iTaBuildingIntentionService;
 
+    @Autowired
+    private ITaBuildingPanoramaService taBuildingPanoramaService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -292,6 +295,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
         building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
 
+        //查询关联的全景图列表
+        QueryWrapper<TaBuildingPanorama> panoramaQueryWrapper = new QueryWrapper<>();
+        panoramaQueryWrapper.eq("building_id", building.getBuildingId());
+        panoramaQueryWrapper.eq("org_id", building.getOrgId());
+        panoramaQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        panoramaQueryWrapper.orderByDesc("create_date");
+        List<TaBuildingPanorama> panoramaList = taBuildingPanoramaService.list(panoramaQueryWrapper);
+        building.setPanoramaList(panoramaList);
+
         return ResponseBean.success(building);
     }
 

src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: estateagents
     password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_dev?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaBuildingPanoramaMapper.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.mapper.TaBuildingPanoramaMapper">
+
+</mapper>