浏览代码

调整项目文档结构

houweiyu 4 年之前
父节点
当前提交
7ff4c1d1fe
共有 87 个文件被更改,包括 348 次插入49 次删除
  1. 74 0
      fcb-project-application/pom.xml
  2. 0 0
      fcb-project-application/src/main/java/fcb/project/manager/FcbProjectManagerApplication.java
  3. 1 0
      src/main/resources/application-dev.properties
  4. 1 1
      src/main/resources/application-prod.properties
  5. 1 0
      src/main/resources/application-test.properties
  6. 1 0
      src/main/resources/application-uat.properties
  7. 2 2
      src/main/resources/application.properties
  8. 0 0
      fcb-project-application/src/main/resources/log4j2.xml
  9. 37 0
      fcb-project-manager-core/pom.xml
  10. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/HystrixConfig.java
  11. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyBatisPlusLogicalDeleteConfig.java
  12. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyBatisPlusPageConfig.java
  13. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyNacosLifecycle.java
  14. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/RedisConfiguration.java
  15. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/constant/CommonConstant.java
  16. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmApiHouseInfoDao.java
  17. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmApiHouseRecommendDao.java
  18. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmApiRoomIdLogDao.java
  19. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmAuditDao.java
  20. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmEstateDao.java
  21. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmHouseDao.java
  22. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/dao/TmOperationDao.java
  23. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/AuditRequestBean.java
  24. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/CommonRspBean.java
  25. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/ContextTokenBean.java
  26. 33 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneRsp.java
  27. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoSceneBean.java
  28. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/SceneRspBean.java
  29. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/SevenTwoZeroSceneRspBean.java
  30. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmApiHouseInfo.java
  31. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmApiHouseRecommend.java
  32. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmApiRoomIdLog.java
  33. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAudit.java
  34. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmEstate.java
  35. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmFcbHouseInfo.java
  36. 41 3
      src/main/java/fcb/project/manager/base/entity/TmHouse.java
  37. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmOperation.java
  38. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/AuditStatus.java
  39. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/DeleteStatus.java
  40. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/HouseStatus.java
  41. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/SysUserRoleEnums.java
  42. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/TerminalType.java
  43. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/UuidPreEnum.java
  44. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/exception/ControllerHanderException.java
  45. 1 1
      src/main/java/fcb/project/manager/base/generator/CodeGenerator.java
  46. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/rocketMq/HouseFormatEvent.java
  47. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmApiHouseInfoService.java
  48. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmApiHouseRecommendService.java
  49. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmApiRoomIdLogService.java
  50. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmAuditService.java
  51. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmEstateService.java
  52. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmHouseService.java
  53. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/ITmOperationService.java
  54. 14 0
      src/main/java/fcb/project/manager/base/service/custom/PanoService.java
  55. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmApiHouseInfoServiceImpl.java
  56. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmApiHouseRecommendServiceImpl.java
  57. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmApiRoomIdLogServiceImpl.java
  58. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java
  59. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java
  60. 73 0
      src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java
  61. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmOperationServiceImpl.java
  62. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/DataUtils.java
  63. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/FcbUtils.java
  64. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/LogoConfig.java
  65. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/QRCodeUtils.java
  66. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/RedisServiceUtils.java
  67. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/ApiQueryHouseController.java
  68. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/AuditController.java
  69. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/BaseController.java
  70. 42 0
      src/main/java/fcb/project/manager/core/controller/HouseManagerController.java
  71. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/OperationController.java
  72. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/ProjectController.java
  73. 3 0
      src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java
  74. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/SceneFeign.java
  75. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/UserFeign.java
  76. 8 0
      src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/PanoFeignFallBack.java
  77. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/SceneFeignFallBack.java
  78. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/UserFeignFallBack.java
  79. 0 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/rocketmqConsumer/AsyncWriteDbConsumerListener.java
  80. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiHouseInfoMapper.xml
  81. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiHouseRecommendMapper.xml
  82. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiRoomIdLogMapper.xml
  83. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmAuditMapper.xml
  84. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml
  85. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmHouseMapper.xml
  86. 0 0
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmOperationMapper.xml
  87. 16 42
      pom.xml

+ 74 - 0
fcb-project-application/pom.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+
+    <parent>
+        <groupId>com.fcb.manager</groupId>
+        <artifactId>fcb-project-manager-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fcb-manager-application</artifactId>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fcb.manager</groupId>
+            <artifactId>fcb-project-manager-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>fcb-project-manager</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 工程主入口 -->
+                    <mainClass>fcb.project.manager.FcbProjectManagerApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/fcb/project/manager/FcbProjectManagerApplication.java → fcb-project-application/src/main/java/fcb/project/manager/FcbProjectManagerApplication.java


+ 1 - 0
src/main/resources/application-dev.properties

@@ -46,3 +46,4 @@ image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
 inner.vr.scene.host=https://fcb.intranet.4dkankan.com/
 outer.vr.scene.host=https://fcb.test.4dkankan.com/
 vr.scene.link=hengda.html?m=
+vr.scene.format.link=hengda.html?m=%s&prodId=%s&houseId=%s

+ 1 - 1
src/main/resources/application-prod.properties

@@ -33,7 +33,7 @@ oss.query.url=https://vr-oss01.fcb.com.cn/
 share.logo.oss.path=domain/fcb/
 image.local.path=/image/
 vr.scene.link=hengda.html?m=
-
+vr.scene.format.link=hengda.html?m=%s&prodId=%s&houseId=%s
 #管理后台内网域名
 inner.vr.scene.host=https://vr-mc01.fcb.com.cn/
 #管理后台外网域名

+ 1 - 0
src/main/resources/application-test.properties

@@ -45,3 +45,4 @@ image.local.path=/image/
 inner.vr.scene.host=https://fcb.intranet.4dkankan.com/
 outer.vr.scene.host=https://fcb.test.4dkankan.com/
 vr.scene.link=hengda.html?m=
+vr.scene.format.link=hengda.html?m=%s&prodId=%s&houseId=%s

+ 1 - 0
src/main/resources/application-uat.properties

@@ -36,3 +36,4 @@ image.local.path=/image/
 inner.vr.scene.host=https://vr-mc01-uat.fcb.com.cn/
 outer.vr.scene.host=https://vr-web01-uat.fcb.com.cn/
 vr.scene.link=hengda.html?m=
+vr.scene.format.link=hengda.html?m=%s&prodId=%s&houseId=%s

+ 2 - 2
src/main/resources/application.properties

@@ -1,10 +1,10 @@
 
 
-spring.profiles.active=prod
+#spring.profiles.active=prod
 #spring.profiles.active=dev
 #spring.profiles.active=uat
 #sit环境,这里使用了test因为sdk的swagger使用的是test,所以这里使用sit
-#spring.profiles.active=test
+spring.profiles.active=test
 
 #应用名
 spring.application.name=fbc-project-manager

src/main/resources/log4j2.xml → fcb-project-application/src/main/resources/log4j2.xml


+ 37 - 0
fcb-project-manager-core/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.fcb.manager</groupId>
+    <artifactId>fcb-project-manager-core</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <description>房车宝管理后台综合管理微服务</description>
+
+
+    <!--<packaging>jar</packaging>-->
+    <packaging>jar</packaging>
+
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <nacos.latest.version>0.2.1</nacos.latest.version>
+        <nacos-config-spring-boot.version>0.2.1</nacos-config-spring-boot.version>
+        <jedis-version>3.1.0</jedis-version>
+    </properties>
+
+    <parent>
+        <groupId>com.fcb.manager</groupId>
+        <artifactId>fcb-project-manager-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+
+
+
+
+</project>

src/main/java/fcb/project/manager/base/config/HystrixConfig.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/HystrixConfig.java


src/main/java/fcb/project/manager/base/config/MyBatisPlusLogicalDeleteConfig.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyBatisPlusLogicalDeleteConfig.java


src/main/java/fcb/project/manager/base/config/MyBatisPlusPageConfig.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyBatisPlusPageConfig.java


src/main/java/fcb/project/manager/base/config/MyNacosLifecycle.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/MyNacosLifecycle.java


src/main/java/fcb/project/manager/base/config/RedisConfiguration.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/config/RedisConfiguration.java


src/main/java/fcb/project/manager/base/constant/CommonConstant.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/constant/CommonConstant.java


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


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


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


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


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


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


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


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


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


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


+ 33 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneRsp.java

@@ -0,0 +1,33 @@
+package fcb.project.manager.base.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/3/22 18:32
+ * 4
+ */
+
+@Data
+public class PanoInitSceneRsp implements Serializable {
+
+
+    /**
+     * houseId : HUS000011356533501177094144
+     * icon : https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/cms_pano_fcb/image/thumb_20210202_180227655.jpg
+     * id : init1372474909079674880
+     * sceneCode : fcb_7fPs1tE0E
+     * type: building
+     * sceneTitle:test
+     */
+
+    private String houseId;
+    private String icon;
+    private String id;
+    private String sceneCode;
+    private String type;
+    private String sceneTitle;
+
+}

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


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


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


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


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


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


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


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


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


+ 41 - 3
src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -94,7 +94,7 @@ public class TmHouse implements Serializable {
     private Integer online;
 
 
-    @ApiModelProperty(value = "房源场景链接")
+    @ApiModelProperty(value = "房源戶型外網场景链接")
     private String vrLink;
 
     @ApiModelProperty(value = "二维码分享简介")
@@ -103,7 +103,7 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "房源信息[房车宝提供]")
     private String houseInfo;
 
-    @ApiModelProperty(value = "场景码")
+    @ApiModelProperty(value = "戶型场景码")
     private String sceneNum;
 
     @ApiModelProperty(value = "房源ID")
@@ -142,7 +142,7 @@ public class TmHouse implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime submitAuditTime;
 
-    @ApiModelProperty(value = "房源内网场景链接")
+    @ApiModelProperty(value = "房源戶型内网场景链接")
     private String innerVrLink;
 
     @ApiModelProperty(value = "当前房源的审核记录条数-仅仅用于返回给前端用")
@@ -154,4 +154,42 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "用户在编辑后台编辑的模型的路径")
     private String vrPath;
 
+    @ApiModelProperty(value = "大场景场景码")
+    private String bigSceneNum;
+
+    @ApiModelProperty(value = "园林场景码")
+    private String gardensSceneNum;
+
+    @ApiModelProperty(value = "大场景内网链接")
+    private String bigInnerLink;
+
+    @ApiModelProperty(value = "大场景外网链接")
+    private String bigOuterLink;
+
+
+    @ApiModelProperty(value = "园林场景内网链接")
+    private String gardensInnerLink;
+
+    @ApiModelProperty(value = "园林场景外网链接")
+    private String gardensOuterLink;
+
+
+    @ApiModelProperty(value = "房源户型场景缩略图")
+    private String sceneCover;
+
+    @ApiModelProperty(value = "房源场景缩略图")
+    private String bigSceneCover;
+
+    @ApiModelProperty(value = "房源园林场景缩略图")
+    private String gardensCover;
+
+    @ApiModelProperty(value = "户型场景标题")
+    private String sceneTitle;
+
+    @ApiModelProperty(value = "大场景标题")
+    private String bigSceneTitle;
+
+    @ApiModelProperty(value = "园林场景标题")
+    private String gardensSceneTitle;
+
 }

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


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


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


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


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


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


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


src/main/java/fcb/project/manager/base/exception/ControllerHanderException.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/exception/ControllerHanderException.java


+ 1 - 1
src/main/java/fcb/project/manager/base/generator/CodeGenerator.java

@@ -79,7 +79,7 @@ public class CodeGenerator {
         focList.add(new FileOutConfig("/templates/mapper.xml.vm") {
             @Override
             public String outputFile(TableInfo tableInfo) {
-                return  "E:\\code\\projects\\fcb-project-manager\\src\\main\\resources\\mybatis\\mappers\\" + tableInfo.getEntityName() + "Mapper.xml";
+                return  "E:\\code\\projects\\fcb-project-manager\\fcb-project-manager\\src\\main\\resources\\mybatis\\mappers\\" + tableInfo.getEntityName() + "Mapper.xml";
             }
         });
         cfg.setFileOutConfigList(focList);

src/main/java/fcb/project/manager/base/rocketMq/HouseFormatEvent.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/rocketMq/HouseFormatEvent.java


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


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


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


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


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


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


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


+ 14 - 0
src/main/java/fcb/project/manager/base/service/custom/PanoService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import fcb.project.manager.base.entity.CommonRspBean;
+import fcb.project.manager.base.entity.PanoInitSceneRsp;
 import fcb.project.manager.base.entity.PanoSceneBean;
 import fcb.project.manager.base.entity.SevenTwoZeroSceneRspBean;
 import fcb.project.manager.core.feignInterfaces.PanoFeign;
@@ -56,6 +57,19 @@ public class PanoService {
         return true;
     }
 
+    public List<PanoInitSceneRsp> getAllTypeSceneNums(String houseId, String token) {
+        if (StringUtils.isBlank(houseId)) {
+            return null;
+        }
+        CommonRspBean rspBean = panoFeign.getAllTypeSceneNums(houseId , token);
+        log.info("获取房源的初始化场景数据,从720返回结果:{}" , JSON.toJSONString(rspBean));
+        if(null == rspBean || null == rspBean.getCode() || rspBean.getCode().compareTo(0) != 0){
+            return null;
+        }
+
+        return null != rspBean.getData() ? (List<PanoInitSceneRsp>) rspBean.getData() : null;
+    }
+
     public List<String> getKanKanSceneNums(String houseId, String token) {
         if (StringUtils.isBlank(houseId)) {
             return null;

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


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


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


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


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


+ 73 - 0
src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import fcb.project.manager.base.dao.TmHouseDao;
 import fcb.project.manager.base.entity.ContextTokenBean;
+import fcb.project.manager.base.entity.PanoInitSceneRsp;
+import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
 import fcb.project.manager.base.enums.DeleteStatus;
 import fcb.project.manager.base.enums.HouseStatus;
@@ -14,6 +16,8 @@ import fcb.project.manager.base.enums.UuidPreEnum;
 import fcb.project.manager.base.service.ITmHouseService;
 import fcb.project.manager.base.service.custom.PanoService;
 import fcb.project.manager.core.feignInterfaces.UserFeign;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
 import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +49,9 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     private PanoService panoService;
 
     @Autowired
+    private TmEstateServiceImpl tmEstateService;
+
+    @Autowired
     private TmAuditServiceImpl tmAuditService;
 
     @Value("${inner.vr.scene.host}")
@@ -53,6 +60,9 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     @Value("${outer.vr.scene.host}")
     private String outerSceneVrHost;
 
+    @Value("${vr.scene.format.link}")
+    private String vrLinkPath;
+
 
     public IPage<TmHouse> getListByNameOrBelong(String houseTitle,
                                                 Integer status, Integer type,
@@ -113,6 +123,69 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return resultPage;
     }
 
+    public TmHouse updateSceneInfo(List<PanoInitSceneRsp> sceneRspList , TmHouse tmHouse){
+        boolean needUpdate = false;
+        TmEstate tmEstate = tmEstateService.getById(tmHouse.getEstateId());
+        if(null == tmEstate){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘不存在");
+        }
+        if(StringUtils.isBlank(tmEstate.getFcbEstateId())){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "恒大楼盘ID为空,无法生成内外网链接");
+        }
+        String sceneLinkPath = "";
+        if(!CollectionUtils.isEmpty(sceneRspList)){
+            for ( PanoInitSceneRsp rsp : sceneRspList) {
+                if(StringUtils.equals("house" , rsp.getType())){
+                    //户型的场景信息
+                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getSceneNum())){
+                        needUpdate = true;
+                        tmHouse.setSceneNum(rsp.getSceneCode());
+                        tmHouse.setSceneTitle(rsp.getSceneTitle());
+                        tmHouse.setInnerVrLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                        tmHouse.setVrLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                    }
+                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
+                        needUpdate = true;
+                        tmHouse.setSceneCover(rsp.getIcon());
+                    }
+                }else if(StringUtils.equals("building" , rsp.getType())){
+                    //楼盘(大场景)的场景信息
+                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getBigSceneNum())){
+                        needUpdate = true;
+                        tmHouse.setBigSceneNum(rsp.getSceneCode());
+                        tmHouse.setBigSceneTitle(rsp.getSceneTitle());
+                        tmHouse.setBigInnerLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                        tmHouse.setBigOuterLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                    }
+                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
+                        needUpdate = true;
+                        tmHouse.setBigSceneCover(rsp.getIcon());
+                    }
+                }else if(StringUtils.equals("garden" , rsp.getType())){
+                    //园林类型场景信息
+                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getGardensSceneNum())){
+                        needUpdate = true;
+                        tmHouse.setGardensSceneNum(rsp.getSceneCode());
+                        tmHouse.setGardensSceneTitle(rsp.getSceneTitle());
+                        tmHouse.setGardensInnerLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                        tmHouse.setGardensOuterLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
+                    }
+                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
+                        needUpdate = true;
+                        tmHouse.setGardensCover(rsp.getIcon());
+                    }
+                }
+
+            }
+        }
+        if(needUpdate){
+            if(!updateHouse(tmHouse)){
+                return null;
+            }
+        }
+        return tmHouse;
+    }
+
     public List<TmHouse> getListByEstate(String estateId){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);

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


src/main/java/fcb/project/manager/base/utils/DataUtils.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/DataUtils.java


src/main/java/fcb/project/manager/base/utils/FcbUtils.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/FcbUtils.java


src/main/java/fcb/project/manager/base/utils/LogoConfig.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/LogoConfig.java


src/main/java/fcb/project/manager/base/utils/QRCodeUtils.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/QRCodeUtils.java


src/main/java/fcb/project/manager/base/utils/RedisServiceUtils.java → fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/RedisServiceUtils.java


src/main/java/fcb/project/manager/core/controller/ApiQueryHouseController.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/ApiQueryHouseController.java


src/main/java/fcb/project/manager/core/controller/AuditController.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/AuditController.java


src/main/java/fcb/project/manager/core/controller/BaseController.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/BaseController.java


+ 42 - 0
src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -151,6 +151,48 @@ public class HouseManagerController extends BaseController{
                 resultPage.getCurrent(), resultPage.getRecords()));
     }
 
+    @GetMapping("/getShareLinks")
+    @ApiOperation(value = "根据房源ID获取房源所有分享链接")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public Result<Object> getShareLinks(@RequestParam(required = true) String houseId){
+        if(StringUtils.isBlank(houseId)){
+            return Result.failure("房源ID不能为空");
+        }
+        TmHouse tmHouse = tmHouseService.getById(houseId);
+        if(null == tmHouse || tmHouse.getIsDelete().compareTo(1) == 0){
+            return Result.failure("房源不存在");
+        }
+        List<PanoInitSceneRsp> sceneRspList  = panoService.getAllTypeSceneNums(houseId , getToken());
+        tmHouse = tmHouseService.updateSceneInfo(sceneRspList , tmHouse);
+        if(null == tmHouse){
+            return Result.failure("获取场景分享链接失败");
+        }
+        Map<String , Object> resultMap = new HashMap<>();
+        //户型场景
+        resultMap.put("sceneNum" , tmHouse.getSceneNum());
+        resultMap.put("sceneCover" , tmHouse.getSceneCover());
+        resultMap.put("sceneTitle" , tmHouse.getSceneTitle());
+        resultMap.put("sceneInnerLink" , tmHouse.getInnerVrLink());
+        resultMap.put("sceneOuterLink" , tmHouse.getVrLink());
+
+        //园林场景
+        resultMap.put("gardensSceneNum" , tmHouse.getGardensSceneNum());
+        resultMap.put("gardensSceneCover" , tmHouse.getGardensCover());
+        resultMap.put("gardensSceneTitle" , tmHouse.getGardensSceneTitle());
+        resultMap.put("gardensSceneInnerLink" , tmHouse.getGardensInnerLink());
+        resultMap.put("gardensSceneOuterLink" , tmHouse.getGardensOuterLink());
+
+        //楼盘大场景场景
+        resultMap.put("bigSceneNum" , tmHouse.getBigSceneNum());
+        resultMap.put("bigSceneCover" , tmHouse.getBigSceneCover());
+        resultMap.put("bigSceneTitle" , tmHouse.getBigSceneTitle());
+        resultMap.put("bigSceneInnerLink" , tmHouse.getBigInnerLink());
+        resultMap.put("bigSceneOuterLink" , tmHouse.getBigOuterLink());
+        return Result.success(resultMap);
+    }
+
     @GetMapping("/getQrImage")
     @ApiOperation(value = "根据房源ID获取房源分享二维码")
     @ApiImplicitParams({

src/main/java/fcb/project/manager/core/controller/OperationController.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/OperationController.java


src/main/java/fcb/project/manager/core/controller/ProjectController.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/ProjectController.java


+ 3 - 0
src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java

@@ -32,4 +32,7 @@ public interface PanoFeign {
     @GetMapping("/fcb/pano/scene/getIndex/{houseId}")
     public CommonRspBean getOneVrlink(@PathVariable String houseId , @RequestHeader(name = "token") String token);
 
+    @GetMapping("/fcb/pano/init/list/{houseId}")
+    public CommonRspBean getAllTypeSceneNums(@PathVariable String houseId , @RequestHeader(name = "token") String token);
+
 }

src/main/java/fcb/project/manager/core/feignInterfaces/SceneFeign.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/SceneFeign.java


src/main/java/fcb/project/manager/core/feignInterfaces/UserFeign.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/UserFeign.java


+ 8 - 0
src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/PanoFeignFallBack.java

@@ -53,4 +53,12 @@ public class PanoFeignFallBack implements PanoFeign {
         commonRspBean.setCode(-1);
         return commonRspBean;
     }
+
+    @Override
+    public CommonRspBean getAllTypeSceneNums(String houseId, String token) {
+        CommonRspBean commonRspBean = new CommonRspBean();
+        commonRspBean.setMsg("服务超时");
+        commonRspBean.setCode(-1);
+        return commonRspBean;
+    }
 }

src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/SceneFeignFallBack.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/SceneFeignFallBack.java


src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/UserFeignFallBack.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/UserFeignFallBack.java


src/main/java/fcb/project/manager/core/rocketmqConsumer/AsyncWriteDbConsumerListener.java → fcb-project-manager-core/src/main/java/fcb/project/manager/core/rocketmqConsumer/AsyncWriteDbConsumerListener.java


src/main/resources/mybatis/mappers/TmApiHouseInfoMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiHouseInfoMapper.xml


src/main/resources/mybatis/mappers/TmApiHouseRecommendMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiHouseRecommendMapper.xml


src/main/resources/mybatis/mappers/TmApiRoomIdLogMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmApiRoomIdLogMapper.xml


src/main/resources/mybatis/mappers/TmAuditMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmAuditMapper.xml


src/main/resources/mybatis/mappers/TmEstateMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml


src/main/resources/mybatis/mappers/TmHouseMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmHouseMapper.xml


src/main/resources/mybatis/mappers/TmOperationMapper.xml → fcb-project-manager-core/src/main/resources/mybatis/mappers/TmOperationMapper.xml


+ 16 - 42
pom.xml

@@ -5,14 +5,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fcb.manager</groupId>
-    <artifactId>fcb.manager</artifactId>
+    <artifactId>fcb-project-manager-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
     <description>房车宝管理后台综合管理微服务</description>
 
+    <packaging>pom</packaging>
 
-    <!--<packaging>jar</packaging>-->
-    <packaging>war</packaging>
-
+    <modules>
+        <module>fcb-project-application</module>
+        <module>fcb-project-manager-core</module>
+    </modules>
 
     <properties>
         <java.version>1.8</java.version>
@@ -31,8 +33,6 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
-
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -53,6 +53,7 @@
     </dependencyManagement>
 
 
+
     <dependencies>
         <!-- 引入四维sdk -->
         <dependency>
@@ -180,54 +181,27 @@
     </dependencies>
 
 
-
     <build>
-        <finalName>fcb-project-manager</finalName>
-
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <!-- 工程主入口 -->
-                    <mainClass>fcb.project.manager.FcbProjectManagerApplication</mainClass>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
+                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+
 </project>