看房 房源管理

.gitignore

@@ -0,0 +1,398 @@
+house-auth/target/classes/com/ljq/house/auth/context/LoginContextHolder.class
+house-auth/target/classes/com/ljq/house/auth/jwt/JwtFilter.class
+house-auth/target/classes/com/ljq/house/auth/jwt/JwtToken.class
+house-auth/target/classes/com/ljq/house/auth/shiro/FilterConstant.class
+house-auth/target/classes/com/ljq/house/auth/shiro/config/ShiroConfig.class
+house-auth/target/classes/com/ljq/house/auth/shiro/config/ShiroModularRealmAuthenticator.class
+house-auth/target/classes/com/ljq/house/auth/shiro/realm/AppJwtRealm.class
+house-auth/target/classes/com/ljq/house/auth/shiro/realm/UserJwtRealm.class
+house-auth/target/classes/com/ljq/house/auth/shiro/role/LoginType.class
+house-auth/target/classes/com/ljq/house/auth/utils/JwtUtil.class
+house-auth/target/classes/com/ljq/house/auth/utils/SsoUtil.class
+house-auth/target/classes/com/ljq/house/auth/utils/TokenUtils.class
+house-auth/target/classes/com/ljq/house/auth/utils/aes/AES.class
+house-auth/target/classes/com/ljq/house/auth/utils/aes/WXCore.class
+house-auth/target/classes/com/ljq/house/auth/utils/aes/WxPKCS7Encoder.class
+house-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+house-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+house-biz/src/main/java/com/ljq/house/biz/dao/TmBuyingpointDao.java
+house-biz/src/main/java/com/ljq/house/biz/dao/TmEstateDao.java
+house-biz/src/main/java/com/ljq/house/biz/model/TmBuyingpoint.java
+house-biz/src/main/java/com/ljq/house/biz/model/TmEstate.java
+house-biz/src/main/java/com/ljq/house/biz/service/ITmBuyingpointService.java
+house-biz/src/main/java/com/ljq/house/biz/service/ITmEstateService.java
+house-biz/src/main/java/com/ljq/house/biz/service/impl/TmBuyingpointServiceImpl.java
+house-biz/src/main/java/com/ljq/house/biz/service/impl/TmEstateServiceImpl.java
+house-biz/src/main/resources/mapper/TmBuyingpointDao.xml
+house-biz/target/classes/com/ljq/house/biz/config/DruidConfiguration.class
+house-biz/target/classes/com/ljq/house/biz/config/MyBatisPlusConfig.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysAdminRoleDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysDeptDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysMenuDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysRoleDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysRoleDeptDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysRoleMenuDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/SysUserDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmAdminDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmAgencyDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmAgencyUserRelationDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmBuyingpointDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmEstateDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmFeedbackDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmHouseAgencyRelationDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmHouseDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmHouseShareHistoryDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmReadHistoryDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmRegionDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmStoreDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmUserDao.class
+house-biz/target/classes/com/ljq/house/biz/dao/TmUserHouseRelationDao.class
+house-biz/target/classes/com/ljq/house/biz/generator/MysqlGenerator$1.class
+house-biz/target/classes/com/ljq/house/biz/generator/MysqlGenerator$2.class
+house-biz/target/classes/com/ljq/house/biz/generator/MysqlGenerator.class
+house-biz/target/classes/com/ljq/house/biz/model/BaseEntity.class
+house-biz/target/classes/com/ljq/house/biz/model/ImRequestVo.class
+house-biz/target/classes/com/ljq/house/biz/model/LoginVo.class
+house-biz/target/classes/com/ljq/house/biz/model/RegionVo.class
+house-biz/target/classes/com/ljq/house/biz/model/Result.class
+house-biz/target/classes/com/ljq/house/biz/model/SysAdminRole.class
+house-biz/target/classes/com/ljq/house/biz/model/SysDept.class
+house-biz/target/classes/com/ljq/house/biz/model/SysMenu.class
+house-biz/target/classes/com/ljq/house/biz/model/SysRole.class
+house-biz/target/classes/com/ljq/house/biz/model/SysRoleDept.class
+house-biz/target/classes/com/ljq/house/biz/model/SysRoleMenu.class
+house-biz/target/classes/com/ljq/house/biz/model/SysUser.class
+house-biz/target/classes/com/ljq/house/biz/model/TmAdmin.class
+house-biz/target/classes/com/ljq/house/biz/model/TmAgency.class
+house-biz/target/classes/com/ljq/house/biz/model/TmAgencyUserRelation.class
+house-biz/target/classes/com/ljq/house/biz/model/TmBuyingpoint.class
+house-biz/target/classes/com/ljq/house/biz/model/TmEstate.class
+house-biz/target/classes/com/ljq/house/biz/model/TmFeedback.class
+house-biz/target/classes/com/ljq/house/biz/model/TmHouse.class
+house-biz/target/classes/com/ljq/house/biz/model/TmHouseAgencyRelation.class
+house-biz/target/classes/com/ljq/house/biz/model/TmHouseShareHistory.class
+house-biz/target/classes/com/ljq/house/biz/model/TmReadHistory.class
+house-biz/target/classes/com/ljq/house/biz/model/TmRegion.class
+house-biz/target/classes/com/ljq/house/biz/model/TmStore.class
+house-biz/target/classes/com/ljq/house/biz/model/TmUser.class
+house-biz/target/classes/com/ljq/house/biz/model/TmUserHouseRelation.class
+house-biz/target/classes/com/ljq/house/biz/model/Tree.class
+house-biz/target/classes/com/ljq/house/biz/model/UserReqVo.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysDeptService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysMenuService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysRoleDeptService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysRoleMenuService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysRoleService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysUserRoleService.class
+house-biz/target/classes/com/ljq/house/biz/service/ISysUserService.class
+house-biz/target/classes/com/ljq/house/biz/service/ITmBuyingpointService.class
+house-biz/target/classes/com/ljq/house/biz/service/ITmEstateService.class
+house-biz/target/classes/com/ljq/house/biz/service/ITmStoreService.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysDeptServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysMenuServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysRoleDeptServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysRoleMenuServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysRoleServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysUserRoleServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/SysUserServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/TmBuyingpointServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/TmEstateServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/service/impl/TmStoreServiceImpl.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/AdminRegisterVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/DeleteRequestVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/HouseAttachAgencyChange.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/HouseAttachAgencyVO.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/RequestScene.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/TmBuyingpointReqVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/request/TmEstateReqVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/HouseAgencyRelationVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/ResponseHouse.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/TmAgencyRspVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/TmBuyingpoint.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/TmBuyingpointRspVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/response/TmEstateRspVo.class
+house-biz/target/classes/com/ljq/house/biz/vo/util/IdStarterEnum2.class
+house-biz/target/classes/com/ljq/house/biz/vo/util/Page.class
+house-biz/target/classes/com/ljq/house/biz/vo/util/UUidGenerator2.class
+house-biz/target/classes/mapper/SysAdminRoleDao.xml
+house-biz/target/classes/mapper/SysDeptDao.xml
+house-biz/target/classes/mapper/SysMenuDao.xml
+house-biz/target/classes/mapper/SysRoleDao.xml
+house-biz/target/classes/mapper/SysRoleDeptDao.xml
+house-biz/target/classes/mapper/SysRoleMenuDao.xml
+house-biz/target/classes/mapper/SysUserDao.xml
+house-biz/target/classes/mapper/TmAdminMapper.xml
+house-biz/target/classes/mapper/TmAgencyMapper.xml
+house-biz/target/classes/mapper/TmAgencyUserRelationMapper.xml
+house-biz/target/classes/mapper/TmBuyingpointDao.xml
+house-biz/target/classes/mapper/TmEstateDao.xml
+house-biz/target/classes/mapper/TmFeedbackMapper.xml
+house-biz/target/classes/mapper/TmHouseAgencyRelationMapper.xml
+house-biz/target/classes/mapper/TmHouseMapper.xml
+house-biz/target/classes/mapper/TmHouseShareHistoryMapper.xml
+house-biz/target/classes/mapper/TmReadHistoryMapper.xml
+house-biz/target/classes/mapper/TmRegionMapper.xml
+house-biz/target/classes/mapper/TmStoreDao.xml
+house-biz/target/classes/mapper/TmUserHouseRelationMapper.xml
+house-biz/target/classes/mapper/TmUserMapper.xml
+house-biz/target/classes/mybatis/mybatis-config.xml
+house-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+house-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+house-biz/target/test-classes/com/ljq/house/biz/TestExample.class
+house-common/target/classes/com/ljq/house/common/data/AccessTokenModel.class
+house-common/target/classes/com/ljq/house/common/utils/JsonUtils.class
+house-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+house-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+house-common/target/test-classes/com/ljq/house/common/TestExample.class
+house-im/target/classes/com/ljq/house/im/component/imListener.class
+house-im/target/classes/com/ljq/house/im/controller/ImController.class
+house-im/target/classes/com/ljq/house/im/entity/ImCategory.class
+house-im/target/classes/com/ljq/house/im/entity/ImFriend.class
+house-im/target/classes/com/ljq/house/im/entity/ImGroup.class
+house-im/target/classes/com/ljq/house/im/entity/ImGroupUser.class
+house-im/target/classes/com/ljq/house/im/entity/ImMessage.class
+house-im/target/classes/com/ljq/house/im/entity/ImOfflineMessage.class
+house-im/target/classes/com/ljq/house/im/entity/ImSession.class
+house-im/target/classes/com/ljq/house/im/entity/ImUser.class
+house-im/target/classes/com/ljq/house/im/entity/Res.class
+house-im/target/classes/com/ljq/house/im/entity/SysFile.class
+house-im/target/classes/com/ljq/house/im/entity/dto/ImMessageDTO.class
+house-im/target/classes/com/ljq/house/im/entity/dto/ImUserDTO.class
+house-im/target/classes/com/ljq/house/im/enums/ImMessageReadStatus.class
+house-im/target/classes/com/ljq/house/im/enums/OffLineMessageStatus.class
+house-im/target/classes/com/ljq/house/im/mapper/ImCategoryMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImFriendMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImGroupMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImGroupUserMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImMessageMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImOfflineMessageMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImSessionMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/ImUserMapper.class
+house-im/target/classes/com/ljq/house/im/mapper/SysFileMapper.class
+house-im/target/classes/com/ljq/house/im/service/FileService.class
+house-im/target/classes/com/ljq/house/im/service/ImService.class
+house-im/target/classes/com/ljq/house/im/service/SpringContextHolder.class
+house-im/target/classes/com/ljq/house/im/websocket/WebsocketConfig.class
+house-im/target/classes/com/ljq/house/im/websocket/WebSocketServer.class
+house-im/target/classes/mapper/ImGroupUserMapper.xml
+house-im/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+house-im/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+house-web/target/classes/application.properties
+house-web/target/classes/application-dev.properties
+house-web/target/classes/application-prod.properties
+house-web/target/classes/log4j2.xml
+house-web/target/classes/com/ljq/house/HouseApplication.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmAdminController.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmAgencyController.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmEstateController.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmHouseController.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmRegionController.class
+house-web/target/classes/com/ljq/house/admin/controller/AdminTmStoreController.class
+house-web/target/classes/com/ljq/house/admin/controller/SysDeptController.class
+house-web/target/classes/com/ljq/house/admin/controller/SysMenuController.class
+house-web/target/classes/com/ljq/house/admin/controller/SysRoleController.class
+house-web/target/classes/com/ljq/house/admin/controller/SysUserController.class
+house-web/target/classes/com/ljq/house/app/controller/AppAgencyController.class
+house-web/target/classes/com/ljq/house/app/controller/AppFeedbackController.class
+house-web/target/classes/com/ljq/house/app/controller/AppRandomCodeController.class
+house-web/target/classes/com/ljq/house/app/controller/AppTmRegionController.class
+house-web/target/classes/com/ljq/house/app/controller/AppTmUserController.class
+house-web/target/house_web_01/META-INF/MANIFEST.MF
+house-web/target/house_web_01/WEB-INF/classes/application.properties
+house-web/target/house_web_01/WEB-INF/classes/application-dev.properties
+house-web/target/house_web_01/WEB-INF/classes/application-prod.properties
+house-web/target/house_web_01/WEB-INF/classes/log4j2.xml
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/HouseApplication.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmAdminController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmAgencyController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmEstateController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmHouseController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmRegionController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/AdminTmStoreController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/SysDeptController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/SysMenuController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/SysRoleController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/admin/controller/SysUserController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/app/controller/AppAgencyController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/app/controller/AppFeedbackController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/app/controller/AppRandomCodeController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/app/controller/AppTmRegionController.class
+house-web/target/house_web_01/WEB-INF/classes/com/ljq/house/app/controller/AppTmUserController.class
+house-web/target/house_web_01/WEB-INF/lib/activation-1.1.jar
+house-web/target/house_web_01/WEB-INF/lib/aliyun-java-sdk-core-3.4.0.jar
+house-web/target/house_web_01/WEB-INF/lib/aliyun-java-sdk-ecs-4.2.0.jar
+house-web/target/house_web_01/WEB-INF/lib/aliyun-java-sdk-ram-3.0.0.jar
+house-web/target/house_web_01/WEB-INF/lib/aliyun-java-sdk-sts-3.0.0.jar
+house-web/target/house_web_01/WEB-INF/lib/aliyun-sdk-oss-3.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/ant-1.8.2.jar
+house-web/target/house_web_01/WEB-INF/lib/ant-launcher-1.8.2.jar
+house-web/target/house_web_01/WEB-INF/lib/artoolkitplus-2.3.1-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/aspectjweaver-1.9.3.jar
+house-web/target/house_web_01/WEB-INF/lib/bcprov-jdk16-1.46.jar
+house-web/target/house_web_01/WEB-INF/lib/byte-buddy-1.10.8.jar
+house-web/target/house_web_01/WEB-INF/lib/classmate-1.5.1.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-beanutils-1.9.3.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-codec-1.13.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-collections-3.2.2.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-collections4-4.1.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-io-2.4.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-lang3-3.9.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-logging-1.2.jar
+house-web/target/house_web_01/WEB-INF/lib/commons-pool2-2.7.0.jar
+house-web/target/house_web_01/WEB-INF/lib/curvesapi-1.04.jar
+house-web/target/house_web_01/WEB-INF/lib/disruptor-3.3.6.jar
+house-web/target/house_web_01/WEB-INF/lib/druid-1.0.28.jar
+house-web/target/house_web_01/WEB-INF/lib/ezmorph-1.0.6.jar
+house-web/target/house_web_01/WEB-INF/lib/fastjson-1.2.49.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-android-arm.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-android-arm64.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-android-x86.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-android-x86_64.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-linux-armhf.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-linux-ppc64le.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-linux-x86.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-linux-x86_64.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-macosx-x86_64.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-windows-x86.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-4.0.2-1.4.3-windows-x86_64.jar
+house-web/target/house_web_01/WEB-INF/lib/ffmpeg-platform-4.0.2-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/flandmark-1.07-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/flycapture-2.11.3.121-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/freemarker-2.3.28.jar
+house-web/target/house_web_01/WEB-INF/lib/guava-20.0.jar
+house-web/target/house_web_01/WEB-INF/lib/HdrHistogram-2.1.11.jar
+house-web/target/house_web_01/WEB-INF/lib/hibernate-validator-6.0.18.Final.jar
+house-web/target/house_web_01/WEB-INF/lib/HikariCP-3.4.2.jar
+house-web/target/house_web_01/WEB-INF/lib/house-auth-0.0.1-SNAPSHOT.jar
+house-web/target/house_web_01/WEB-INF/lib/house-biz-0.0.1-SNAPSHOT.jar
+house-web/target/house_web_01/WEB-INF/lib/house-common-0.0.1-SNAPSHOT.jar
+house-web/target/house_web_01/WEB-INF/lib/house-im-0.0.1-SNAPSHOT.jar
+house-web/target/house_web_01/WEB-INF/lib/httpclient-4.5.11.jar
+house-web/target/house_web_01/WEB-INF/lib/httpcore-4.4.13.jar
+house-web/target/house_web_01/WEB-INF/lib/hutool-all-5.2.3.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-annotations-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-core-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-databind-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-datatype-jdk8-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-datatype-jsr310-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jackson-module-parameter-names-2.10.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jakarta.activation-1.2.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar
+house-web/target/house_web_01/WEB-INF/lib/jakarta.mail-1.6.4.jar
+house-web/target/house_web_01/WEB-INF/lib/jakarta.validation-api-2.0.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jasypt-1.9.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jasypt-spring-boot-2.1.0.jar
+house-web/target/house_web_01/WEB-INF/lib/jasypt-spring-boot-starter-2.1.0.jar
+house-web/target/house_web_01/WEB-INF/lib/javacpp-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/javacv-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/java-jwt-3.4.0.jar
+house-web/target/house_web_01/WEB-INF/lib/javassist-3.21.0-GA.jar
+house-web/target/house_web_01/WEB-INF/lib/javax.mail-1.6.2.jar
+house-web/target/house_web_01/WEB-INF/lib/jboss-logging-3.4.1.Final.jar
+house-web/target/house_web_01/WEB-INF/lib/jdom-1.1.jar
+house-web/target/house_web_01/WEB-INF/lib/jedis-3.1.0.jar
+house-web/target/house_web_01/WEB-INF/lib/jettison-1.1.jar
+house-web/target/house_web_01/WEB-INF/lib/jjwt-0.6.0.jar
+house-web/target/house_web_01/WEB-INF/lib/json-lib-2.2.3-jdk15.jar
+house-web/target/house_web_01/WEB-INF/lib/jsoup-1.8.3.jar
+house-web/target/house_web_01/WEB-INF/lib/jsqlparser-1.0.jar
+house-web/target/house_web_01/WEB-INF/lib/jul-to-slf4j-1.7.30.jar
+house-web/target/house_web_01/WEB-INF/lib/LatencyUtils-2.0.3.jar
+house-web/target/house_web_01/WEB-INF/lib/leptonica-1.76.0-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/libdc1394-2.2.5-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/libfreenect-0.5.3-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/libfreenect2-0.2.0-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/librealsense-1.12.1-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/log4j-api-2.12.1.jar
+house-web/target/house_web_01/WEB-INF/lib/log4j-core-2.12.1.jar
+house-web/target/house_web_01/WEB-INF/lib/log4j-jul-2.12.1.jar
+house-web/target/house_web_01/WEB-INF/lib/log4j-slf4j-impl-2.12.1.jar
+house-web/target/house_web_01/WEB-INF/lib/lombok-1.18.12.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-base-1.0.1.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-core-1.0.2.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-extra-1.0.1.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-spring-1.0.1.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-spring-boot-autoconfigure-2.0.2.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-spring-boot-starter-2.0.2.jar
+house-web/target/house_web_01/WEB-INF/lib/mapper-weekend-1.1.3.jar
+house-web/target/house_web_01/WEB-INF/lib/mapstruct-1.2.0.Final.jar
+house-web/target/house_web_01/WEB-INF/lib/micrometer-core-1.3.5.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-3.5.3.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-annotation-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-boot-starter-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-core-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-extension-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-plus-generator-3.3.1.tmp.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-spring-2.0.3.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-spring-boot-autoconfigure-2.1.1.jar
+house-web/target/house_web_01/WEB-INF/lib/mybatis-spring-boot-starter-2.1.1.jar
+house-web/target/house_web_01/WEB-INF/lib/mysql-connector-java-8.0.19.jar
+house-web/target/house_web_01/WEB-INF/lib/opencv-3.4.3-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/pagehelper-5.1.4.jar
+house-web/target/house_web_01/WEB-INF/lib/pagehelper-spring-boot-autoconfigure-1.2.5.jar
+house-web/target/house_web_01/WEB-INF/lib/pagehelper-spring-boot-starter-1.2.5.jar
+house-web/target/house_web_01/WEB-INF/lib/persistence-api-1.0.jar
+house-web/target/house_web_01/WEB-INF/lib/poi-3.17.jar
+house-web/target/house_web_01/WEB-INF/lib/poi-ooxml-3.17.jar
+house-web/target/house_web_01/WEB-INF/lib/poi-ooxml-schemas-3.17.jar
+house-web/target/house_web_01/WEB-INF/lib/reflections-0.9.11.jar
+house-web/target/house_web_01/WEB-INF/lib/shiro-core-1.3.2.jar
+house-web/target/house_web_01/WEB-INF/lib/shiro-spring-1.3.2.jar
+house-web/target/house_web_01/WEB-INF/lib/shiro-web-1.3.2.jar
+house-web/target/house_web_01/WEB-INF/lib/slf4j-api-1.7.30.jar
+house-web/target/house_web_01/WEB-INF/lib/snakeyaml-1.25.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-aop-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-beans-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-actuator-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-actuator-autoconfigure-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-autoconfigure-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-actuator-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-data-redis-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-jdbc-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-json-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-log4j2-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-mail-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-validation-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-web-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-boot-starter-websocket-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-context-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-context-support-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-core-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-data-commons-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-data-keyvalue-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-data-redis-2.2.5.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-expression-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-core-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-schema-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-spi-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-spring-web-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-swagger2-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-swagger-common-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/springfox-swagger-ui-2.8.0.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-jcl-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-jdbc-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-messaging-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-oxm-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-plugin-core-1.2.0.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-tx-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-web-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-webmvc-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/spring-websocket-5.2.4.RELEASE.jar
+house-web/target/house_web_01/WEB-INF/lib/stax-api-1.0.1.jar
+house-web/target/house_web_01/WEB-INF/lib/surefire-api-2.22.1.jar
+house-web/target/house_web_01/WEB-INF/lib/surefire-booter-2.22.1.jar
+house-web/target/house_web_01/WEB-INF/lib/surefire-logger-api-2.22.1.jar
+house-web/target/house_web_01/WEB-INF/lib/swagger-annotations-1.5.14.jar
+house-web/target/house_web_01/WEB-INF/lib/swagger-models-1.5.14.jar
+house-web/target/house_web_01/WEB-INF/lib/tesseract-4.0.0-rc2-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/velocity-engine-core-2.1.jar
+house-web/target/house_web_01/WEB-INF/lib/videoinput-0.200-1.4.3.jar
+house-web/target/house_web_01/WEB-INF/lib/xmlbeans-2.6.0.jar
+house-web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+house-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+house-web/target/test-classes/com/ljq/house/app/JasyptTest.class

.idea/artifacts/house_web_war_exploded.xml

@@ -148,15 +148,27 @@
           <element id="library" level="project" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.3" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:2.0.3" />
+          <element id="library" level="project" name="Maven: org.freemarker:freemarker:2.3.28" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1.tmp" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus:3.3.1.tmp" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-generator:3.3.1.tmp" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1.tmp" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-core:3.3.1.tmp" />
           <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1.tmp" />
-          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:3.1" />
           <element id="library" level="project" name="Maven: org.apache.velocity:velocity-engine-core:2.1" />
           <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.30" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-core:1.0.2" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-base:1.0.1" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-weekend:1.1.3" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-spring:1.0.1" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-extra:1.0.1" />
+          <element id="library" level="project" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" />
+          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" />
+          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" />
+          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper:5.1.4" />
+          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:1.0" />
+          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.9.3" />
           <element id="library" level="project" name="Maven: org.projectlombok:lombok:1.18.12" />
           <element id="library" level="project" name="Maven: io.springfox:springfox-swagger2:2.8.0" />
           <element id="library" level="project" name="Maven: io.swagger:swagger-annotations:1.5.14" />

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/encodings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/SpringbootAdmin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/house-auth/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/house-biz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/house-common/src/main/java" charset="UTF-8" />

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:3.1">
+  <library name="Maven: com.github.jsqlparser:jsqlparser:1.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/3.1/jsqlparser-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/3.1/jsqlparser-3.1-javadoc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/3.1/jsqlparser-3.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper:5.1.4">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjweaver:1.9.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/aspectj/aspectjweaver/1.9.3/aspectjweaver-1.9.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/aspectj/aspectjweaver/1.9.3/aspectjweaver-1.9.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/aspectj/aspectjweaver/1.9.3/aspectjweaver-1.9.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.freemarker:freemarker:2.3.28">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/freemarker/freemarker/2.3.28/freemarker-2.3.28.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_base_1_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-base:1.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-base/1.0.1/mapper-base-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-base/1.0.1/mapper-base-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-base/1.0.1/mapper-base-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_core_1_0_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-core:1.0.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-core/1.0.2/mapper-core-1.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-core/1.0.2/mapper-core-1.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-core/1.0.2/mapper-core-1.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_extra_1_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-extra:1.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-extra/1.0.1/mapper-extra-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-extra/1.0.1/mapper-extra-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-extra/1.0.1/mapper-extra-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_spring_1_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-spring:1.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring/1.0.1/mapper-spring-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring/1.0.1/mapper-spring-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring/1.0.1/mapper-spring-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_0_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-autoconfigure/2.0.2/mapper-spring-boot-autoconfigure-2.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-autoconfigure/2.0.2/mapper-spring-boot-autoconfigure-2.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-autoconfigure/2.0.2/mapper-spring-boot-autoconfigure-2.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_0_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-starter/2.0.2/mapper-spring-boot-starter-2.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-starter/2.0.2/mapper-spring-boot-starter-2.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-spring-boot-starter/2.0.2/mapper-spring-boot-starter-2.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: tk.mybatis:mapper-weekend:1.1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-weekend/1.1.3/mapper-weekend-1.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-weekend/1.1.3/mapper-weekend-1.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/tk/mybatis/mapper-weekend/1.1.3/mapper-weekend-1.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

house-biz/src/main/java/com/ljq/house/biz/generator/MysqlGenerator.java

@@ -1,61 +1,176 @@
-
 package com.ljq.house.biz.generator;
 
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * @author abnerhou
- * @date 2020/5/22 14:16
- * @desciption
+ * @ClassName: MysqlGenerator
+ * @Description:https://blog.csdn.net/u010559460/article/details/103945985/
+ * https://www.cnblogs.com/wyrlzy/p/12033912.html
+ * @Author: BYP <502955177@qq.com>
+ * @Date: 2020/9/24 14:36
+ * @Copyright: 2019 www.tydic.com Inc. All rights reserved.
+ * 注意：本内容仅限于弘毅天承信息技术股份有限公司内部传阅，禁止外泄以及用于其他的商业目
  */
-
-
 public class MysqlGenerator {
 
+    final static String  dirPath = "E:\\project\\house_usa\\house-biz\\src\\main\\java";
+
+    /**
+     * <p>
+     * MySQL 生成演示
+     * </p>
+     */
     public static void main(String[] args) {
         AutoGenerator mpg = new AutoGenerator();
+        // 选择 freemarker 引擎，默认 Veloctiy
+        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
 
+        // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir(projectPath + "/house-biz");
-        gc.setAuthor("abner");   // 作者
-        gc.setOpen(false);      //生成代码后是否打开文件夹
-//        gc.setServiceName("%sService");  // 设置Service接口生成名称,这样生成接口前面就不会有 I
+        gc.setOutputDir(dirPath);
+        gc.setAuthor("anthor");
+        gc.setFileOverride(true); //是否覆盖
+        gc.setActiveRecord(true);// 不需要ActiveRecord特性的请改为false
+        gc.setEnableCache(false);// XML 二级缓存
+        gc.setBaseResultMap(true);// XML ResultMap
+        gc.setBaseColumnList(true);// XML columList
+
+        // 自定义文件命名，注意 %s 会自动填充表实体属性！
+        // gc.setMapperName("%sDao");
+        // gc.setXmlName("%sMapper");
+        // gc.setServiceName("MP%sService");
+        // gc.setServiceImplName("%sServiceDiy");
+        // gc.setControllerName("%sAction");
         mpg.setGlobalConfig(gc);
 
+        // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://39.108.220.65:3306/4dzhaofang?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDbType(DbType.MYSQL);
+        dsc.setTypeConvert(new MySqlTypeConvert(){
+            // 自定义数据库表字段类型转换【可选】
+//            public DbColumnType processTypeConvert(String fieldType) {
+//                System.out.println("转换类型：" + fieldType);
+//                // 注意！！processTypeConvert 存在默认类型转换，如果不是你要的效果请自定义返回、非如下直接返回。
+//                return super.processTypeConvert(fieldType);
+//            }
+        });
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("4dkk2020test%");
+        dsc.setUrl("jdbc:mysql://120.25.146.52:3306/vrhouseusa?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8");
         mpg.setDataSource(dsc);
 
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        // strategy.setCapitalMode(true);// 全局大写命名 ORACLE 注意
+
+
+        //strategy.setTablePrefix(new String[] { "tb_", "sys_" });// 此处可以修改为您的表前缀
+
+
+        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
+         strategy.setInclude(new String[] { "tm_estate","tm_buyingpoint" }); // 需要生成的表
+//        strategy.setExclude(new String[]{"sys_dict","tb_goods"}); // 排除生成的表
+        // 自定义实体父类
+        // strategy.setSuperEntityClass("com.baomidou.demo.TestEntity");
+        // 自定义实体，公共字段
+        // strategy.setSuperEntityColumns(new String[] { "test_id", "age" });
+        // 自定义 mapper 父类
+        // strategy.setSuperMapperClass("com.baomidou.demo.TestMapper");
+        // 自定义 service 父类
+        // strategy.setSuperServiceClass("com.baomidou.demo.TestService");
+        // 自定义 service 实现类父类
+        // strategy.setSuperServiceImplClass("com.baomidou.demo.TestServiceImpl");
+        // 自定义 controller 父类
+        // strategy.setSuperControllerClass("com.baomidou.demo.TestController");
+        // 【实体】是否生成字段常量（默认 false）
+        // public static final String ID = "test_id";
+        // strategy.setEntityColumnConstant(true);
+        // 【实体】是否为构建者模型（默认 false）
+        // public User setName(String name) {this.name = name; return this;}
+        strategy.setEntityBuilderModel(true);
+        mpg.setStrategy(strategy);
+
         // 包配置
         PackageConfig pc = new PackageConfig();
-        pc.setModuleName("biz"); // 模块名称, 这里可以根据不同模块来写
-        pc.setParent("src.main.java.com.ljq.house"); // 父包名
+        pc.setParent("com.ljq.house.biz");
+        //pc.setModuleName("good");
+        pc.setController("controller");
+        pc.setEntity("model");
+        pc.setMapper("dao");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+        pc.setXml("xml");
+
         mpg.setPackageInfo(pc);
 
+        // 注入自定义配置，可以在 VM 中使用 cfg.abc 【可无】
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("abc", this.getConfig().getGlobalConfig().getAuthor() + "-mp");
+                this.setMap(map);
+            }
+        };
 
+        // 自定义 xxList.jsp 生成
+        List<FileOutConfig> focList = new ArrayList<FileOutConfig>();
+/*        focList.add(new FileOutConfig("/template/list.jsp.vm") {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输入文件名称
+                return "D://my_" + tableInfo.getEntityName() + ".jsp";
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);*/
 
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-//        strategy.setSuperControllerClass("com.lcy.demo.sys.controller.BaseController");
-        strategy.setSuperEntityClass("com.ljq.house.biz.model");
-        strategy.setSuperMapperClass("com.ljq.house.biz.dao");
-        strategy.setEntityLombokModel(true);
-        strategy.setInclude("sys_dept","sys_role","sys_menu","sys_user","sys_role_dept","sys_role_menu","sys_user_role");  // 如果要生成多个,这里可以传入String[]
-        mpg.setStrategy(strategy);
-//        mpg.execute();
-        System.out.println("代码自动生成执行完成");
+        // 调整 xml 生成目录演示
+/*        focList.add(new FileOutConfig("/templates/mapper.xml.vm") {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return dirPath + tableInfo.getEntityName() + "Mapper.xml";
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        */
+        mpg.setCfg(cfg);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+/*        TemplateConfig tc = new TemplateConfig();
+        tc.setXml(null);
+        mpg.setTemplate(tc);*/
+
+        // 自定义模板配置，可以 copy 源码 mybatis-plus/src/main/resources/templates 下面内容修改，
+        // 放置自己项目的 src/main/resources/templates 目录下, 默认名称一下可以不配置，也可以自定义模板名称
+        // TemplateConfig tc = new TemplateConfig();
+        // tc.setController("...");
+        // tc.setEntity("...");
+        // tc.setMapper("...");
+        // tc.setXml("...");
+        // tc.setService("...");
+        // tc.setServiceImpl("...");
+        // 如上任何一个模块如果设置 空 OR Null 将不生成该模块。
+        // mpg.setTemplate(tc);
+
+        // 执行生成
+        mpg.execute();
+
+        // 打印注入设置【可无】
+        System.err.println(mpg.getCfg().getMap().get("abc"));
     }
-}
 
+}

house-biz/src/main/java/com/ljq/house/biz/model/TmAgency.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -15,81 +16,43 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel(value = "经纪人对象" , description = "经纪人对象")
+@Table
 public class TmAgency extends BaseEntity implements Serializable {
 
+    @ApiModelProperty(value="id",name="agencyId")
+    private String agencyId;
 
-    @JsonProperty("agency_user_id")
-    private String agencyUserId;
-
-    @ApiModelProperty(value="微信openId",name="wx_open_id",example="dfsdfsfx443vfdsf")
-    @JsonProperty("wx_open_id")
-    private String wxOpenId;
+    @ApiModelProperty(value="头像图片地址",name="avatar",example="http://4dkankan.com/icon.jpg")
+    private String avatar;
 
     @ApiModelProperty(value="名字",name="name",example="张三")
     private String name;
 
-    @ApiModelProperty(value="电话号码",name="phone",example="123454656")
-    private String phone;
-
-    @ApiModelProperty(value="固话",name="tel",example="0756-454656")
-    private String tel;
-
-    @ApiModelProperty(value="邮箱",name="email",example="0756@qq.com")
-    private String email;
-
-    @JsonIgnore
-    @ApiModelProperty(value="密码(MD5之后)",name="passwd",example="fdasfdsaxxefsa")
-    private String passwd;
+    @ApiModelProperty(value="英文名字",name="name",example="zhangsan")
+    private String nameEn;
 
-    @ApiModelProperty(value="头像图片地址",name="avatar",example="http://4dkankan.com/icon.jpg")
-    private String avatar;
+    @ApiModelProperty(value="经纪人身份",name="name",example="zhangsan")
+    private String agencyIdentity;
 
-    @ApiModelProperty(value="经纪公司id",name="agency_id",example="122")
-    @JsonProperty("agency_id")
-    private String agencyId;
-
-    @ApiModelProperty(value="门店地址",name="store",example="金湾店")
-    private String store;
+    @ApiModelProperty(value="联系方式",name="name",example="")
+    private String tel;
 
-    @ApiModelProperty(value="门店Id",name="store_id",example="123")
-    @JsonProperty("store_id")
+    @ApiModelProperty(value="所在门店",name="name",example="")
     private String storeId;
 
-    @ApiModelProperty(value="是否启用 1:启动，0：不启用",name="enable",example="1")
-    private Integer enable;
-
-    @ApiModelProperty(value="是否认证 1:认证，0：未认证",name="auth_state",example="1")
-    @JsonProperty("auth_state")
-    private String authState;
-
-    @ApiModelProperty(value="标签",name="tag",example="金牌经纪人")
-    private String tag;
-
-    @ApiModelProperty(value="经纪人公司名称",name="agency_company_name",example="珠海链家")
-    @JsonProperty("agency_company_name")
-    private String agencyCompanyName;
+    @ApiModelProperty(value="代理公司",name="name",example="")
+    private String agencyCompany;
 
-    @ApiModelProperty(value="半年成交量",name="volume_half_year",example="30")
-    @JsonProperty("volume_half_year")
-    private int volumeHalfYear;
+    @ApiModelProperty(value="执照号码",name="name",example="")
+    private String licenseNumber;
 
-    @ApiModelProperty(value="平均成交周期（天）",name="deal_average_period",example="20.1")
-    @JsonProperty("deal_average_period")
-    private double dealAveragePeriod;
+    @ApiModelProperty(value="支持语言",name="name",example="")
+    private String supportLanguage;
 
-    @ApiModelProperty(value="近30天带看（套）",name="recent_recommend_vrs",example="20.1")
-    @JsonProperty("recent_recommend_vrs")
-    private int recentRecommendVrs;
+    @ApiModelProperty(value="邮箱",name="email",example="0756@qq.com")
+    private String email;
 
-    @ApiModelProperty(value="工作证图片地址",name="work_pass_image",example="http://4dkankan.com/icon.jpg")
-    @JsonProperty("work_pass_image")
+    @ApiModelProperty(value="从业资格证",name="work_pass_image",example="http://4dkankan.com/icon.jpg")
     private String workPassImage;
 
-    private String reserve1;
-
-    private String reserve2;
-
-    @ApiModelProperty(value="经纪人类型",name="type",example="买卖经纪人")
-    private String type;
-
 }

house-biz/src/main/java/com/ljq/house/biz/service/ISysDeptService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysDept;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysMenuService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysMenu;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysRoleDeptService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysRoleDept;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysRoleMenuService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysRoleMenu;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysRoleService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysRole;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysUserRoleService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysAdminRole;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/ISysUserService.java

@@ -1,4 +1,4 @@
-package src.main.java.com.ljq.house.biz.service;
+package com.ljq.house.biz.service;
 
 import com.ljq.house.biz.model.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysDeptServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysDeptDao;
 import com.ljq.house.biz.model.SysDept;
-import src.main.java.com.ljq.house.biz.service.ISysDeptService;
+import com.ljq.house.biz.service.ISysDeptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysMenuServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysMenuDao;
 import com.ljq.house.biz.model.SysMenu;
-import src.main.java.com.ljq.house.biz.service.ISysMenuService;
+import com.ljq.house.biz.service.ISysMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysRoleDeptServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysRoleDeptDao;
 import com.ljq.house.biz.model.SysRoleDept;
-import src.main.java.com.ljq.house.biz.service.ISysRoleDeptService;
+import com.ljq.house.biz.service.ISysRoleDeptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysRoleMenuServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysRoleMenuDao;
 import com.ljq.house.biz.model.SysRoleMenu;
-import src.main.java.com.ljq.house.biz.service.ISysRoleMenuService;
+import com.ljq.house.biz.service.ISysRoleMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysRoleServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysRoleDao;
 import com.ljq.house.biz.model.SysRole;
-import src.main.java.com.ljq.house.biz.service.ISysRoleService;
+import com.ljq.house.biz.service.ISysRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysUserRoleServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysAdminRoleDao;
 import com.ljq.house.biz.model.SysAdminRole;
-import src.main.java.com.ljq.house.biz.service.ISysUserRoleService;
+import com.ljq.house.biz.service.ISysUserRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/service/impl/SysUserServiceImpl.java

@@ -1,8 +1,8 @@
-package src.main.java.com.ljq.house.biz.service.impl;
+package com.ljq.house.biz.service.impl;
 
 import com.ljq.house.biz.dao.SysUserDao;
 import com.ljq.house.biz.model.SysUser;
-import src.main.java.com.ljq.house.biz.service.ISysUserService;
+import com.ljq.house.biz.service.ISysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmBuyingpointReqVo.java

@@ -0,0 +1,70 @@
+package com.ljq.house.biz.vo.request;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业特色
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-03
+ */
+@Data
+public class TmBuyingpointReqVo extends Model<TmBuyingpointReqVo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物业特色id
+     */
+    private String buyingpointId;
+
+    /**
+     * 房源id
+     */
+    private String estateId;
+
+    /**
+     * 房源名称
+     */
+    private String title;
+
+    /**
+     * 物业编号
+     */
+    private String content;
+
+    private String rec_status;
+
+    /**
+     * 创建者id
+     */
+    private String createUserId;
+
+    /**
+     * 创建者部门id
+     */
+    private Long createUserDeptId;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者id
+     */
+    private String updateUserId;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime updateTime;
+
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmEstateReqVo.java

@@ -0,0 +1,37 @@
+package com.ljq.house.biz.vo.request;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+
+@Data
+@Api(description = "")
+public class TmEstateReqVo {
+
+
+    @ApiModelProperty(value = "房源名称")
+    private String estateName;
+
+    @ApiModelProperty(value = "物业编号")
+    private String propertyNumber;
+
+    @ApiModelProperty(value = "每页显示的条目数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "当前显示的页数")
+    private Integer currPage;
+
+    @ApiModelProperty(value = "",hidden = true)
+    private Integer limit;
+
+    @ApiModelProperty(value = "",hidden = true)
+    private Integer offset;
+
+
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmBuyingpoint.java

@@ -0,0 +1,4 @@
+package com.ljq.house.biz.vo.response;
+
+public class TmBuyingpoint {
+}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmBuyingpointRspVo.java

@@ -0,0 +1,70 @@
+package com.ljq.house.biz.vo.response;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业特色
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-03
+ */
+@Data
+public class TmBuyingpointRspVo extends Model<TmBuyingpointRspVo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物业特色id
+     */
+    private String buyingpointId;
+
+    /**
+     * 房源id
+     */
+    private String estateId;
+
+    /**
+     * 房源名称
+     */
+    private String title;
+
+    /**
+     * 物业编号
+     */
+    private String content;
+
+    private String rec_status;
+
+    /**
+     * 创建者id
+     */
+    private String createUserId;
+
+    /**
+     * 创建者部门id
+     */
+    private Long createUserDeptId;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者id
+     */
+    private String updateUserId;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime updateTime;
+
+    
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmEstateRspVo.java

@@ -0,0 +1,14 @@
+package com.ljq.house.biz.vo.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ljq.house.biz.model.TmEstate;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class TmEstateRspVo extends TmEstate {
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/util/IdStarterEnum2.java

@@ -0,0 +1,36 @@
+package com.ljq.house.biz.vo.util;
+
+/**
+ * @author abnerhou
+ * @date 2020/4/22 17:19
+ * @desciption
+ */
+public enum IdStarterEnum2 {
+
+    DEFAULT("1001" ,"默认表id初始值"),
+    USER("1002" ,"用户表id初始值"),
+    AGENCY("1003" ,"经纪人表id初始值"),
+    HOUSE("1004" ,"房屋表id初始值"),
+    ESTATE("1005" ,"小区表id初始值"),
+    CITY("1006" ,"城市表id初始值"),
+    HISTORY("1007" ,"浏览/分享历史表id初始值"),
+
+    ;
+
+    private String starter;
+
+    private String desc;
+
+    IdStarterEnum2(String starter, String desc) {
+        this.starter = starter;
+        this.desc = desc;
+    }
+
+    public String getStarter() {
+        return starter;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

house-biz/src/main/java/com/ljq/house/biz/vo/util/Page.java

@@ -0,0 +1,25 @@
+package com.ljq.house.biz.vo.util;
+
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class Page<T> {
+    //当前页
+    private int currentPage;
+    //当前显示条数
+    private int currentCount;
+
+    //总条数
+    private long totalCount;
+
+
+    //每页显示的数据
+    private List<T> productList = new ArrayList();
+
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/util/UUidGenerator2.java

@@ -0,0 +1,28 @@
+package com.ljq.house.biz.vo.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author abnerhou
+ * @date 2020/4/22 16:39
+ * @desciption
+ */
+@Component
+public class UUidGenerator2 {
+
+    Logger logger = LoggerFactory.getLogger(UUidGenerator2.class);
+
+    public static String generatorUuid(String starter) {
+        StringBuilder stringBuilder = new StringBuilder();
+        String tmp = UUID.randomUUID().toString().replace("-", "");
+        tmp = tmp.substring(tmp.length() - 15);
+        stringBuilder.append(starter).append(tmp).append((new Date()).getTime());
+        return stringBuilder.toString();
+    }
+
+}

house-biz/src/main/resources/mapper/TmEstateDao.xml

@@ -0,0 +1,180 @@
+<?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.ljq.house.biz.dao.TmEstateDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ljq.house.biz.model.TmEstate">
+        <id column="estate_id" property="estateId" />
+        <result column="estate_name" property="estateName" />
+        <result column="property_number" property="propertyNumber" />
+        <result column="total_price" property="totalPrice" />
+        <result column="address" property="address" />
+        <result column="bedroom_amount" property="bedroomAmount" />
+        <result column="showerroom_amount" property="showerroomAmount" />
+        <result column="building_area" property="buildingArea" />
+        <result column="floor_space" property="floorSpace" />
+        <result column="construction_year" property="constructionYear" />
+        <result column="unit_price" property="unitPrice" />
+        <result column="house_label" property="houseLabel" />
+        <result column="ancillary_facility" property="ancillaryFacility" />
+        <result column="is_agent_relation" property="isAgentRelation" />
+        <result column="agent_id" property="agentId" />
+        <result column="sell_type" property="sellType" />
+        <result column="scene_address" property="sceneAddress" />
+        <result column="ADDITIONS_IMAGES" property="additionsImages" />
+        <result column="cover_image" property="coverImage" />
+        <result column="hourse_image" property="hourseImage" />
+        <result column="video_cover_image" property="videoCoverImage" />
+        <result column="introduce_video" property="introduceVideo" />
+        <result column="introduce_video_desc" property="introduceVideoDesc" />
+        <result column="title" property="title" />
+        <result column="content_introduce" property="contentIntroduce" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_dept_id" property="createUserDeptId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_user_id" property="updateUserId" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        estate_id, estate_name, property_number, total_price, address, bedroom_amount, showerroom_amount, building_area, floor_space, construction_year, unit_price, house_label, ancillary_facility, is_agent_relation, agent_id, sell_type, scene_address, ADDITIONS_IMAGES, cover_image, hourse_image, video_cover_image, introduce_video, introduce_video_desc, title, content_introduce, create_user_id, create_user_dept_id, create_time, update_user_id, update_time
+    </sql>
+
+    <select id="getList" resultType="com.ljq.house.biz.vo.response.TmEstateRspVo">
+        select *
+        from tm_estate
+        where rec_status = 'A'
+        <if test=" cm.estateName != null  and cm.estateName.trim!='' ">
+            estate_name = #{cm.estateName}
+        </if>
+        <if test=" cm.propertyNumber != null  and cm.propertyNumber.trim!='' ">
+            property_number = #{cm.propertyNumber}
+        </if>
+
+        order by create_time desc
+
+        <if test=" cm.limit != null  and cm.offset != null ">
+            limit #{cm.limit} offset #{cm.offset}
+        </if>
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(*)
+        from tm_estate
+        where rec_status = 'A'
+     </select>
+
+    <insert id="insert" parameterType="com.ljq.house.biz.model.TmEstate">
+
+        INSERT INTO tm_estate
+        (estate_id,
+         estate_name,
+         property_number,
+         total_price,
+         address,
+         bedroom_amount,
+         showerroom_amount,
+         building_area,
+         floor_space,
+         construction_year,
+         unit_price,
+         house_label,
+         ancillary_facility,
+         is_agent_relation,
+         agent_id,
+         sell_type,
+         scene_address,
+         ADDITIONS_IMAGES,
+         cover_image,
+         hourse_image,
+         video_cover_image,
+         introduce_video,
+         introduce_video_desc,
+         title,
+         content_introduce,
+         rec_status,
+         create_user_id,
+         create_user_dept_id,
+         create_time,
+         update_user_id,
+         update_time)
+        VALUES ( #{cm.estateId}
+               , #{cm.estateName}
+               , #{cm.propertyNumber}
+               , #{cm.totalPrice}
+               , #{cm.address}
+               , #{cm.bedroomAmount}
+               , #{cm.showerroomAmount}
+               , #{cm.buildingArea}
+               , #{cm.floorSpace}
+               , #{cm.constructionYear}
+               , #{cm.unitPrice}
+               , #{cm.houseLabel}
+               , #{cm.ancillaryFacility}
+               , #{cm.isAgentRelation}
+               , #{cm.agentId}
+               , #{cm.sellType}
+               , #{cm.sceneAddress}
+               , #{cm.additionsImages}
+               , #{cm.coverImage}
+               , #{cm.hourseImage}
+               , #{cm.videoCoverImage}
+               , #{cm.introduceVideo}
+               , #{cm.introduceVideoDesc}
+               , #{cm.title}
+               , #{cm.contentIntroduce}
+               , 'A'
+               , #{cm.createUserId}
+               , #{cm.createUserDeptId}
+               , now()
+               , #{cm.updateUserId}
+               , now()
+            )
+    </insert>
+
+    <update id="update" parameterType="com.ljq.house.biz.model.TmEstate">
+        update tm_estate
+        <set>
+            <if test="cm.estateName != null and cm.estateName.trim() != ''">estate_name = #{cm.estateName},</if>
+            <if test="cm.propertyNumber != null and cm.propertyNumber.trim() != ''">property_number = #{cm.propertyNumber},</if>
+            <if test="cm.totalPrice != null and cm.totalPrice.trim() != ''"> total_price = #{cm.totalPrice},</if>
+            <if test="cm.address != null and cm.address.trim() != ''"> address = #{cm.address},</if>
+            <if test="cm.bedroomAmount != null and cm.bedroomAmount.trim() != ''">bedroom_amount = #{cm.bedroomAmount},</if>
+            <if test="cm.showerroomAmount != null and cm.showerroomAmount.trim() != ''"> showerroom_amount = #{cm.showerroomAmount},</if>
+            <if test="cm.buildingArea != null"> building_area = #{cm.buildingArea},</if>
+            <if test="cm.floorSpace != null"> floor_space = #{cm.floorSpace},</if>
+            <if test="cm.constructionYear != null and cm.constructionYear.trim() != ''"> construction_year = #{cm.constructionYear},</if>
+            <if test="cm.unitPrice != null"> unit_price = #{cm.unitPrice},</if>
+            <if test="cm.houseLabel != null and cm.houseLabel.trim() != ''"> house_label = #{cm.houseLabel},</if>
+            <if test="cm.ancillaryFacility != null and cm.ancillaryFacility.trim() != ''"> ancillary_facility = #{cm.ancillaryFacility},</if>
+            <if test="cm.isAgentRelation != null and cm.isAgentRelation.trim() != ''"> is_agent_relation = #{cm.isAgentRelation},</if>
+            <if test="cm.agentId != null and cm.agentId.trim() != ''"> agent_id = #{cm.agentId},</if>
+            <if test="cm.sellType != null and cm.sellType.trim() != ''"> sell_type = #{cm.sellType},</if>
+            <if test="cm.sceneAddress != null and cm.sceneAddress.trim() != ''"> scene_address = #{cm.sceneAddress},</if>
+            <if test="cm.additionsImages != null and cm.additionsImages.trim() != ''">additions_images = #{cm.additionsImages},</if>
+            <if test="cm.coverImage != null and cm.coverImage.trim() != ''"> cover_image =#{cm.coverImage},</if>
+            <if test="cm.hourseImage != null and cm.hourseImage.trim() != ''"> hourse_image = #{cm.hourseImage},</if>
+            <if test="cm.videoCoverImage != null and cm.videoCoverImage.trim() != ''"> video_cover_image = #{cm.videoCoverImage},</if>
+            <if test="cm.introduceVideo != null and cm.introduceVideo.trim() != ''"> introduce_video = #{cm.introduceVideo},</if>
+            <if test="cm.introduceVideoDesc != null and cm.introduceVideoDesc.trim() != ''"> introduce_video_desc = #{cm.introduceVideoDesc},</if>
+            <if test="cm.title != null and cm.title.trim() != ''"> title = #{cm.title},</if>
+            <if test="cm.contentIntroduce != null and cm.contentIntroduce.trim() != ''"> content_introduce = #{cm.contentIntroduce},</if>
+            <if test="cm.cm.updateUserId != null and cm.cm.updateUserId.trim() != ''"> update_user_id = #{cm.updateUserId},</if>
+            update_time = now()
+        </set>
+        where `estate_id` = #{cm.estateId}
+        limit 1
+    </update>
+
+    <update id="del">
+        update tm_estate
+        <set>
+            rec_status = 'I',
+            update_time = now()
+        </set>
+        where `estate_id` = #{estateId}
+        limit 1
+    </update>
+
+</mapper>

house-biz/src/main/resources/mapper/TmEstateMapper.xml

@@ -1,70 +0,0 @@
-<?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.ljq.house.biz.dao.TmEstateDao">
-
-    <select id="selectTmEstateList" resultType="com.ljq.house.biz.model.TmEstate">
-        select * from tm_estate limit 1000
-    </select>
-
-    <select id="countAll" resultType="java.lang.Long">
-        select count(1) from tm_estate where enable = 1;
-    </select>
-
-    <select id="selectTmEstateById" resultType="com.ljq.house.biz.model.TmEstate">
-        select * from tm_estate
-        <where>
-            <if test="estateId != null and estateId != '' ">
-                and estate_id = #{estateId}
-            </if>
-        </where>
-        limit 1
-    </select>
-
-    <delete id="delete">
-    delete from tm_estate
-    where estate_id=#{estate_id}
-   </delete>
-
-
-    <update id="updateByIdSelectively" parameterType="com.ljq.house.biz.model.TmEstate">
-        update tm_estate
-        <set>
-            <if test="tmEstate.estateName != null and tmEstate.estateName.trim() != ''">`estate_name` = #{tmEstate.estateName},</if>
-            <if test="tmEstate.address != null and tmEstate.address.trim() != ''">`address` = #{tmEstate.address},</if>
-            <if test="tmEstate.buildingType != null and tmEstate.buildingType.trim() != ''">`building_type` = #{tmEstate.buildingType},</if>
-            <if test="tmEstate.period != null ">`period` = #{tmEstate.period},</if>
-            <if test="tmEstate.developer != null and tmEstate.developer.trim() != ''">`developer` = #{tmEstate.developer},</if>
-            <if test="tmEstate.propertyType != null and tmEstate.propertyType.trim() != ''">`property_type` = #{tmEstate.propertyType},</if>
-            <if test="tmEstate.propertyCompany != null and tmEstate.propertyCompany.trim() != ''">`property_company` = #{tmEstate.propertyCompany},</if>
-            <if test="tmEstate.estateFeature != null and tmEstate.estateFeature.trim() != ''">`estate_feature` = #{tmEstate.estateFeature},</if>
-            <if test="tmEstate.buildingArea != null">`building_area` = #{tmEstate.buildingArea},</if>
-            <if test="tmEstate.floorSpace != null">`floor_space` = #{tmEstate.floorSpace},</if>
-            <if test="tmEstate.plotRatio != null">`plot_ratio` = #{tmEstate.plotRatio},</if>
-            <if test="tmEstate.greeningRate != null">`greening_rate` = #{tmEstate.greeningRate},</if>
-            <if test="tmEstate.carports != null">`carports` = #{tmEstate.carports},</if>
-            <if test="tmEstate.carportRate != null">`carport_rate` = #{tmEstate.carportRate},</if>
-            <if test="tmEstate.heatingType != null and tmEstate.heatingType.trim() != ''">`heating_type` = #{tmEstate.heatingType},</if>
-            <if test="tmEstate.waterSupply != null and tmEstate.waterSupply.trim() != ''">`water_supply` = #{tmEstate.waterSupply},</if>
-            <if test="tmEstate.powerSupply != null and tmEstate.powerSupply.trim() != ''">`power_supply` = #{tmEstate.powerSupply},</if>
-            <if test="tmEstate.additionsImages != null and tmEstate.additionsImages.trim() != ''">`additions_images` = #{tmEstate.additionsImages},</if>
-            <if test="tmEstate.country != null and tmEstate.country.trim() != ''">`country` = #{tmEstate.country},</if>
-            <if test="tmEstate.province != null and tmEstate.province.trim() != ''">`province` = #{tmEstate.province},</if>
-            <if test="tmEstate.city != null and tmEstate.city.trim() != ''">`city` = #{tmEstate.city},</if>
-            <if test="tmEstate.district != null and tmEstate.district.trim() != ''">`district` = #{tmEstate.district},</if>
-            <if test="tmEstate.reserve1 != null and tmEstate.reserve1.trim() != ''">`reserve1` = #{tmEstate.reserve1},</if>
-            <if test="tmEstate.reserve2 != null and tmEstate.reserve2.trim() != ''">`reserve2` = #{tmEstate.reserve2},</if>
-            <if test="tmEstate.videoCoverImage != null and tmEstate.videoCoverImage.trim() != ''">`video_cover_image` = #{tmEstate.videoCoverImage},</if>
-            <if test="tmEstate.coverImage != null and tmEstate.coverImage.trim() != ''">`cover_image` = #{tmEstate.coverImage},</if>
-            <if test="tmEstate.buildingNum != null">`building_num` = #{tmEstate.buildingNum},</if>
-            <if test="tmEstate.houseNum != null">`house_num` = #{tmEstate.houseNum},</if>
-            <if test="tmEstate.salesType != null">`sales_type` = #{tmEstate.salesType},</if>
-            <if test="tmEstate.longitude != null">`longitude` = #{tmEstate.longitude},</if>
-            <if test="tmEstate.latitude != null">`latitude` = #{tmEstate.latitude},</if>
-            <if test="tmEstate.enable != null">`enable` = #{tmEstate.enable},</if>
-            <if test="tmEstate.onSaleTime != null">`on_sale_time` = #{tmEstate.onSaleTime},</if>
-            last_modify_datetime = now()
-        </set>
-        where `estate_id` = #{tmEstate.estateId}
-        limit 1
-    </update>
-</mapper>

house-common/house-common.iml

@@ -177,14 +177,26 @@
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1.tmp" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -223,15 +223,9 @@ public class HouseHelperService {
 
         if(null != tmEstate){
             result.put("estateId" , tmEstate.getEstateId());
-            result.put("earlistHandOver" , tmEstate.getEarliestHandOver());
-            result.put("onSaleTime" , tmEstate.getOnSaleTime());
-            result.put("estateDeveloper" , tmEstate.getDeveloper());
-            result.put("estatePeriodInt" , tmEstate.getPeriod());
             result.put("estateAddress" , tmEstate.getAddress());
             result.put("estateIntroduceVideo" , tmEstate.getIntroduceVideo());
             result.put("estateImages" , tmEstate.getAdditionsImages());
-            result.put("estateLongitude" , tmEstate.getLatitude());
-            result.put("estateLatitude" , tmEstate.getLongitude());
             result.put("estateVideoCoverImage" , tmEstate.getVideoCoverImage());
             result.put("estateCoverImage" , tmEstate.getCoverImage());
         }

house-common/src/main/java/com/ljq/house/common/service/UserService.java

@@ -74,7 +74,6 @@ public class UserService {
 
     public int addUserToAgency(TmAgency tmAgency , TmUser tmUser){
         TmAgencyUserRelation tmAgencyUserRelation = new TmAgencyUserRelation();
-        tmAgencyUserRelation.setAgencyUserId(tmAgency.getAgencyUserId());
         tmAgencyUserRelation.setAgencyId(tmAgency.getAgencyId());
         tmAgencyUserRelation.setUserId(tmUser.getUserId());
         tmAgencyUserRelation.setUserName(tmUser.getName());

house-im/house-im.iml

@@ -178,16 +178,28 @@
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1.tmp" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />

house-parent.iml

@@ -89,16 +89,29 @@
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1.tmp" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />

house-web/house-web.iml

@@ -207,15 +207,27 @@
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.1.tmp" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1.tmp" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />

house-web/src/main/java/com/ljq/house/HouseApplication.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableScheduling
 @EnableAsync
 @RestController
-@MapperScan(basePackages = {"com.ljq.house"})
+@MapperScan(basePackages = {"com.ljq.house.biz.dao","com.ljq.house.im.mapper"})
 public class HouseApplication extends SpringBootServletInitializer {
 
     @Override

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmEstateController.java

@@ -1,33 +1,20 @@
 package com.ljq.house.admin.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ljq.house.biz.dao.TmHouseDao;
-import com.ljq.house.biz.model.TmHouse;
-import com.ljq.house.common.exception.CommonBaseException;
-import com.ljq.house.biz.dao.TmEstateDao;
-import com.ljq.house.biz.model.Result;
 import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.vo.request.DeleteRequestVo;
+import com.ljq.house.biz.service.ITmEstateService;
+import com.ljq.house.biz.vo.request.TmEstateReqVo;
+import com.ljq.house.biz.model.Result;
+import com.ljq.house.biz.vo.response.TmEstateRspVo;
+import com.ljq.house.biz.vo.util.Page;
 import com.ljq.house.common.enums.IdStarterEnum;
-import com.ljq.house.common.enums.ResultCodeEnum;
-import com.ljq.house.common.utils.DataUtils;
 import com.ljq.house.common.utils.UUidGenerator;
 import io.swagger.annotations.*;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -35,174 +22,54 @@ import java.util.*;
  * @date 2020/4/24 15:10
  * @desciption
  */
-@Api(description = "管理后台-小区管理接口")
+@Api(description = "管理后台-房源管理")
 @Controller
 @RequestMapping("admin/estate")
 @Log4j2
 public class AdminTmEstateController {
 
-
-    @Autowired
-    private TmEstateDao tmEstateDao;
-
     @Autowired
-    private TmHouseDao tmHouseDao;
+    private ITmEstateService iTmEstateService;
 
-
-    @GetMapping("/detail")
+    @ApiOperation(value = "根据条件获取所有楼盘")
+    @PostMapping("/list")
     @ResponseBody
     @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
-    public Result getEstateById(HttpServletRequest req) {
-        String estateId = req.getParameter("estate_id");
-        TmEstate estate = tmEstateDao.selectTmEstateById(estateId);
-        return Result.success(estate);
+    public Result list(@RequestBody TmEstateReqVo tmEstateReqVo) {
+        Page<TmEstateRspVo> tmEstateRspVo = iTmEstateService.getList(tmEstateReqVo);
+        return Result.success(tmEstateRspVo);
     }
 
-    @ApiOperation(value = "修改楼盘信息")
-    @PostMapping("/update")
+    @ApiParam(name = "增加房源信息",  required = true)
+    @ApiOperation(value = "增加房源信息")
+    @PostMapping("/add")
     @ResponseBody
     @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
-    @Transactional(rollbackFor = Exception.class)
-    public Result update(@RequestBody @ApiParam(name = "小区对象", value = "传入json格式", required = true) TmEstate tmEstate) {
-        if(null == tmEstate || StringUtils.isBlank(tmEstate.getEstateId())){
-            throw new CommonBaseException(ResultCodeEnum.D017);
-        }
-        QueryWrapper<TmEstate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("estate_id" , tmEstate.getEstateId());
-        queryWrapper.last("limit 1");
-        TmEstate dbEstate = tmEstateDao.selectOne(queryWrapper);
-        int result  = -1;
-        if(null == dbEstate){
-            throw new CommonBaseException(ResultCodeEnum.D017, "楼盘信息不存在");
-        }else{
-            //存在,则更新
-            if(!StringUtils.equals(dbEstate.getEstateName() , tmEstate.getEstateName())){
-                //更新了小区名字，需要单独更新关联的房源
-                List<TmHouse> houseList = new ArrayList<>();
-                //TODO:加分页、加索引
-                QueryWrapper<TmHouse> houseQueryWrapper = new QueryWrapper<>();
-                houseQueryWrapper.eq("estate_name", dbEstate.getEstateName());
-                queryWrapper.last("limit 1000");
-                houseList = tmHouseDao.selectList(houseQueryWrapper);
-                if(!CollectionUtils.isEmpty(houseList)){
-                    for(TmHouse house : houseList){
-                        UpdateWrapper<TmHouse> houseUpdateWrapper = new UpdateWrapper<>();
-                        houseUpdateWrapper.eq("house_id" , house.getHouseId());
-                        houseUpdateWrapper.last("limit 1");
-                        house.setEstateName(tmEstate.getEstateName());
-                        house.setLastModifyDatetime(new Date());
-                        int updateHouse = tmHouseDao.update(house , houseUpdateWrapper);
-                        if(updateHouse != 1){
-                            throw new CommonBaseException(ResultCodeEnum.D100 , "更新房源的楼盘名字失败");
-                        }
-                    }
-                }
-            }
-            UpdateWrapper<TmEstate> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("estate_id" , tmEstate.getEstateId());
-            tmEstate.setLastModifyDatetime(new Date());
-            result  = tmEstateDao.update(tmEstate , updateWrapper);
-        }
-        return result == 1 ? Result.success("更新楼盘信息成功") : Result.failure("更新楼盘信息失败");
+    public Result addEstate(@RequestBody TmEstate tmEstate) {
+        tmEstate.setEstateId(UUidGenerator.generatorUuid(IdStarterEnum.AGENCY.getStarter()));
+        return Result.success(iTmEstateService.insert(tmEstate));
     }
 
-
-    @ApiOperation(value = "根据条件获取所有楼盘")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "province", value = "省", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "city", value = "市", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "district", value = "区", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "page_num", value = "当前页码", paramType = "query", required = false, dataType = "Long"),
-            @ApiImplicitParam(name = "page_size", value = "每页大小", paramType = "query", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "query_name", value = "搜索条件(楼盘ID/楼盘名称/物业公司)", paramType = "query", required = false, dataType = "String")}
-    )
-    @GetMapping("/queryAll")
+    @ApiParam(name = "更新房源信息",  required = true)
+    @ApiOperation(value = "更新房源信息")
+    @PostMapping("/update")
     @ResponseBody
     @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
-//    @RequiresPermissions("admin:estate:queryAll")
-    public Result queryAllHouse(@RequestParam(name = "province") String province,
-                                @RequestParam(name = "city") String city,
-                                @RequestParam(name = "district") String district,
-                                @RequestParam(name = "query_name") String queryName,
-                                @RequestParam(name = "page_num") Long pageNum,
-                                @RequestParam(name = "page_size") Long pageSize) {
-
-        QueryWrapper<TmEstate> estateQueryWrapper = new QueryWrapper<>();
-        estateQueryWrapper.eq("enable" , 1);
-        Page<TmEstate> page = new Page(pageNum, pageSize);
-        IPage<TmEstate> resultPage = new Page<>();
-        Map<String, Object> constantQuery = new HashMap<>();
-
-        if (StringUtils.isNotBlank(province)) {
-            constantQuery.put("province", province);
-        }
-        if (StringUtils.isNotBlank(city)) {
-            constantQuery.put("city", city);
-        }
-        if (StringUtils.isNotBlank(district)) {
-            constantQuery.put("district", district);
-        }
-
-        DataUtils.assembleTimeQueryWrapper(constantQuery, queryName, estateQueryWrapper, "estate_id", "estate_name", "property_company");
-
-        estateQueryWrapper.orderByDesc("create_time");
-        resultPage = tmEstateDao.selectPage(page, estateQueryWrapper);
-
-        return Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
-                resultPage.getCurrent(), resultPage.getRecords()));
+    public Result update(@RequestBody TmEstate tmEstate) {
+        return Result.success(iTmEstateService.update(tmEstate));
     }
 
-    @ApiParam(name = "新增小区", value = "传入json格式", required = true)
-    @ApiOperation(value = "新增小区")
-    @PostMapping("/add")
+    @ApiParam(name = "删除房源信息",  required = true)
+    @ApiOperation(value = "删除房源信息")
+    @PostMapping("/del")
     @ResponseBody
     @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
-    public Result addEstate(@RequestBody @ApiParam(name = "小区对象", value = "传入json格式", required = true) TmEstate tmEstate) {
-        boolean result = false;
-        String estateId = UUidGenerator.generatorUuid(IdStarterEnum.ESTATE.getStarter());
-        if (null != tmEstate) {
-            if (StringUtils.isBlank(tmEstate.getAddress())) {
-                throw new CommonBaseException(ResultCodeEnum.D027);
-            }
-            QueryWrapper<TmEstate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("estate_name", tmEstate.getAddress());
-            queryWrapper.last("limit 1");
-            TmEstate dbEstate = tmEstateDao.selectOne(queryWrapper);
-            if (null != dbEstate) {
-                throw new CommonBaseException(ResultCodeEnum.D026);
-            } else {
-                tmEstate.setEstateId(estateId);
-                tmEstate.setCreateTime(new Date());
-                tmEstate.setLastModifyDatetime(new Date());
-                tmEstate.setEnable(1);
-                int insert = tmEstateDao.insert(tmEstate);
-                if (insert == 1) {
-                    result = true;
-                    log.info("成功插入楼盘[{}]数据", estateId);
-                }
-            }
-        } else {
-            log.warn("数据非法，无法新增楼盘");
-        }
-        return result ? Result.success("新增楼盘成功" , estateId) : Result.failure("新增楼盘失败");
+    public Result update(@RequestParam String estateId) {
+        return Result.success(iTmEstateService.del(estateId));
     }
 
-    @ApiOperation(value = "删除楼盘")
-    @PostMapping("/delete")
-    @ResponseBody
-    @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
-    public Result delete(@RequestBody @ApiParam(name = "删除请求体", value = "传入json格式", required = true) DeleteRequestVo requestVo) {
 
-        if(!CollectionUtils.isEmpty(requestVo.getStrIds())){
-            for (String id : requestVo.getStrIds()){
-                UpdateWrapper<TmEstate> updateWrapper = new UpdateWrapper<>();
-                TmEstate tmEstate = new TmEstate();
-                tmEstate.setEnable(0);
-                updateWrapper.eq("estate_id" , id);
-                tmEstateDao.update(tmEstate , updateWrapper);
-            }
-        }
-        return Result.success("删除成功");
-    }
+
+
 
 }

house-web/src/main/java/com/ljq/house/app/controller/AppTmHouseController.java

@@ -1,629 +0,0 @@
-package com.ljq.house.app.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ljq.house.biz.dao.*;
-import com.ljq.house.biz.model.*;
-import com.ljq.house.common.enums.ResultCodeEnum;
-import com.ljq.house.common.exception.CommonBaseException;
-import com.ljq.house.common.service.HouseHelperService;
-import com.ljq.house.common.threadPools.service.SyncWxSubscribeServiceImpl;
-import com.ljq.house.common.utils.DataUtils;
-import com.ljq.house.common.utils.HttpClientUtil;
-import com.ljq.house.common.utils.SHAUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.core.tools.picocli.CommandLine;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * @author abnerhou
- * @date 2020/4/23 20:46
- * @desciption
- */
-@Api(description = "房源相关接口")
-@Controller
-@RequestMapping("/app/house")
-@Log4j2
-public class AppTmHouseController {
-
-
-    @Autowired
-    private TmHouseDao tmHouseDao;
-
-    @Autowired
-    private TmHouseAgencyRelationDao houseAgencyRelationDao;
-
-    @Autowired
-    private TmAgencyDao tmAgencyDao;
-
-    @Autowired
-    private TmUserDao tmUserDao;
-
-    @Autowired
-    private TmEstateDao tmEstateDao;
-    @Autowired
-    private TmHouseAgencyRelationDao tmHouseAgencyRelationDao;
-
-    @Autowired
-    private TmHouseAgencyRelationDao agencyRelationDao;
-
-    @Autowired
-    private SyncWxSubscribeServiceImpl wxSubscribeService;
-
-    @Value("${vr_redirect_link}")
-    private String vrRedirectLink;
-
-    @Value("${4dkankan.vr.house.host}")
-    private String fdvrhouseCallBackUrl;
-
-    @Value("${4dkankan.api.vr.house.host}")
-    private String apiVrHouseHost;
-
-    @Value("${4dkankan.api.app.id}")
-    private String fdAppId;
-
-    @Value("${4dkankan.api.app.secret}")
-    private String fdAppSecret;
-
-    @Autowired
-    private HouseHelperService houseHelperService;
-    /**
-     * 根据房源id拉取房源详情
-     *
-     * @return
-     */
-    @RequestMapping(value = "/detail", method = RequestMethod.GET)
-    @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
-    public Result getHousesDetailById(HttpServletRequest req) {
-        String houseId = req.getParameter("house_id");
-        //TODO:这里理论上要selectforupdate上个锁，防止多并发数据不一致
-        TmHouse tmHouse = tmHouseDao.selectHouseById(houseId);
-        if(null != tmHouse){
-            //更新浏览量字段
-            UpdateWrapper<TmHouse> updateWrapper = new UpdateWrapper<>();
-            TmHouse updateHouse = new TmHouse();
-            if(null == tmHouse.getQueryNum()){
-                tmHouse.setQueryNum(0l);
-            }
-            updateHouse.setQueryNum(tmHouse.getQueryNum() + 1);
-            updateWrapper.eq("house_id" , tmHouse.getHouseId());
-            tmHouseDao.update(updateHouse , updateWrapper);
-        }
-        return Result.success(tmHouse);
-    }
-
-    /**
-     * 根据四维看看的场景码获取绑定的经纪人
-     *
-     * @return
-     */
-    @RequestMapping(value = "/getAgencyId", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getHouseAgencyById(HttpServletRequest req) {
-        String sceneCode = req.getParameter("scene_code");
-        QueryWrapper<TmHouseAgencyRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("vr_scene" , sceneCode);
-        queryWrapper.eq("is_valid" , 1);
-        //TODO:这里默认只选取第一个，如果出现一个房源关联多个经纪人的情况，这里需要修改
-        queryWrapper.last("limit 1");
-        TmHouseAgencyRelation houseAgencyRelation = houseAgencyRelationDao.selectOne(queryWrapper);
-        TmAgency tmAgency = tmAgencyDao.selectTmAgencyById(houseAgencyRelation.getAgencyUserId());
-        return Result.success("成功", tmAgency);
-    }
-
-    /**
-     * 根据场景码获取房源详情
-     *
-     * @return
-     */
-    @RequestMapping(value = "/getByScene", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getHouseByScene(HttpServletRequest req) {
-        String sceneCode = req.getParameter("scene_code");
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("scene_num", sceneCode);
-        queryWrapper.last("limit 1");
-        TmHouse tmHouse = tmHouseDao.selectOne(queryWrapper);
-        if(null != tmHouse && 1 != tmHouse.getEnable()){
-            return Result.failure("该场景下绑定的房源已经被删除");
-        }
-        return Result.success("成功", tmHouse);
-    }
-
-    /**
-     * 根据场景码获取房源详情
-     *
-     * @return
-     */
-    @ApiOperation(value = "根据楼盘id获取楼盘详情")
-    @GetMapping(value = "/getEstateDetail")
-    @ResponseBody
-    public Result getHouseByScene(@RequestParam(name = "estate_id") String estateId) {
-        if(StringUtils.isBlank(estateId)){
-            throw  new CommonBaseException(ResultCodeEnum.D017);
-        }
-        QueryWrapper<TmEstate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("estate_id", estateId);
-        queryWrapper.last("limit 1");
-        TmEstate tmEstate = tmEstateDao.selectOne(queryWrapper);
-        if(null != tmEstate && 1 != tmEstate.getEnable()){
-            return Result.failure("该楼盘已经被删除");
-        }
-        return null != tmEstate ? Result.success("获取楼盘详情成功", tmEstate) : Result.failure("获取楼盘详情失败");
-    }
-
-    /**
-     * 推送消息给经纪人
-     *
-     * @return
-     */
-    @RequestMapping(value = "/subscribe", method = RequestMethod.GET)
-    @ResponseBody
-    public Result subscribeMsg(HttpServletRequest req) {
-        String link = req.getParameter("link");
-        String agencyUserId = req.getParameter("agency_user_id");
-        String userId = req.getParameter("user_id");
-        String sceneCode = req.getParameter("scene_code");
-        if (!StringUtils.isNoneBlank(userId, sceneCode)) {
-            throw new CommonBaseException(ResultCodeEnum.D018);
-        }
-        TmAgency tmAgency = tmAgencyDao.selectTmAgencyById(agencyUserId);
-        TmUser tmUser = tmUserDao.selectTmUsers(userId);
-        if (null == tmAgency || tmAgency.getEnable() != 1 || null == tmUser) {
-            throw new CommonBaseException(ResultCodeEnum.D018);
-        }
-
-        if (!StringUtils.isNoneBlank(tmAgency.getName(), tmUser.getName())) {
-            throw new CommonBaseException(ResultCodeEnum.D020);
-        }
-        List<TmHouseAgencyRelation> relationList = houseAgencyRelationDao.selectAgencyIdByScene(sceneCode);
-        TmHouse tmHouse = new TmHouse();
-        if (!CollectionUtils.isEmpty(relationList)) {
-            tmHouse = tmHouseDao.selectHouseById(relationList.get(0).getHouseId());
-        }
-        Map<String, Object> content = new HashMap<>();
-        content.put("thing1", tmAgency.getName());
-        content.put("thing2", tmUser.getName());
-        String title = tmHouse.getTitle();
-        if (title.length() > 20) {
-            title = title.substring(0, 20);
-        }
-        content.put("thing3", title);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("hh:mm:ss");
-        content.put("time4", simpleDateFormat.format(new Date()));
-        String page = "/pages/web/web?vr_link=" + link;
-        log.info("跳转的链接为:{}", page);
-        Map<String, Object> result = wxSubscribeService.executeAsync(content, page, tmAgency.getWxOpenId());
-        if (null != result && result.containsKey("errcode")) {
-            int errorCode = (int) result.get("errcode");
-            String errmsg = (String) result.get("errmsg");
-            log.info("微信消息订阅完成，返回码={},返回描述={}", errorCode, errmsg);
-            if (errorCode != 0) {
-                throw new CommonBaseException(ResultCodeEnum.D019);
-            }
-        }
-        return Result.success("推送消息成功成功");
-    }
-
-    /**
-     * 1、根据城市、地区、价钱、户型、电梯等条件捞取房源列表
-     * 2、支持分页
-     *
-     * @return
-     */
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getHouseList(HttpServletRequest req) {
-        String city = req.getParameter("city");
-        String district = req.getParameter("district");
-        int pageNum = DataUtils.getInteger(req.getParameter("page_num"));
-        int pageSize = DataUtils.getInteger(req.getParameter("page_size"));
-        if(0 == pageSize){
-            pageSize = 10;
-        }
-        Page<TmHouse> page = new Page<>(pageNum, pageSize);
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_time");
-        //只捞取有效的房源，已经被删除的(enable=0)的则不捞取
-        queryWrapper.eq("enable" , 1);
-        if (StringUtils.isBlank(city) && StringUtils.isBlank(district)) {
-            log.error("行政区域和城市都为空");
-            return Result.failure("行政区域和城市都为空!无法拉取房源列表");
-        }
-
-        IPage<TmHouse> iPage = null;
-
-        /**
-         * 所有tag下面的房源都是统一取数逻辑：先从行政区域捞取，
-         * 如果行政区域捞取数量小于10个，则扩大到市区捞取
-         */
-        if (StringUtils.isNotBlank(district)) {
-            log.info("先拉取本行政区域的房源");
-            assembleTmHouse(req, queryWrapper, null, district);
-            iPage = tmHouseDao.selectPage(page, queryWrapper);
-            List<TmHouse> houseList = iPage.getRecords();
-            if ((null != houseList && houseList.size() < 10) || (houseList == null)) {
-                log.info("行政区域:[{}]下的房源数过少:[{}]，从新从市级别拉取", district, null != houseList ? houseList.size() : 0);
-                queryWrapper.clear();
-                queryWrapper.orderByDesc("create_time");
-                //只捞取有效的房源，已经被删除的(enable=0)的则不捞取
-                queryWrapper.eq("enable" , 1);
-                assembleTmHouse(req, queryWrapper, city, null);
-                iPage = tmHouseDao.selectPage(page, queryWrapper);
-            }
-        } else {
-            log.info("行政区域为空，需要扩充到市级别捞取房源列表");
-            assembleTmHouse(req, queryWrapper, city, null);
-            iPage = tmHouseDao.selectPage(page, queryWrapper);
-        }
-        return Result.success(DataUtils.assembleResult(iPage.getTotal(), iPage.getPages(), iPage.getCurrent(), iPage.getRecords()));
-    }
-
-    @RequestMapping(value = "/agencyHouse", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getAgencyHouseList(HttpServletRequest req) {
-        String city = req.getParameter("city");
-        String district = req.getParameter("district");
-        String agencyUserId = req.getParameter("agency_user_id");
-        int pageNum = DataUtils.getInteger(req.getParameter("page_num"));
-        int pageSize = DataUtils.getInteger(req.getParameter("page_size"));
-        if(0 == pageSize){
-            pageSize = 10;
-        }
-        if(StringUtils.isBlank(agencyUserId)){
-            throw new CommonBaseException(ResultCodeEnum.D017, "缺失经纪人id");
-        }
-        Page<TmHouse> page = new Page<>(pageNum, pageSize);
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("relation.agency_user_id" , agencyUserId);
-
-
-        IPage<TmHouse> iPage = null;
-
-        assembleTmHouse(req, queryWrapper, city, district,"house.");
-        iPage = tmHouseDao.selectAgencyHouseList(page, queryWrapper);
-
-        return Result.success(DataUtils.assembleResult(iPage.getTotal(), iPage.getPages(), iPage.getCurrent(), iPage.getRecords()));
-    }
-
-    @RequestMapping(value = "/agencyRecHouse", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getAgencyRecHouseList(HttpServletRequest req) {
-        String city = req.getParameter("city");
-        String district = req.getParameter("district");
-        String agencyUserId = req.getParameter("agency_user_id");
-        String houseId = req.getParameter("house_id");
-        int pageNum = DataUtils.getInteger(req.getParameter("page_num"));
-        int pageSize = DataUtils.getInteger(req.getParameter("page_size"));
-        if(0 == pageSize){
-            pageSize = 10;
-        }
-        if(!StringUtils.isNoneBlank(agencyUserId , houseId)){
-            throw new CommonBaseException(ResultCodeEnum.D017, "缺失经纪人id，房源id");
-        }
-        Page<TmHouse> page = new Page<>(pageNum, pageSize);
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("relation.agency_user_id" , agencyUserId);
-        queryWrapper.ne("relation.house_id" , houseId);
-
-
-        IPage<TmHouse> iPage = null;
-        IPage<Map<String , Object>> recPage = new Page<>();
-
-        assembleTmHouse(req, queryWrapper, city, district,"house.");
-        iPage = tmHouseDao.selectAgencyHouseList(page, queryWrapper);
-        List<Map<String , Object>> mapList = new ArrayList<>();
-        if(!CollectionUtils.isEmpty(iPage.getRecords())){
-            for(TmHouse house : iPage.getRecords()){
-                Map<String ,Object> map = new HashMap<>();
-                map = houseHelperService.getHouseInfoByHouse(house , "" , "" , "agent" , fdvrhouseCallBackUrl);
-                if(!CollectionUtils.isEmpty(map)){
-                    mapList.add(map);
-                }
-            }
-        }
-        recPage.setRecords(mapList);
-        recPage.setPages(1);
-        recPage.setCurrent(0);
-        recPage.setTotal(mapList.size());
-
-        return Result.success(DataUtils.assembleResult(recPage.getTotal(), recPage.getPages(), recPage.getCurrent(), recPage.getRecords()));
-    }
-
-
-    /**
-     * 1、获取推荐房源
-     *
-     * @return
-     */
-    @RequestMapping(value = "/recommend", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getRecomandHouse(HttpServletRequest req) {
-        //TODO:这里是写死的推荐房源，只拉取10个
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enable" , 1);
-        queryWrapper.last("limit 10");
-        queryWrapper.orderByDesc("create_time");
-        List<TmHouse> houseList = tmHouseDao.selectList(queryWrapper);
-        return Result.success(houseList);
-    }
-
-    private void assembleTmHouse(HttpServletRequest request, QueryWrapper<TmHouse> queryWrapper, String city, String district) {
-        if (null != request) {
-            String saleType = request.getParameter("saleType");
-            String price = request.getParameter("price");
-            String rooms = request.getParameter("rooms");
-            String houseType = request.getParameter("houseType");
-            String orientation = request.getParameter("orientation");
-            String elevator = request.getParameter("elevator");
-            String title = request.getParameter("title");
-            String roomsRange = request.getParameter("room_s");
-            String priceRange = request.getParameter("price_s");
-            Integer saleState = DataUtils.getInteger(request.getParameter("saleState"));
-
-
-            if (StringUtils.isNotBlank(saleType)) {
-                queryWrapper.eq("sale_type", saleType.trim());
-            }
-
-            if (StringUtils.isNoneBlank(rooms)) {
-                Integer getRoom = DataUtils.getIntegerWithDefault(rooms , false);
-                if(null != getRoom){
-                   queryWrapper.eq("rooms", getRoom);
-                }else{
-                    log.info("非法的居室数:{}" , rooms);
-                }
-            }else{
-                //默认填了房间数，就按房间数走，没填，才查看是否上送了房间区间
-                if(StringUtils.isNotBlank(roomsRange)){
-                      String[] roomRangeList = roomsRange.split("#");
-                      if(null != roomRangeList && roomRangeList.length > 1){
-                          Integer roomSmall = DataUtils.getInteger(roomRangeList[0]);
-                          Integer roomBig = DataUtils.getInteger(roomRangeList[1]);
-                          if(null != roomSmall && null != roomBig){
-                              queryWrapper.between("rooms" , roomSmall , roomBig);
-                          }
-                      }else{
-                          log.warn("非法的居室范围:{}",roomsRange);
-                      }
-                }
-            }
-
-            if (StringUtils.isNoneBlank(price)) {
-                //前端上送的价钱都是以万级为单位，这里需要转换
-                BigDecimal getPrice = DataUtils.getBigDecimalObj(price);
-                getPrice = getPrice.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                queryWrapper.eq("price", getPrice);
-            }else{
-                //没有直接上送价格，则尝试获取价格区间
-                if(StringUtils.isNotBlank(priceRange)){
-                    String[] priceRangeList = priceRange.split("#");
-                    if(null != priceRangeList && priceRangeList.length > 1){
-                        BigDecimal priceSmall = DataUtils.getBigDecimalObj(priceRangeList[0]);
-                        BigDecimal priceBig = DataUtils.getBigDecimalObj(priceRangeList[1]);
-                        if(null != priceSmall && null != priceBig){
-                            //前端上送的价钱都是以万级为单位，这里需要转换
-                            priceSmall = priceSmall.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                            //前端上送的价钱都是以万级为单位，这里需要转换
-                            priceBig = priceBig.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                            queryWrapper.between("price" , priceSmall , priceBig);
-                        }
-                    }else{
-                        log.warn("非法的价格范围:{}",priceRange);
-                    }
-                }
-            }
-
-
-
-            if(StringUtils.isNotBlank(title)){
-                //TODO:加索引
-                queryWrapper.like("title" , title);
-            }
-
-
-            if (StringUtils.isNotBlank(houseType)) {
-                queryWrapper.eq("house_type", houseType);
-            }
-
-            if (StringUtils.isNotBlank(orientation)) {
-                queryWrapper.eq("orientation", orientation);
-            }
-
-            if (StringUtils.isNotBlank(elevator)) {
-                queryWrapper.eq("elevator", elevator);
-            }
-
-            if (null != saleState && saleState > 0) {
-                queryWrapper.eq("sale_state", saleState);
-            }
-
-            if (StringUtils.isNotBlank(district)) {
-                queryWrapper.eq("district", district);
-            }
-
-            if (StringUtils.isNotBlank(city)) {
-                queryWrapper.likeRight("city", city);
-            }
-
-        }
-    }
-
-
-    private void assembleTmHouse(HttpServletRequest request, QueryWrapper<TmHouse> queryWrapper,
-                                 String city, String district ,String tableAlias) {
-        queryWrapper.orderByDesc(tableAlias + "create_time");
-        //只捞取有效的房源，已经被删除的(enable=0)的则不捞取
-        queryWrapper.eq(tableAlias + "enable" , 1);
-
-        if (null != request) {
-            String saleType = request.getParameter("saleType");
-            String price = request.getParameter("price");
-            String rooms = request.getParameter("rooms");
-            String houseType = request.getParameter("houseType");
-            String orientation = request.getParameter("orientation");
-            String elevator = request.getParameter("elevator");
-            String title = request.getParameter("title");
-            String roomsRange = request.getParameter("room_s");
-            String priceRange = request.getParameter("price_s");
-            Integer saleState = DataUtils.getInteger(request.getParameter("saleState"));
-
-
-            if (StringUtils.isNotBlank(saleType)) {
-                queryWrapper.eq(tableAlias + "sale_type", saleType.trim());
-            }
-
-
-            if (StringUtils.isNoneBlank(rooms)) {
-                Integer getRoom = DataUtils.getIntegerWithDefault(rooms , false);
-                if(null != getRoom){
-                    queryWrapper.eq(tableAlias +"rooms", getRoom);
-                }else{
-                    log.info("非法的居室数:{}" , rooms);
-                }
-            }else{
-                //默认填了房间数，就按房间数走，没填，才查看是否上送了房间区间
-                if(StringUtils.isNotBlank(roomsRange)){
-                    String[] roomRangeList = roomsRange.split("#");
-                    if(null != roomRangeList && roomRangeList.length > 1){
-                        Integer roomSmall = DataUtils.getInteger(roomRangeList[0]);
-                        Integer roomBig = DataUtils.getInteger(roomRangeList[1]);
-                        if(null != roomSmall && null != roomBig){
-                            queryWrapper.between(tableAlias +"rooms" , roomSmall , roomBig);
-                        }
-                    }else{
-                        log.warn("非法的居室范围:{}",roomsRange);
-                    }
-                }
-            }
-
-            if (StringUtils.isNoneBlank(price)) {
-                //前端上送的价钱都是以万级为单位，这里需要转换
-                BigDecimal getPrice = DataUtils.getBigDecimalObj(price);
-                getPrice = getPrice.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                queryWrapper.eq(tableAlias +"price", getPrice);
-            }else{
-                //没有直接上送价格，则尝试获取价格区间
-                if(StringUtils.isNotBlank(priceRange)){
-                    String[] priceRangeList = priceRange.split("#");
-                    if(null != priceRangeList && priceRangeList.length > 1){
-                        BigDecimal priceSmall = DataUtils.getBigDecimalObj(priceRangeList[0]);
-                        BigDecimal priceBig = DataUtils.getBigDecimalObj(priceRangeList[1]);
-                        if(null != priceSmall && null != priceBig){
-                            //前端上送的价钱都是以万级为单位，这里需要转换
-                            priceSmall = priceSmall.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                            //前端上送的价钱都是以万级为单位，这里需要转换
-                            priceBig = priceBig.multiply(new BigDecimal(10000)).setScale(2 , BigDecimal.ROUND_HALF_UP);
-                            queryWrapper.between(tableAlias +"price" , priceSmall , priceBig);
-                        }
-                    }else{
-                        log.warn("非法的价格范围:{}",priceRange);
-                    }
-                }
-            }
-
-
-
-            if(StringUtils.isNotBlank(title)){
-                //TODO:加索引
-                queryWrapper.like(tableAlias +"title" , title);
-            }
-
-
-            if (StringUtils.isNotBlank(houseType)) {
-                queryWrapper.eq(tableAlias +"house_type", houseType);
-            }
-
-            if (StringUtils.isNotBlank(orientation)) {
-                queryWrapper.eq(tableAlias +"orientation", orientation);
-            }
-
-            if (StringUtils.isNotBlank(elevator)) {
-                queryWrapper.eq(tableAlias +"elevator", elevator);
-            }
-
-            if (null != saleState && saleState > 0) {
-                queryWrapper.eq(tableAlias +"sale_state", saleState);
-            }
-
-            if (StringUtils.isNotBlank(district)) {
-                queryWrapper.eq(tableAlias +"district", district);
-            }
-
-            if (StringUtils.isNotBlank(city)) {
-                queryWrapper.likeRight(tableAlias +"city", city);
-            }
-
-        }
-    }
-
-
-
-    @ApiOperation(value = "向openApi发送数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "house_id", value = "房源id", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "user_id", value = "用户id", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "room_id", value = "语音通话房间id", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "type", value = "请求端类型: 经纪人传agent，用户传customer", paramType = "query", required = false, dataType = "String")}
-    )
-    @GetMapping(value = "/sendData")
-    @ResponseBody
-    public Result sendFormatDataToOpenApi (@RequestParam(value = "house_id") String houseId ,
-                                           @RequestParam(value =  "user_id") String userId ,
-                                           @RequestParam(value =  "room_id") String roomId,
-                                           @RequestParam(value =  "type") String type) {
-        if(StringUtils.isBlank(houseId)){
-            throw new CommonBaseException(ResultCodeEnum.D017);
-        }
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("house_id" , houseId);
-        queryWrapper.last("limit 1");
-        TmHouse dbHouse = tmHouseDao.selectOne(queryWrapper);
-        if(null == dbHouse){
-            throw  new CommonBaseException(ResultCodeEnum.D101 , "房源信息不存在");
-        }
-
-        String callBackUrl = fdvrhouseCallBackUrl;
-        Map<String , Object> data = houseHelperService.getHouseInfoByHouse(dbHouse , userId , roomId , type , callBackUrl);
-
-        List<Map<String , Object>> recommends = houseHelperService.getAgencyRecHouseInfo(dbHouse , userId , roomId , type ,callBackUrl);
-        data.put("recommend_houses" , JSONObject.toJSONString(recommends));
-        Long timeStamp = System.currentTimeMillis();
-
-        //token=app_id+app_secret+timestamp
-        String token = SHAUtils.getSHA256(fdAppId + fdAppSecret + timeStamp.toString());
-
-        String dataStr = JSONObject.toJSONString(data);
-        String sign  = SHAUtils.getSHA256(dataStr + fdAppSecret + timeStamp);
-
-        String openApiurl = apiVrHouseHost + "/api/format?appId=" + fdAppId + "&sign=" + sign + "&token=" + token + "&timeStamp=" + timeStamp;
-        log.info("请求openApi的url={}", openApiurl);
-        String apiResultStr = HttpClientUtil.doPostJson(openApiurl , dataStr);
-        Result res = JSONObject.parseObject(apiResultStr , Result.class);
-
-        return res;
-    }
-
-
-
-
-}

house-web/src/main/resources/application-dev.properties

@@ -16,7 +16,7 @@ spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 
 
-spring.datasource.url=jdbc:mysql://120.25.146.52:3306/vrhouse?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/vrhouseusa?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.username=root
 spring.datasource.password=4dkk2020test%
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver

house-web/src/main/resources/application-prod.properties

@@ -1,13 +1,13 @@
 server.port=8087
 
-#安全起见，监控使用不同的端口
+#锟斤拷全锟斤拷锟斤拷锟斤拷锟斤拷使锟矫诧拷同锟侥端匡拷
 management.server.port=8090
 
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 
-#调试且不输出信息
+#�����Ҳ������Ϣ
 #log
 log4j2.level=debug
 log4j2.package.path=house/logs/
@@ -16,59 +16,59 @@ spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 
 
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vr-house?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/vrhouseusa?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.username=root
-spring.datasource.password=4dkankancuikuan%
+spring.datasource.password=4dkk2020test%
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 
 
-#Im聊天图片和音频存放路径
+#Im����ͼƬ����Ƶ���·��
 spring.pid.file= vr/house/app.pid
 file-backup-path: vr/house/im-files/
 video-file-path: vr/house/video-files/
 
-# 初始化大小，最小，最大
+# ��ʼ����С����С�����
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5
 spring.datasource.maxActive=30
-# 配置获取连接等待超时的时间
+# 锟斤拷锟矫伙拷取锟斤拷锟接等达拷锟斤拷时锟斤拷时锟斤拷
 spring.datasource.maxWait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# 锟斤拷锟矫硷拷锟斤拷锟矫才斤拷锟斤拷一锟轿硷拷猓�拷锟斤拷锟斤拷要锟截闭的匡拷锟斤拷锟斤拷锟接ｏ拷锟斤拷位锟角猴拷锟斤拷
 spring.datasource.timeBetweenEvictionRunsMillis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
+# ����һ�������ڳ�����С�����ʱ�䣬��λ�Ǻ���
 spring.datasource.minEvictableIdleTimeMillis=300000
 spring.datasource.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.testWhileIdle=true
 spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
-# 打开PSCache，并且指定每个连接上PSCache的大小
+# 锟斤拷PSCache锟斤拷锟斤拷锟斤拷指锟斤拷每锟斤拷锟斤拷锟斤拷锟斤拷PSCache锟侥达拷小
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedSta;tementPerConnectionSize=20
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+# 锟斤拷锟矫硷拷锟酵筹拷锟斤拷锟斤拷氐锟絝ilters锟斤拷去锟斤拷锟斤拷锟截斤拷锟斤拷sql锟睫凤拷统锟狡ｏ拷'wall'锟斤拷锟节凤拷锟斤拷墙
 spring.datasource.filters=stat,wall,log4j
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+# 通锟斤拷connectProperties锟斤拷锟斤拷锟斤拷锟斤拷mergeSql锟斤拷锟杰ｏ拷锟斤拷SQL锟斤拷录
 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# 合并多个DruidDataSource的监控数据
+# �ϲ����DruidDataSource�ļ������
 #spring.datasource.useGlobalDataSourceStat=true
-# druid连接池监控
+# druid���ӳؼ��
 spring.datasource.stat-view-servlet.login-username=admin
 spring.datasource.stat-view-servlet.login-password=admin
-# 排除一些静态资源，以提高效率
+# �ų�һЩ��̬��Դ�������Ч��
 spring.datasource.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*
 
-#mybatis配置
+#mybatis锟斤拷锟斤拷
 mybatis.config-location=classpath:/mybatis/mybatis-config.xml
 pagehelper.helper-dialect=mysql
 
 spring.thymeleaf.cache=false
 
 
-#本地存放的文件路径,可以修改成自己的图片存放路径,对应nginx.conf里alias对应目录
+#���ش�ŵ��ļ�·��,�����޸ij��Լ���ͼƬ���·��,��Ӧnginx.conf��alias��ӦĿ¼
 file.path=/home/zq/Desktop/imgs
-#静态资源地址前缀
+#锟斤拷态锟斤拷源锟斤拷址前缀
 file.prefix=http://127.0.0.1:8085/images
 
-#SpringBoot Admin监控地址
+#SpringBoot Admin��ص�ַ
 spring.boot.admin.client.enabled=true
 spring.boot.admin.client.url=http://localhost:9090
 
@@ -93,15 +93,15 @@ spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=
-# 连接超时时间 单位 ms（毫秒）
+# 锟斤拷锟接筹拷时时锟斤拷 锟斤拷位 ms锟斤拷锟斤拷锟诫）
 spring.redis.timeout=3000ms
-# 连接池中的最大空闲连接，默认值也是8。
+# 锟斤拷锟接筹拷锟叫碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟接ｏ拷默锟斤拷值也锟斤拷8锟斤拷
 spring.redis.jedis.pool.max-idle=50
-# 连接池中的最小空闲连接，默认值也是0。
+# 锟斤拷锟接筹拷锟叫碉拷锟斤拷小锟斤拷锟斤拷锟斤拷锟接ｏ拷默锟斤拷值也锟斤拷0锟斤拷
 spring.redis.jedis.pool.min-idle=8
-# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+# �����ֵΪ-1�����ʾ�����ƣ����pool�Ѿ�������maxActive��jedisʵ�������ʱpool��״̬Ϊexhausted(�ľ�)��
 spring.redis.jedis.pool.max-active=8
-# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+# �ȴ��������ӵ����ʱ�䣬��λ���룬Ĭ��ֵΪ-1����ʾ������ʱ����������ȴ�ʱ�䣬��ֱ���׳�JedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
 user.wx.app.id=wxdfbbee52bcb3c32e
@@ -112,17 +112,17 @@ wx_miniprogram_state=formal
 wx_subscribe.template.id=GApxDrE3tPhysRxHEmGHRn-0mvNJXqtZ4znZ8PJnQ8Q
 vr_redirect_link=https://vrhouse.4dkankan.com/
 
-#四维看看的登录域名
+#锟斤拷维锟斤拷锟斤拷锟侥碉拷录锟斤拷锟斤拷
 4dkankan.host=https://4dkankan.com/
 
-#四维带看详情页的路径:
+#锟斤拷维锟斤拷锟斤拷锟斤拷锟斤拷页锟斤拷路锟斤拷:
 4dkankan.vr.house.path="/pages/web/web?vr_link="
 4dkankan.vr.house.host=http://127.0.0.1:8087/
 4dkankan.api.vr.house.host=https://open.4dkankan.com
 4dkankan.api.app.id = 123
 4dkankan.api.app.secret = 123
 
-#oss配置
+#oss锟斤拷锟斤拷
 
 oss.point=http://oss-cn-shenzhen.aliyuncs.com
 oss.key=LTAIUrvuHqj8pvry

house-web/src/main/resources/application.properties

@@ -1,2 +1,2 @@
-spring.profiles.active=prod
+spring.profiles.active=dev
 #spring.profiles.active=dev

pom.xml

@@ -7,7 +7,6 @@
         <module>house-biz</module>
         <module>house-common</module>
         <module>house-web</module>
-        <module>SpringbootAdmin</module>
         <module>house-auth</module>
         <module>house-im</module>
     </modules>
@@ -32,6 +31,8 @@
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <pagehelper.version>1.2.5</pagehelper.version>
         <shiro.version>1.2.4</shiro.version>
+        <aspectjweaver.version>1.9.3</aspectjweaver.version>
+        <tk.mybatis.version>2.0.2</tk.mybatis.version>
     </properties>
 
     <dependencies>
@@ -179,6 +180,13 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.28</version>
+            <scope>compile</scope>
+        </dependency>
+
 
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -209,6 +217,23 @@
             <version>2.1</version>
         </dependency>
 
+        <!-- mybatis -->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>${tk.mybatis.version}</version>
+        </dependency>
+        <!--分页插件-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>${pagehelper.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>${aspectjweaver.version}</version>
+        </dependency>
 
 
         <dependency>