fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmUsedEstateDao.java

@@ -0,0 +1,26 @@
+package fcb.project.manager.base.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import fcb.project.manager.base.entity.TmEstate;
+import fcb.project.manager.base.entity.TmUsedEstate;
+import fcb.project.manager.base.param.house.QueryHouseParam;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import fcb.project.manager.base.vo.house.HouseVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 楼盘项目信息表 Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-08
+ */
+public interface TmUsedEstateDao extends BaseMapper<TmUsedEstate> {
+
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAudit.java

@@ -39,7 +39,7 @@ public class TmAudit implements Serializable {
     @ApiModelProperty(value = "vr房源ID")
     private String vrId;
 
-    @ApiModelProperty(value = "vr项目类型")
+    @ApiModelProperty(value = "vr项目类型  1->新房;2->二手房")
     private Integer vrType;
 
     @ApiModelProperty(value = "所属楼盘")
@@ -104,4 +104,10 @@ public class TmAudit implements Serializable {
     private String vrLink;
 
 
+    //新增二手房内容
+
+
+
+
+
 }

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmUsedAudit.java

@@ -0,0 +1,115 @@
+package fcb.project.manager.base.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 审核表
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmAudit对象", description="审核二手房")
+public class TmUsedAudit implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一ID")
+    private String id;
+
+    @ApiModelProperty(value = "vr项目名称")
+    private String vrTitle;
+
+    @ApiModelProperty(value = "vr房源ID")
+    private String vrId;
+
+    @ApiModelProperty(value = "vr项目类型  1->小区;2->房源")
+    private Integer vrType;
+
+    @ApiModelProperty(value = "所属楼盘")
+    private String belongGardenName;
+
+    @ApiModelProperty(value = "所属楼盘ID")
+    private String belongGardenId;
+
+    @ApiModelProperty(value = "房源ID")
+    private String roomId;
+
+    @ApiModelProperty(value = "公司名称")
+    private String belongCompanyName;
+
+    @ApiModelProperty(value = "所属公司ID")
+    private String belongCompanyId;
+
+    @ApiModelProperty(value = "创建人名字")
+    private String creatorName;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String creatorId;
+
+    @ApiModelProperty(value = "提审时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime sumitTime;
+
+    @ApiModelProperty(value = "审核状态: 0->待审核;1->已审核;-1->不通过;2->拍摄审核")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty(value = "审核人名字")
+    private String auditorName;
+
+    @ApiModelProperty(value = "审核人的ID")
+    private String auditorId;
+
+    @ApiModelProperty(value = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
+
+    @ApiModelProperty(value = "vr项目是否上线: 1->上线; 0->下线")
+    private Integer vrOnline;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
+    @TableField("isDelete")
+    @TableLogic
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "场景链接")
+    private String vrLink;
+
+
+    //新增二手房内容
+
+
+
+
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmUsedEstate.java

@@ -0,0 +1,117 @@
+package fcb.project.manager.base.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmUsedEstate对象", description="")
+public class TmUsedEstate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一ID")
+    private String id;
+
+    @ApiModelProperty(value = "房车宝 - 小区id")
+    private String gardenId;
+
+    @ApiModelProperty(value = "房车宝 - 小区编码")
+    private String number;
+
+    @ApiModelProperty(value = "房车宝 - 小区名称")
+    private String gardenName;
+
+    @ApiModelProperty(value = "房车宝 - 片区/小区商圈")
+    private String areaName;
+
+    @ApiModelProperty(value = "房车宝 - 城市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "房车宝 - 建造年代")
+    private String buildYear;
+
+    @ApiModelProperty(value = "房车宝 - 物业类型")
+    private String propertyTypeName;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createById;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createByName;
+
+    @ApiModelProperty(value = "更新人ID")
+    private String updateById;
+
+    @ApiModelProperty(value = "更新人名称")
+    private String updateByName;
+
+    @ApiModelProperty(value = "所属公司ID")
+    private String belongCompanyId;
+
+    @ApiModelProperty(value = "所属公司名称")
+    private String belongCompanyName;
+
+    @ApiModelProperty(value = "是否删除：0->未删除; 1->已删除")
+    @TableLogic
+    @TableField(value = "isDelete" , fill = FieldFill.INSERT)
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否上线: 1->上线; 0->下线")
+    private Integer online;
+
+    // 只保存最新审核记录
+
+    @ApiModelProperty(value = "状态: 0 -> 草稿;1->待集团审核;2->已审核;-1->未通过;3->待地区审核")
+    private Integer status;
+
+    @ApiModelProperty(value = "审核记录ID")
+    private String auditId;
+
+    @ApiModelProperty(value = "审核人ID")
+    private String auditorId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditorName;
+
+    @ApiModelProperty(value = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
+
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmUsedHouse.java

@@ -0,0 +1,112 @@
+package fcb.project.manager.base.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmHouse对象", description="")
+public class TmUsedHouse implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一ID 房源id")
+    private String id;
+
+    @ApiModelProperty(value = "小区ID")
+    private String gardenId;
+
+    @ApiModelProperty(value = "小区名称")
+    private String gardenName;
+
+    @ApiModelProperty(value = "楼栋单元")
+    private String buildingUnit;
+
+    @ApiModelProperty(value = "房号")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "建筑面积")
+    private String constructionArea;
+
+    @ApiModelProperty(value = "套内面积")
+    private String insideArea;
+
+    @ApiModelProperty(value = "状态: 0 -> 草稿;1->待集团审核;2->已审核;-1->未通过;3->待地区审核")
+    private String status;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "具体审核过程中的状态,0->待审核;1->已审核;-1->不通过;2->拍摄审核")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "审核记录ID")
+    private String auditId;
+
+    @ApiModelProperty(value = "审核人ID")
+    private String auditorId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditorName;
+
+    @ApiModelProperty(value = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceMan;
+
+    @ApiModelProperty(value = "维护人Id")
+    private String maintenanceManId;
+
+    @ApiModelProperty(value = "提审时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime submitAuditTime;
+
+    @ApiModelProperty(value = "创建者ID")
+    private String createById;
+
+    @ApiModelProperty(value = "创建者名称")
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
+    @TableLogic
+    @TableField(value = "isDelete" , fill = FieldFill.INSERT)
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "房源戶型外網场景链接")
+    private String vrLink;
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/UuidPreEnum.java

@@ -15,6 +15,7 @@ public enum UuidPreEnum {
     API_HOUSE_ID_PRE("APIHOUSE" , "API房源信息的UUID前缀"),
     API_HOUSE_RECOMMEND_ID_PRE("RECHOUSE" , "API房源的推荐房源信息的UUID前缀"),
     OPERATION_ID_PRE("OP000001" , "操作日志的UUID前缀"),
+    USEESTATE_ID_PRE("EUTS00001" , "二手楼盘"),
     ;
     private String pre;
     private String desc;

fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/usedEstate/QueryUsedAudit.java

@@ -0,0 +1,32 @@
+package fcb.project.manager.base.param.usedEstate;
+
+import fcb.project.manager.base.param.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class QueryUsedAudit extends PageParam  {
+
+    @ApiModelProperty(name = "number", value = "房车宝 - 小区编码",  dataType = "String")
+    private String number;
+
+    @ApiModelProperty(name = "gardenName",value = "房车宝 - 小区名称",  dataType = "String")
+    private String gardenName;
+
+    @ApiModelProperty(name = "areaName",value = "房车宝 - 片区/小区商圈",  dataType = "String")
+    private String areaName;
+
+    @ApiModelProperty(name = "cityName",value = "房车宝 - 城市名称",  dataType = "String")
+    private String cityName;
+
+    @ApiModelProperty(name = "buildYear",value = "房车宝 - 建造年代",  dataType = "String")
+    private String buildYear;
+
+    @ApiModelProperty(name = "propertyTypeName",value = "房车宝 - 物业类型",  dataType = "String")
+    private String propertyTypeName;
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/usedEstate/QueryUsedEstate.java

@@ -0,0 +1,68 @@
+package fcb.project.manager.base.param.usedEstate;
+
+import fcb.project.manager.base.param.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class QueryUsedEstate extends PageParam  {
+
+    @ApiModelProperty(value = "房源id")
+    private String roomid;
+
+    @ApiModelProperty(value = "房车宝 - 小区id")
+    private String gardenId;
+
+    @ApiModelProperty(name = "number", value = "房车宝 - 小区编码",  dataType = "String")
+    private String number;
+
+    @ApiModelProperty(name = "gardenName",value = "房车宝 - 小区名称",  dataType = "String")
+    private String gardenName;
+
+    @ApiModelProperty(name = "areaName",value = "房车宝 - 片区/小区商圈",  dataType = "String")
+    private String areaName;
+
+    @ApiModelProperty(name = "cityName",value = "房车宝 - 城市名称",  dataType = "String")
+    private String cityName;
+
+    @ApiModelProperty(name = "buildYear",value = "房车宝 - 建造年代",  dataType = "String")
+    private String buildYear;
+
+    @ApiModelProperty(name = "propertyTypeName",value = "房车宝 - 物业类型",  dataType = "String")
+    private String propertyTypeName;
+
+    @ApiModelProperty(value = "查询类型  1：小区 2：房源")
+    private String searchType;
+
+    @ApiModelProperty(name = "createStartTime", value = "创建开始时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createStartTime;
+
+    @ApiModelProperty(name = "createStartTime", value = "创建结束时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createEndTime;
+
+    @ApiModelProperty(value = "更新人名称")
+    private String updateByName;
+
+    @ApiModelProperty(hidden = true)
+    private String departmentId;
+
+    @ApiModelProperty(hidden = true)
+    private List<Integer> statues;
+
+    @ApiModelProperty(name = "auditTimeStartTime", value = "审核开始时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTimeStartTime;
+
+    @ApiModelProperty(name = "auditTimeEndTime", value = "审核结束时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTimeEndTime;
+
+    @ApiModelProperty(value = "是否上线：1->上线;-0->下线")
+    private String online;
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/usedEstate/QueryUsedHouse.java

@@ -0,0 +1,73 @@
+package fcb.project.manager.base.param.usedEstate;
+
+import fcb.project.manager.base.param.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class QueryUsedHouse extends PageParam  {
+
+    @ApiModelProperty(value = "房源id")
+    private String roomId;
+
+    @ApiModelProperty(value = "小区id")
+    private String gardenId;
+
+    @ApiModelProperty(value = "楼栋单元")
+    private String buildingUnit;
+
+    @ApiModelProperty(value = "房号")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "建筑面积范围 开始")
+    private String constructionAreaStart;
+
+    @ApiModelProperty(value = "建筑面积范围 结束")
+    private String constructionAreaEnd;
+
+    @ApiModelProperty(value = "套内面积范围 开始")
+    private String insideAreaStart;
+
+    @ApiModelProperty(value = "套内面积范围 结束")
+    private String insideAreaEnd;
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewer;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceMan;
+
+    @ApiModelProperty(hidden = true)
+    private Integer statues;
+
+    @ApiModelProperty(name = "auditTimeStartTime", value = "审核开始时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTimeStartTime;
+
+    @ApiModelProperty(name = "auditTimeEndTime", value = "审核结束时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTimeEndTime;
+
+    @ApiModelProperty(name = "auditTimeStartTime", value = "更新开始时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTimeStartTime;
+
+    @ApiModelProperty(name = "auditTimeEndTime", value = "更新结束时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTimeEndTime;
+
+    @ApiModelProperty(name = "auditTimeStartTime", value = "创建开始时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTimeStartTime;
+
+    @ApiModelProperty(name = "auditTimeEndTime", value = "创建结束时间", dataType = "String")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTimeEndTime;
+
+    @ApiModelProperty(value = "房源戶型外網场景链接")
+    private String vrLink;
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmUsedEstateService.java

@@ -0,0 +1,28 @@
+package fcb.project.manager.base.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import fcb.project.manager.base.entity.ContextTokenBean;
+import fcb.project.manager.base.entity.TmEstate;
+import fcb.project.manager.base.entity.TmUsedEstate;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 二手楼盘信息
+ * </p>
+ *
+ * @author by su
+ * @since 2021-08-25
+ */
+public interface ITmUsedEstateService extends IService<TmUsedEstate> {
+
+    public Map<String, Object> addProject(TmUsedEstate tmEstate, ContextTokenBean tokenMap);
+
+    IPage<TmUsedEstate> listProject(QueryUsedEstate queryUsedEstate, ContextTokenBean contextUserInfo, String token);
+
+    public int online( TmUsedEstate tmUsedEstate);
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmUsedEstateServiceImpl.java

@@ -0,0 +1,162 @@
+package fcb.project.manager.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import fcb.project.manager.base.dao.TmUsedEstateDao;
+import fcb.project.manager.base.entity.*;
+import fcb.project.manager.base.enums.DeleteStatus;
+import fcb.project.manager.base.enums.HouseStatus;
+import fcb.project.manager.base.enums.SysUserRoleEnums;
+import fcb.project.manager.base.enums.UuidPreEnum;
+import fcb.project.manager.base.param.house.QueryHouseParam;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import fcb.project.manager.base.service.ITmUsedEstateService;
+import fcb.project.manager.base.vo.house.HouseVO;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author by su
+ * @since 2021-01-07
+ */
+@Service
+@Log4j2
+@RequiredArgsConstructor
+public class TmUsedEstateServiceImpl extends ServiceImpl<TmUsedEstateDao, TmUsedEstate> implements ITmUsedEstateService {
+
+    private final TmOperationServiceImpl tmOperationService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> addProject(TmUsedEstate tmUsedEstate , ContextTokenBean tokenMap) {
+        TmUsedEstate dbEstate = getOneByNameAndBelong(tmUsedEstate.getGardenName(), tokenMap.getDepartmentName());
+        if (null != dbEstate) {
+            log.info("{}公司下面的楼盘{}已经存在", tmUsedEstate.getBelongCompanyName(), tmUsedEstate.getGardenName());
+            throw new CommonBaseException(ResultCodeEnum.D101, "楼盘已经存在，无需再添加");
+        }
+
+        if (null != tokenMap) {
+            tmUsedEstate.setId(SnowFlakeUUidUtils.generaUUid(null , null , UuidPreEnum.USEESTATE_ID_PRE.getPre()));
+            tmUsedEstate.setBelongCompanyId(tokenMap.getDepartmentId());
+            tmUsedEstate.setBelongCompanyName(tokenMap.getDepartmentName());
+            tmUsedEstate.setCreateById(tokenMap.getId());
+            tmUsedEstate.setCreateByName(tokenMap.getNickName());
+        }
+
+        if (insertNew(tmUsedEstate)) {
+            int ins = tmOperationService.addNewWithTypeAndContent(tokenMap , "VR楼盘项目-二手房小区" , "创建楼盘/" + tmUsedEstate.getGardenName());
+            if(ins != 1){
+                log.error("插入操作记录失败");
+            }
+        }
+        Map<String , Object> resultMap = new HashMap<>(1);
+        resultMap.put("usedEstateId" , tmUsedEstate.getId());
+        return resultMap;
+    }
+
+    @Override
+    public IPage<TmUsedEstate> listProject(QueryUsedEstate queryUsedEstate, ContextTokenBean contextUserInfo, String token) {
+        produceQuery(queryUsedEstate, contextUserInfo);
+
+        LambdaQueryWrapper<TmUsedEstate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.equals(contextUserInfo.getRoleKey(), SysUserRoleEnums.ADMIN.getRoleKey())
+                && !StringUtils.equals(contextUserInfo.getRoleKey(), SysUserRoleEnums.GROUP.getRoleKey())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getBelongCompanyId,queryUsedEstate.getDepartmentId());
+        }
+
+        if (queryUsedEstate.getStatues() != null && HouseStatus.REJECT.getCode().equals(queryUsedEstate.getStatues())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getStatus,queryUsedEstate.getStatues());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getNumber())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getNumber,queryUsedEstate.getNumber());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getGardenName())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getGardenName,queryUsedEstate.getGardenName());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getCityName())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getCityName,queryUsedEstate.getCityName());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getAreaName())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getAreaName,queryUsedEstate.getAreaName());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getPropertyTypeName())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getPropertyTypeName,queryUsedEstate.getPropertyTypeName());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getBuildYear())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getBuildYear,queryUsedEstate.getBuildYear());
+        }
+
+        if (StringUtils.isNotEmpty(queryUsedEstate.getUpdateByName())) {
+            lambdaQueryWrapper.eq(TmUsedEstate::getBuildYear,queryUsedEstate.getBuildYear());
+        }
+
+        if (queryUsedEstate.getAuditTimeStartTime()!=null && queryUsedEstate.getAuditTimeEndTime()!=null) {
+            lambdaQueryWrapper.between(TmUsedEstate::getAuditTime,queryUsedEstate.getAuditTimeStartTime(),queryUsedEstate.getAuditTimeEndTime());
+        }
+
+        Page<TmUsedEstate> page = new Page().setCurrent(queryUsedEstate.getPageNum()).setSize(queryUsedEstate.getPageSize());
+        IPage<TmUsedEstate> vos = getBaseMapper().selectPage(page, lambdaQueryWrapper);
+        return vos;
+    }
+
+    @Override
+    public int online(TmUsedEstate tmUsedEstate) {
+        return  getBaseMapper().updateById(tmUsedEstate);
+    }
+
+    private void produceQuery(QueryUsedEstate queryUsedEstate, ContextTokenBean contextUserInfo) {
+        if (!StringUtils.equals(contextUserInfo.getRoleKey(), SysUserRoleEnums.ADMIN.getRoleKey())
+                && !StringUtils.equals(contextUserInfo.getRoleKey(), SysUserRoleEnums.GROUP.getRoleKey())) {
+            queryUsedEstate.setDepartmentId(contextUserInfo.getDepartmentId());
+        }
+
+    }
+
+
+    public TmUsedEstate getOneByNameAndBelong(String estateName , String belongCompany){
+        LambdaQueryWrapper<TmUsedEstate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(estateName)){
+            lambdaQueryWrapper.eq(TmUsedEstate::getBelongCompanyName , belongCompany);
+        }
+        if(StringUtils.isNotBlank(estateName)){
+            lambdaQueryWrapper.eq(TmUsedEstate::getGardenName , estateName);
+        }
+        lambdaQueryWrapper.eq(TmUsedEstate::getIsDelete , DeleteStatus.NOT_DELETE.getCode());
+        lambdaQueryWrapper.last("limit 1");
+        return getBaseMapper().selectOne(lambdaQueryWrapper);
+    }
+
+    public boolean insertNew(TmUsedEstate estate){
+        if(StringUtils.isBlank(estate.getId())){
+            estate.setId(SnowFlakeUUidUtils.generaUUid(null , null ,  "EST00001"));
+        }
+        estate.setCreateTime(LocalDateTime.now());
+        estate.setUpdateTime(LocalDateTime.now());
+        estate.setIsDelete(DeleteStatus.NOT_DELETE.getCode());
+        return 1 == getBaseMapper().insert(estate);
+    }
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/UsedAuditController.java

@@ -0,0 +1,110 @@
+package fcb.project.manager.core.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import fcb.project.manager.base.entity.*;
+import fcb.project.manager.base.enums.AuditStatus;
+import fcb.project.manager.base.enums.DeleteStatus;
+import fcb.project.manager.base.enums.HouseStatus;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import fcb.project.manager.base.service.custom.PanoService;
+import fcb.project.manager.base.service.impl.TmAuditLogServiceImpl;
+import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
+import fcb.project.manager.base.service.impl.TmHouseServiceImpl;
+import fcb.project.manager.base.service.impl.TmOperationServiceImpl;
+import fcb.project.manager.base.utils.DataUtils;
+import fcb.project.manager.base.utils.DateUtil;
+import fcb.project.manager.base.utils.ExcelUtil;
+import fcb.project.manager.core.feignInterfaces.SceneFeign;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/8 11:19
+ * 4
+ */
+@Api(tags = "二手房审核相关接口")
+@RestController
+@RequestMapping("fcb/project/usedaudit")
+@Log4j2
+public class UsedAuditController extends BaseController{
+
+
+    @PostMapping("/queryOrSearchList")
+    @ApiOperation(value = "根据条件拉取所有审批记录")
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "操作成功",response = QueryUsedEstate.class)
+    })
+    public Result<Object> queryList(@RequestBody QueryUsedEstate queryUsedEstate){
+
+        return  Result.success();
+    }
+
+    @PostMapping("/queryAuditLogList")
+    @ApiOperation(value = "根据条件拉取所有审批记录")
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "操作成功",response = QueryUsedEstate.class)
+    })
+
+    public Result<Object> queryAuditLogList(@RequestBody QueryUsedEstate queryUsedEstate){
+
+        return  Result.success();
+    }
+
+
+
+    @PostMapping("/doAudit")
+    @ApiOperation(value = "审核")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "审核记录ID", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "auditStatus", value = "审核状态: 0->待审核;1->已审核;-1->不通过", paramType = "query", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "auditRemark", value = "审核备注", paramType = "query", required = true, dataType = "String"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> audit(@RequestBody AuditRequestBean auditRequestBean , HttpServletRequest request){
+
+
+        return Result.success("审核成功" );
+    }
+
+    @PostMapping("/online")
+    @ApiOperation(value = "上线/下线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "房源ID", paramType = "query", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "online", value = "是否上线：1->上线;-0->下线", paramType = "query", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "searchType", value = "类型  1：小区 2：房源", paramType = "query", required = false, dataType = "Integer"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> online(@RequestBody QueryUsedEstate queryUsedEstate){
+
+
+        return Result.success();
+    }
+
+    @PostMapping("/exportAuditHouseList")
+    @ApiOperation(value = "导出所有审核记录")
+    public Result exportAuditHouseList(@RequestBody QueryUsedEstate queryUsedEstate) throws Exception{
+
+        return Result.success();
+    }
+
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/UsedEstateManagerController.java

@@ -0,0 +1,164 @@
+package fcb.project.manager.core.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import fcb.project.manager.base.entity.*;
+import fcb.project.manager.base.enums.AuditStatus;
+import fcb.project.manager.base.enums.DeleteStatus;
+import fcb.project.manager.base.enums.HouseStatus;
+import fcb.project.manager.base.enums.SysUserRoleEnums;
+import fcb.project.manager.base.param.house.QueryHouseParam;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import fcb.project.manager.base.service.ITmUsedEstateService;
+import fcb.project.manager.base.service.custom.PanoService;
+import fcb.project.manager.base.service.impl.*;
+import fcb.project.manager.base.utils.DataUtils;
+import fcb.project.manager.base.utils.DateUtil;
+import fcb.project.manager.base.utils.ExcelUtil;
+import fcb.project.manager.base.vo.house.HouseVO;
+import fcb.project.manager.core.feignInterfaces.SceneFeign;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.entity.ViewResult;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import fdage.back.sdk.core.alibabaUtils.AlibabaOssHelper;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/7 17:38
+ * 4
+ */
+@Api(tags = "二手房小区相关接口")
+@RestController
+@RequestMapping("fcb/project/usedestate")
+@Log4j2
+@Validated
+public class UsedEstateManagerController extends BaseController{
+
+    @Autowired
+    private ITmUsedEstateService tmUsedEstateService;
+
+    public static String IMAGE_PATH = ".+(.JPEG|.jpeg|.JPG|.jpg|.GIF|.gif|.BMP|.bmp|.PNG|.png)";
+
+    @PostMapping("/addEstate")
+    @ApiOperation(value = "创建二手房小区")
+    public ViewResult addNewHouse(@RequestBody TmUsedEstate tmUsedEstate){
+        Map<String, Object> map = tmUsedEstateService.addProject(tmUsedEstate, getContextUserInfo());
+        return ViewResult.success(map);
+    }
+
+    @PostMapping("/getEstateDetail")
+    @ApiOperation(value = "根据小区ID获取小区详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public Result<Object> getEstateDetail(@RequestBody QueryUsedEstate queryUsedEstate){
+        return Result.success();
+
+    }
+
+    @PostMapping("/queryOrSearchList")
+    @ApiOperation(value = "根据条件拉取所有小区 , 支持分页")
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",response = TmUsedEstate.class)
+    })
+    public ViewResult<TmUsedEstate> getHouseList(@RequestBody QueryUsedEstate queryUsedEstate) {
+        IPage<TmUsedEstate> resultPage = tmUsedEstateService.listProject(queryUsedEstate, getContextUserInfo(), getToken());
+        return ViewResult.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
+                resultPage.getCurrent(), resultPage.getRecords()));
+    }
+
+    @GetMapping("/usedEsDetailWithoutAuth")
+    @ApiOperation(value = "根据二手房小区ID获取小区详情-无需授权，给H5使用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",response = TmUsedEstate.class)
+    })
+    public Result<Object> usedEsDetailWithoutAuth(@RequestBody QueryUsedEstate queryUsedEstate){
+//        if(StringUtils.isBlank(houseId)){
+//            return Result.failure("房源ID不能为空");
+//        }
+//        TmHouse tmHouse = tmHouseService.getById(houseId);
+//        if(null == tmHouse || tmHouse.getIsDelete().compareTo(1) == 0){
+//            return Result.failure("房源不存在");
+//        }
+        return null;
+    }
+
+    @PostMapping("/submitAudit")
+    @ApiOperation(value = "提交审核记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "二手小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",reference = "auditId")
+    })
+    public Result<Object> addNewAudit(@RequestBody QueryUsedEstate queryUsedEstate){
+
+        return Result.success();
+
+    }
+
+    @PostMapping("/dismissAudit")
+    @ApiOperation(value = "撤销审核记录-")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "二手小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> dismissAudit(@RequestBody QueryUsedEstate queryUsedEstate){
+
+        return Result.success();
+    }
+
+    @PostMapping("/deleteEstate")
+    @ApiOperation(value = "删除小区信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "二手小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public ViewResult deleteHouse(@RequestBody QueryUsedEstate queryUsedEstate){
+        return ViewResult.success();
+    }
+
+    @PostMapping("/listEstate")
+    @ApiOperation("获取所有当前已创建的所有小区")
+    public ViewResult<List<String>> getHouseList() {
+        return ViewResult.success();
+
+    }
+
+    @PostMapping("/getShareLinks")
+    @ApiOperation(value = "根据房源ID获取房源所有分享链接")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gardenId", value = "二手小区ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public Result<Object> getShareLinks(@RequestBody QueryUsedEstate queryUsedEstate){
+        return Result.success();
+    }
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/UsedHouseManagerController.java

@@ -0,0 +1,109 @@
+package fcb.project.manager.core.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import fcb.project.manager.base.entity.TmUsedEstate;
+import fcb.project.manager.base.entity.TmUsedHouse;
+import fcb.project.manager.base.param.usedEstate.QueryUsedEstate;
+import fcb.project.manager.base.param.usedEstate.QueryUsedHouse;
+import fcb.project.manager.base.service.ITmUsedEstateService;
+import fcb.project.manager.base.utils.DataUtils;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.entity.ViewResult;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/7 17:38
+ * 4
+ */
+@Api(tags = "二手房房源相关接口")
+@RestController
+@RequestMapping("fcb/project/usedhouse")
+@Log4j2
+@Validated
+public class UsedHouseManagerController extends BaseController{
+
+    @Autowired
+    private ITmUsedEstateService tmUsedEstateService;
+
+    public static String IMAGE_PATH = ".+(.JPEG|.jpeg|.JPG|.jpg|.GIF|.gif|.BMP|.bmp|.PNG|.png)";
+
+    @PostMapping("/queryOrSearchList")
+    @ApiOperation(value = "根据条件拉取所有房源 , 支持分页")
+    @ApiResponse(code = 0,message = "成功",response = TmUsedHouse.class)
+    public ViewResult<TmUsedEstate> getHouseList(@RequestBody QueryUsedHouse queryUsedHouse) {
+        return null;
+    }
+
+    @PostMapping("/usedHouseDetailWithoutAuth")
+    @ApiOperation(value = "根据二手房房源ID获取房源详情-无需授权，给H5使用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",response = TmUsedHouse.class)
+    })
+    public Result<Object> usedHouseDetailWithoutAuth(@RequestBody QueryUsedHouse queryUsedHouse){
+
+        return Result.success();
+
+    }
+
+    @PostMapping("/updatevrlink")
+    @ApiOperation(value = "编辑vrlink")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "vrLink", value = "vr link", paramType = "query", required = true, dataType = "String"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",response = TmUsedHouse.class)
+    })
+    public Result<Object> updatevrlink(@RequestBody QueryUsedHouse queryUsedHouse) {
+
+        return Result.success();
+    }
+
+
+    @PostMapping("/submitAudit")
+    @ApiOperation(value = "提交审核记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    @ApiResponses({
+            @ApiResponse(code = 0,message = "成功",reference = "auditId")
+    })
+    public Result<Object> addNewAudit(@RequestBody QueryUsedHouse queryUsedHouse){
+
+        return Result.success();
+
+    }
+
+    @PostMapping("/dismissAudit")
+    @ApiOperation(value = "撤销审核记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> dismissAudit(@RequestBody QueryUsedHouse queryUsedHouse){
+
+        return Result.success();
+    }
+
+    @PostMapping("/getShareLinks")
+    @ApiOperation(value = "根据房源ID获取房源所有分享链接")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public Result<Object> getShareLinks(@RequestBody QueryUsedHouse queryUsedHouse){
+        return Result.success();
+    }
+
+}