fix

Author: bubblewu

.gitignore

@@ -22,5 +22,5 @@ model**.txt
 #*.txt
 /src/main/resources/data/*
 #/src/test/*
-/tmp/*
+#/tmp/*
 src/main/resources/application.yml

README.md

@@ -2,11 +2,11 @@
 基于Elasticsearch的租房搜索系统
 
 ## 概述
-### 系统架构
+### 一、系统架构
 主要是以MySQL作为基础数据存储，结合ES实现站内搜索引擎。
 ![img/系统架构.png](img/系统架构.png)
 
-### 涉及技术
+### 二、涉及技术
 - 核心搜索技术：
 SpringBoot + Elasticsearch（方便实现站内搜索引擎）
 - 站内搜索引擎实现：
@@ -30,8 +30,8 @@ Spring Security（权限控制、自定义安全策略）
 
 ## 项目设计
 
-### 数据库设计
-#### ER图
+### 一、数据库设计
+#### 1、ER图
 实体-联系图(Entity Relationship Diagram)
 
 - 用户ER图：
@@ -43,19 +43,19 @@ Spring Security（权限控制、自定义安全策略）
 ![img/数据库表模型.png](img/数据库表模型.png)
 
 
-#### 结构
+#### 2、结构
 - 数据+结构转储sql
 见文件：db/elasticsearch_house.sql
 
-### 项目结构
-#### 结构分层
+### 二、项目结构
+#### 1、结构分层
 经典的MVC架构：
 - 1、表示层：web包
 - 2、业务逻辑层：service包
 - 3、数据层：entity包、repository包
 
-#### API结构设计
-##### RESTFul风格API：
+#### 2、API结构设计
+##### 2.1、RESTFul风格API：
 <p> restful是一种软件架构风格、设计风格，而不是标准，只是提供了一组设计原则和约束条件。
 它主要用于客户端和服务器交互类的软件。基于这个风格设计的软件可以更简洁，更有层次，更易于实现缓存等机制。
 <p> REST（表现层状态转化），即Representational State Transfer的缩写。
@@ -69,7 +69,7 @@ Spring Security（权限控制、自定义安全策略）
 <p> 对资源的操作不能改变资源标识（URI）本身；
 <p> 所有的操作都是无状态的等。
 
-#####  API数据格式标准
+##### 2.2、API数据格式标准
 - code：自定义请求状态码：
 <p> 如`com.bubble.house.base.api.ApiStatus`定义的状态码信息；
 
@@ -78,7 +78,7 @@ Spring Security（权限控制、自定义安全策略）
 
 - data：当前API请求的目标数据；
 
-##### 异常拦截器 
+##### 2.3、异常拦截器 
 用于拦截项目运行中的无法预知的情况，通过统一拦截器进行异常拦截。
 - 页面异常拦截器：
 - API异常拦截器：
@@ -94,4 +94,96 @@ server:
     path: /error
 ```
 
-#### 
+##### 2.4、功能性页面
+功能性页面接口定义：`com.bubble.house.web.controller.HomeController`
+
+- 403：权限限制提示页面；
+- 404：NotFound提示页面；
+- 500：服务异常提示页面；
+- logout：登出（注销返回首页）的基本服务页面；
+
+### 三、 业务和功能设计
+#### 1、后台管理模块
+提供一个后台管理模块来统一管理租房网站的数据和人员信息。
+后台管理中心入口：`com.bubble.house.web.controller.admin.AdminController`
+管理系统参考：[H-ui.admin是用H-ui前端框架开发的轻量级网站后台模版](http://demo.h-ui.net/H-ui.admin/3.1/index.html#)
+主要功能有：
+<p> 后台登录：
+<p> 权限控制：`com.bubble.house.config.WebSecurityConfig`
+<p> 注销功能：
+
+#### 2、权限控制模块
+基于spring-security来实现：`com.bubble.house.config.WebSecurityConfig`
+<p> 根据不同的请求，跳转到不同的登录页面。如普通用户跳转user/login，管理员跳转admin/login页面。
+参考：`com.bubble.house.config.security`包下的实现
+
+#### 3、房源信息管理模块
+主要就是对房源信息的增删查改和审核等功能。
+##### 3.1、房源浏览：
+
+##### 3.2、房源编辑：
+
+##### 3.3、房源审核：
+
+##### 3.4、房源图片（基于七牛云）：
+图片上传，主要基于七牛云和百度的WebUploader：`elasticsearch-house/src/main/resources/static/js/admin/upload.js`
+
+##### 3.5、房源新增：
+
+##### 3.6、房源排序：
+
+##### 3.7、房源详情页：
+
+
+#### 4、地图找房模块
+
+#### 5、会员系统模块
+
+#### 6、预约看房模块
+
+
+### 四、搜索相关
+
+### 五、报警监控
+
+### 六、日志分析
+
+
+## 总结
+
+
+## 注意事项
+##### 1、热部署
+```yml
+  # 热部署
+  devtools:
+    restart:
+      # 热部署生效
+      enabled: true
+      # 设置重启的目录,添加那个目录的文件需要restart
+      additional-paths: src/main/java,src/main/resources
+      # 不需实时加载
+      exclude: db/** #,static/**
+```
+
+##### 2、thymeleaf页面中文乱码
+在`com.bubble.house.config.WebMVCConfig`中配置编码：
+```java
+    /**
+     * 模板资源解析器。
+     * ConfigurationProperties 绑定配置文件中thymeleaf的前缀
+     */
+    @Bean
+    @ConfigurationProperties(prefix = "spring.thymeleaf")
+    public SpringResourceTemplateResolver templateResolver() {
+        SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver();
+        // 配置Spring上下文
+        templateResolver.setApplicationContext(this.applicationContext);
+        // 防止中文乱码
+        templateResolver.setCharacterEncoding("UTF-8");
+        templateResolver.setCacheable(thymeleafCacheEnable);
+        return templateResolver;
+    }
+
+```
+

pom.xml

@@ -22,7 +22,7 @@
         <modelmapper.version>2.3.5</modelmapper.version>
         <spring-security-core.version>5.2.0.RELEASE</spring-security-core.version>
         <guava.version>28.1-jre</guava.version>
-        <qiniu-java-jdk.version>[7.2.0, 7.2.99]</qiniu-java-jdk.version>
+        <qiniu-java-jdk.version>[7.3.0, 7.3.99]</qiniu-java-jdk.version>
         <aliyun-java-sdk-core.version>4.4.6</aliyun-java-sdk-core.version>
         <aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
         <es.version>7.4.2</es.version>
@@ -110,7 +110,6 @@
             <artifactId>spring-security-core</artifactId>
             <version>${spring-security-core.version}</version>
         </dependency>
-
         <!-- Thymeleaf方言支持SpringSecurity 依赖-->
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>

src/main/java/com/bubble/house/base/LoginUserUtil.java

@@ -0,0 +1,58 @@
+package com.bubble.house.base;
+
+import com.bubble.house.entity.user.UserEntity;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.regex.Pattern;
+
+/**
+ * 用户登录处理工具
+ *
+ * @author wugang
+ * date: 2020-10-27 17:56
+ **/
+public class LoginUserUtil {
+    private static final String PHONE_REGEX = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[0,5-9])|(18[0,5-9]))\\d{8}$";
+    private static final Pattern PHONE_PATTERN = Pattern.compile(PHONE_REGEX);
+
+    private static final String EMAIL_REGEX = "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
+    private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);
+
+    public static UserEntity load() {
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (principal instanceof UserEntity) {
+            return (UserEntity) principal;
+        }
+        return null;
+    }
+
+    public static Long getLoginUserId() {
+        UserEntity user = load();
+        return user == null ? -1L : user.getId();
+    }
+
+    /**
+     * 验证手机号码
+     * <p>
+     * 移动号码段:139、138、137、136、135、134、150、151、152、157、158、159、182、183、187、188、147
+     * 联通号码段:130、131、132、136、185、186、145、175、185
+     * 电信号码段:133、153、180、189
+     *
+     * @param target 目标号码
+     * @return 如果是手机号码 返回true; 反之,返回false
+     */
+    public static boolean checkTelephone(String target) {
+        return PHONE_PATTERN.matcher(target).matches();
+    }
+
+    /**
+     * 验证一般的英文邮箱
+     *
+     * @param target 目标邮箱
+     * @return 如果符合邮箱规则 返回true; 反之,返回false
+     */
+    public static boolean checkEmail(String target) {
+        return EMAIL_PATTERN.matcher(target).matches();
+    }
+
+}

src/main/java/com/bubble/house/config/WebMVCConfig.java

@@ -9,6 +9,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.*;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
 import org.thymeleaf.spring5.SpringTemplateEngine;
 import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
 import org.thymeleaf.spring5.view.ThymeleafViewResolver;
@@ -46,6 +47,7 @@ public SpringResourceTemplateResolver templateResolver() {
         SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver();
         // 配置Spring上下文
         templateResolver.setApplicationContext(this.applicationContext);
+        // 防止中文乱码
         templateResolver.setCharacterEncoding("UTF-8");
         templateResolver.setCacheable(thymeleafCacheEnable);
         return templateResolver;
@@ -62,6 +64,9 @@ public SpringTemplateEngine templateEngine() {
         templateEngine.setTemplateResolver(templateResolver());
         // 支持Spring EL表达式
         templateEngine.setEnableSpringELCompiler(true);
+        // 支持SpringSecurity方言
+        SpringSecurityDialect securityDialect = new SpringSecurityDialect();
+        templateEngine.addDialect(securityDialect);
         return templateEngine;
     }
 

src/main/java/com/bubble/house/config/WebSecurityConfig.java

@@ -31,28 +31,35 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.addFilterBefore(authFilter(), UsernamePasswordAuthenticationFilter.class);
-
         // 资源访问权限
         http.authorizeRequests()
-                .antMatchers("/admin/login").permitAll() // permitAll不需要验证, 管理员登录入口
-                .antMatchers("/static/**").permitAll() // 静态资源
-                .antMatchers("/user/login").permitAll() // 用户登录入口
-                .antMatchers("/admin/**").hasRole("ADMIN")  // 需要相应的角色才能访问
+                // permitAll不需要验证, 管理员登录入口
+                .antMatchers("/admin/login").permitAll()
+                // 静态资源
+                .antMatchers("/static/**").permitAll()
+                // 用户登录入口
+                .antMatchers("/user/login").permitAll()
+                // 需要相应的角色才能访问
+                .antMatchers("/admin/**").hasRole("ADMIN")
                 .antMatchers("/user/**").hasAnyRole("ADMIN", "USER")
                 .antMatchers("/api/user/**").hasAnyRole("ADMIN", "USER")
                 .and()
-                .formLogin()  // 基于Form表单登录验证
-                .loginProcessingUrl("/login") // 配置角色登录处理入口
+                // 基于Form表单登录验证
+                .formLogin()
+                // 配置角色登录处理入口
+                .loginProcessingUrl("/login")
+                // 登录验证失败处理器
                 .failureHandler(authFailHandler())
                 .and()
-                .logout()
-                .logoutUrl("/logout")
-                .logoutSuccessUrl("/logout/page")
-                .deleteCookies("JSESSIONID")
-                .invalidateHttpSession(true)
+                // 登出注销配置
+                .logout().logoutUrl("/logout").logoutSuccessUrl("/logout/page")
+                // 登出后删除session，使会话失效
+                .deleteCookies("JSESSIONID").invalidateHttpSession(true)
                 .and()
+                // 路由Mapping后的跳转登录入口
                 .exceptionHandling()
                 .authenticationEntryPoint(urlEntryPoint())
+                // 无权访问的提示页面
                 .accessDeniedPage("/status/403");
 
         http.csrf().disable();
@@ -72,11 +79,18 @@ public AuthProvider authProvider() {
         return new AuthProvider();
     }
 
+    /**
+     * 根据访问路径来进行路由Mapping后的跳转登录入口
+     */
     @Bean
     public LoginUrlEntryPoint urlEntryPoint() {
+        // 默认走用户的登录入口
         return new LoginUrlEntryPoint("/user/login");
     }
 
+    /**
+     * 登录验证失败处理器
+     */
     @Bean
     public LoginAuthFailHandler authFailHandler() {
         return new LoginAuthFailHandler(urlEntryPoint());

src/main/java/com/bubble/house/config/security/AuthFilter.java

@@ -53,7 +53,8 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
         String inputCode = request.getParameter("smsCode");
         String sessionCode = this.smsService.getSmsCode(telephone);
         if (Objects.equals(inputCode, sessionCode)) {
-            if (user == null) { // 如果用户第一次用手机登录 则自动注册该用户
+            // 如果用户第一次用手机登录 则自动注册该用户
+            if (user == null) {
                 user = this.userService.addUserByPhone(telephone);
             }
             return new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());

src/main/java/com/bubble/house/config/security/AuthProvider.java

@@ -23,7 +23,6 @@ public class AuthProvider implements AuthenticationProvider {
 
     @Autowired
     private UserService userService;
-//    private PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
@@ -35,10 +34,8 @@ public Authentication authenticate(Authentication authentication) throws Authent
             LOGGER.error("用户[{}]无权限", userName);
             throw new AuthenticationCredentialsNotFoundException("authError");
         }
-//        if (this.passwordEncoder.matches(user.getPassword(), inputPassword + user.getId())) {
-//            return new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());
-//        }
         if (user.getPassword().equals(inputPassword)) {
+            // 参数：认证用户、密码、拥有的认证权限
             return new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());
         }
 

src/main/java/com/bubble/house/config/security/LoginAuthFailHandler.java

@@ -24,6 +24,7 @@ public LoginAuthFailHandler(LoginUrlEntryPoint urlEntryPoint) {
     @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
                                         AuthenticationException exception) throws IOException, ServletException {
+        // 获取要跳转的url
         String targetUrl = this.urlEntryPoint.determineUrlToUseForThisRequest(request, response, exception);
 
         targetUrl += "?" + exception.getMessage();

src/main/java/com/bubble/house/config/security/LoginUrlEntryPoint.java

@@ -25,7 +25,7 @@ public class LoginUrlEntryPoint extends LoginUrlAuthenticationEntryPoint {
     private static final String API_CODE_403 = "{\"code\": 403}";
     private static final String CONTENT_TYPE = "application/json;charset=UTF-8";
 
-    private PathMatcher pathMatcher = new AntPathMatcher();
+    private final PathMatcher pathMatcher = new AntPathMatcher();
     private final Map<String, String> authEntryPointMap;
 
     public LoginUrlEntryPoint(String loginFormUrl) {
@@ -44,8 +44,9 @@ public LoginUrlEntryPoint(String loginFormUrl) {
     @Override
     protected String determineUrlToUseForThisRequest(HttpServletRequest request, HttpServletResponse response,
                                                      AuthenticationException exception) {
+        // 获取原先要跳转的url，即访问路径
         String uri = request.getRequestURI().replace(request.getContextPath(), "");
-
+        // 根据访问路径来匹配登录入口
         for (Map.Entry<String, String> authEntry : this.authEntryPointMap.entrySet()) {
             if (this.pathMatcher.match(authEntry.getKey(), uri)) {
                 return authEntry.getValue();

src/main/java/com/bubble/house/entity/dto/UserDTO.java

@@ -3,7 +3,11 @@
 import java.io.Serializable;
 
 /**
- * User
+ * User：
+ * DTO: 即数据传输对象。用于表现层和应用层之间的数据交互
+ * 简单来说Model面向业务，我们是通过业务来定义Model的。而DTO是面向界面UI，是通过UI的需求来定义的。
+ * 通过DTO我们实现了表现层与Model之间的解耦，表现层不引用Model，
+ * 如果开发过程中我们的模型改变了，而界面没变，我们就只需要改Model而不需要去改表现层中的东西。
  *
  * @author wugang
  * date: 2019-11-06 10:47
@@ -57,4 +61,14 @@ public void setLastLoginTime(String lastLoginTime) {
         this.lastLoginTime = lastLoginTime;
     }
 
+    @Override
+    public String toString() {
+        return "UserDTO{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", lastLoginTime='" + lastLoginTime + '\'' +
+                '}';
+    }
 }

src/main/java/com/bubble/house/entity/house/HouseStatus.java

@@ -7,10 +7,22 @@
  * date: 2019-11-06 16:19
  **/
 public enum HouseStatus {
-    NOT_AUDITED(0), // 未审核
-    PASSES(1), // 审核通过
-    RENTED(2), // 已出租
-    DELETED(3); // 逻辑删除
+    /**
+     * 未审核
+     */
+    NOT_AUDITED(0),
+    /**
+     * 审核通过
+     */
+    PASSES(1),
+    /**
+     * 已出租
+     */
+    RENTED(2),
+    /**
+     * 逻辑删除
+     */
+    DELETED(3);
 
     private int value;
 

src/main/java/com/bubble/house/entity/house/HouseSubscribeStatus.java

@@ -0,0 +1,45 @@
+package com.bubble.house.entity.house;
+
+/**
+ * 预约状态码
+ *
+ * @author wugang
+ * date: 2019-11-06 16:19
+ **/
+public enum HouseSubscribeStatus {
+    /**
+     * 未预约
+     */
+    NO_SUBSCRIBE(0),
+    /**
+     * 已加入待看清单
+     */
+    IN_ORDER_LIST(1),
+    /**
+     * 已经预约看房时间
+     */
+    IN_ORDER_TIME(2),
+    /**
+     * 已完成预约
+     */
+    FINISH(3);
+
+    private int value;
+
+    HouseSubscribeStatus(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static HouseSubscribeStatus of(int value) {
+        for (HouseSubscribeStatus status : HouseSubscribeStatus.values()) {
+            if (status.getValue() == value) {
+                return status;
+            }
+        }
+        return HouseSubscribeStatus.NO_SUBSCRIBE;
+    }
+}

src/main/java/com/bubble/house/entity/result/MultiResultEntity.java src/main/java/com/bubble/house/entity/result/ServiceMultiResultEntity.java

@@ -9,13 +9,13 @@
  * @author wugang
  * date: 2019-11-05 16:23
  **/
-public class MultiResultEntity<T> implements Serializable {
+public class ServiceMultiResultEntity<T> implements Serializable {
     private static final long serialVersionUID = -4332117581412537479L;
 
     private long total;
     private List<T> result;
 
-    public MultiResultEntity(long total, List<T> result) {
+    public ServiceMultiResultEntity(long total, List<T> result) {
         this.total = total;
         this.result = result;
     }

src/main/java/com/bubble/house/entity/result/ResultEntity.java src/main/java/com/bubble/house/entity/result/ServiceResultEntity.java

@@ -3,28 +3,28 @@
 import java.io.Serializable;
 
 /**
- * 单一结果
+ * 单一服务接口通用结构
  *
  * @author wugang
  * date: 2019-11-05 18:25
  **/
-public class ResultEntity<T> implements Serializable {
+public class ServiceResultEntity<T> implements Serializable {
     private static final long serialVersionUID = 8366884940162742457L;
 
     private boolean success;
     private String message;
     private T result;
 
-    public ResultEntity(boolean success) {
+    public ServiceResultEntity(boolean success) {
         this.success = success;
     }
 
-    public ResultEntity(boolean success, String message) {
+    public ServiceResultEntity(boolean success, String message) {
         this.success = success;
         this.message = message;
     }
 
-    public ResultEntity(boolean success, String message, T result) {
+    public ServiceResultEntity(boolean success, String message, T result) {
         this.success = success;
         this.message = message;
         this.result = result;
@@ -54,21 +54,24 @@ public void setResult(T result) {
         this.result = result;
     }
 
-    public static <T> ResultEntity<T> success() {
-        return new ResultEntity<>(true);
+    public static <T> ServiceResultEntity<T> success() {
+        return new ServiceResultEntity<>(true);
     }
 
-    public static <T> ResultEntity<T> of(T result) {
-        ResultEntity<T> serviceResult = new ResultEntity<>(true);
+    public static <T> ServiceResultEntity<T> of(T result) {
+        ServiceResultEntity<T> serviceResult = new ServiceResultEntity<>(true);
         serviceResult.setResult(result);
         return serviceResult;
     }
 
-    public static <T> ResultEntity<T> notFound() {
-        return new ResultEntity<>(false, Message.NOT_FOUND.getValue());
+    public static <T> ServiceResultEntity<T> notFound() {
+        return new ServiceResultEntity<>(false, Message.NOT_FOUND.getValue());
     }
 
     public enum Message {
+        /**
+         * 服务返回信息
+         */
         NOT_FOUND("Not Found Resource!"),
         NOT_LOGIN("User not login!");
 

src/main/java/com/bubble/house/entity/user/RoleEntity.java

@@ -4,7 +4,7 @@
 import java.io.Serializable;
 
 /**
- * Role
+ * Role：角色数据
  *
  * @author wugang
  * date: 2019-11-05 19:15

src/main/java/com/bubble/house/entity/user/UserEntity.java

@@ -70,7 +70,8 @@ public class UserEntity implements Serializable, UserDetails {
     private String avatar;
 
     /**
-     *
+     * 用户权限信息集合。
+     * 注意：因为user表中没有该字段，所以添加@Transient注解，不需要去验证该字段，让该字段处于透明状态。
      */
     @Transient
     private List<GrantedAuthority> authorityList;

src/main/java/com/bubble/house/repository/RoleRepository.java

@@ -6,11 +6,17 @@
 import java.util.List;
 
 /**
- * Role
+ * Role：角色数据Dao
  *
  * @author wugang
  * date: 2019-11-06 10:51
  **/
 public interface RoleRepository extends CrudRepository<RoleEntity, Long> {
+    /**
+     * 根据userId获取Role信息
+     *
+     * @param userId 用户ID
+     * @return List<RoleEntity>
+     */
     List<RoleEntity> findRolesByUserId(Long userId);
 }

src/main/java/com/bubble/house/service/house/AddressService.java

@@ -1,12 +1,12 @@
 package com.bubble.house.service.house;
 
 import com.bubble.house.entity.BaiDuMapEntity;
-import com.bubble.house.entity.result.MultiResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
 import com.bubble.house.entity.house.CityEntity;
 import com.bubble.house.entity.house.CityLevel;
 import com.bubble.house.entity.house.SubwayEntity;
 import com.bubble.house.entity.house.SubwayStationEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,7 @@ public interface AddressService {
      *
      * @return 城市列表
      */
-    MultiResultEntity<CityEntity> findAllCities();
+    ServiceMultiResultEntity<CityEntity> findAllCities();
 
     /**
      * 根据英文简写获取具体区域的信息
@@ -42,7 +42,7 @@ public interface AddressService {
      * @param cityEnName 城市英文简写
      * @return 城市所有支持的区域信息
      */
-    MultiResultEntity<CityEntity> findAllRegionsByCityEnName(String cityEnName);
+    ServiceMultiResultEntity<CityEntity> findAllRegionsByCityEnName(String cityEnName);
 
     /**
      * 获取该城市所有的地铁线路
@@ -63,33 +63,33 @@ public interface AddressService {
     /**
      * 获取地铁线信息
      */
-    ResultEntity<SubwayEntity> findSubway(Long subwayId);
+    ServiceResultEntity<SubwayEntity> findSubway(Long subwayId);
 
     /**
      * 获取地铁站点信息
      */
-    ResultEntity<SubwayStationEntity> findSubwayStation(Long stationId);
+    ServiceResultEntity<SubwayStationEntity> findSubwayStation(Long stationId);
 
     /**
      * 根据城市英文简写获取城市详细信息
      */
-    ResultEntity<CityEntity> findCity(String cityEnName);
+    ServiceResultEntity<CityEntity> findCity(String cityEnName);
 
     /**
      * 根据城市以及具体地位获取百度地图的经纬度
      * （需请求百度地图API，建议加缓存、）
      */
-    ResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String address);
+    ServiceResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String address);
 
     /**
      * 上传百度LBS数据
      */
-    ResultEntity lbsUpload(BaiDuMapEntity location, String title, String address,
-                            long houseId, int price, int area);
+    ServiceResultEntity lbsUpload(BaiDuMapEntity location, String title, String address,
+                                  long houseId, int price, int area);
 
     /**
      * 移除百度LBS数据
      */
-    ResultEntity removeLbs(Long houseId);
+    ServiceResultEntity removeLbs(Long houseId);
 
 }

src/main/java/com/bubble/house/service/house/AddressServiceImpl.java

@@ -5,8 +5,8 @@
 import com.bubble.house.entity.house.CityLevel;
 import com.bubble.house.entity.house.SubwayEntity;
 import com.bubble.house.entity.house.SubwayStationEntity;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.repository.CityRepository;
 import com.bubble.house.repository.SubwayRepository;
 import com.bubble.house.repository.SubwayStationRepository;
@@ -61,10 +61,10 @@ public AddressServiceImpl(CityRepository cityRepository, SubwayRepository subway
     private ObjectMapper objectMapper;
 
     @Override
-    public MultiResultEntity<CityEntity> findAllCities() {
+    public ServiceMultiResultEntity<CityEntity> findAllCities() {
         List<CityEntity> cityEntityList = this.cityRepository.findAllByLevel(CityLevel.CITY.getValue());
         LOGGER.debug("加载城市信息：{}", cityEntityList.size());
-        return new MultiResultEntity<>(cityEntityList.size(), cityEntityList);
+        return new ServiceMultiResultEntity<>(cityEntityList.size(), cityEntityList);
     }
 
     @Override
@@ -79,13 +79,13 @@ public Map<CityLevel, CityEntity> findCityAndRegion(String cityEnName, String re
     }
 
     @Override
-    public MultiResultEntity<CityEntity> findAllRegionsByCityEnName(String cityEnName) {
+    public ServiceMultiResultEntity<CityEntity> findAllRegionsByCityEnName(String cityEnName) {
         LOGGER.debug("开始加载城市[{}]下的县区信息", cityEnName);
         if (null == cityEnName) {
-            return new MultiResultEntity<>(0, null);
+            return new ServiceMultiResultEntity<>(0, null);
         }
         List<CityEntity> regions = this.cityRepository.findAllByLevelAndBelongTo(CityLevel.REGION.getValue(), cityEnName);
-        return new MultiResultEntity<>(regions.size(), regions);
+        return new ServiceMultiResultEntity<>(regions.size(), regions);
     }
 
     @Override
@@ -106,40 +106,40 @@ public List<SubwayStationEntity> findAllStationBySubway(Long subwayId) {
     }
 
     @Override
-    public ResultEntity<SubwayEntity> findSubway(Long subwayId) {
+    public ServiceResultEntity<SubwayEntity> findSubway(Long subwayId) {
         LOGGER.debug("开始加载地铁[{}]的地铁线路信息", subwayId);
         if (subwayId == null) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         Optional<SubwayEntity> subwayOp = subwayRepository.findById(subwayId);
-        return subwayOp.map(ResultEntity::of).orElseGet(ResultEntity::notFound);
+        return subwayOp.map(ServiceResultEntity::of).orElseGet(ServiceResultEntity::notFound);
     }
 
     @Override
-    public ResultEntity<SubwayStationEntity> findSubwayStation(Long stationId) {
+    public ServiceResultEntity<SubwayStationEntity> findSubwayStation(Long stationId) {
         LOGGER.debug("开始加载地铁站[{}]的信息", stationId);
         if (null == stationId) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         Optional<SubwayStationEntity> subwayStationOp = subwayStationRepository.findById(stationId);
-        return subwayStationOp.map(ResultEntity::of).orElseGet(ResultEntity::notFound);
+        return subwayStationOp.map(ServiceResultEntity::of).orElseGet(ServiceResultEntity::notFound);
     }
 
     @Override
-    public ResultEntity<CityEntity> findCity(String cityEnName) {
+    public ServiceResultEntity<CityEntity> findCity(String cityEnName) {
         LOGGER.debug("开始加载城市[{}]的信息", cityEnName);
         if (null == cityEnName) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         CityEntity city = cityRepository.findByEnNameAndLevel(cityEnName, CityLevel.CITY.getValue());
-        return city == null ? ResultEntity.notFound() : ResultEntity.of(city);
+        return city == null ? ServiceResultEntity.notFound() : ServiceResultEntity.of(city);
     }
 
     private static final String BAIDU_MAP_GEOCONV_API = "http://api.map.baidu.com/geocoder/v2/?";
     private static final String BAIDU_MAP_KEY = "6QtSF673D1pYl3eQkEXfwp8ZgsQpB77U";
 
     @Override
-    public ResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String address) {
+    public ServiceResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String address) {
         LOGGER.debug("开始获取[{}-{}]的地理编码信息", city, address);
         String encodeAddress;
         String encodeCity;
@@ -149,7 +149,7 @@ public ResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String addr
             encodeCity = URLEncoder.encode(city, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             LOGGER.error("[{} - {}] Encode 失败", city, address);
-            return new ResultEntity<>(false, "Encode house address失败");
+            return new ServiceResultEntity<>(false, "Encode house address失败");
         }
         // 百度地理编码服务
         HttpClient httpClient = HttpClients.createDefault();
@@ -164,24 +164,24 @@ public ResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String addr
             HttpResponse response = httpClient.execute(get);
             if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
                 LOGGER.error("[{} - {}] 获取百度坐标失败", city, address);
-                return new ResultEntity<>(false, "获取百度坐标信息失败");
+                return new ServiceResultEntity<>(false, "获取百度坐标信息失败");
             }
             String result = EntityUtils.toString(response.getEntity(), "UTF-8");
             JsonNode jsonNode = objectMapper.readTree(result);
             int status = jsonNode.get("status").asInt();
             if (status != 0) {
                 LOGGER.error("[{} - {}] 获取百度坐标失败", city, address);
-                return new ResultEntity<>(false, "获取百度坐标信息失败, Status: " + status);
+                return new ServiceResultEntity<>(false, "获取百度坐标信息失败, Status: " + status);
             } else {
                 BaiDuMapEntity location = new BaiDuMapEntity();
                 JsonNode jsonLocation = jsonNode.get("result").get("location");
                 location.setLongitude(jsonLocation.get("lng").asDouble());
                 location.setLatitude(jsonLocation.get("lat").asDouble());
-                return ResultEntity.of(location);
+                return ServiceResultEntity.of(location);
             }
         } catch (IOException e) {
             LOGGER.error("[{} - {}] 获取百度坐标异常", city, address);
-            return new ResultEntity<>(false, "获取百度坐标信息出现异常");
+            return new ServiceResultEntity<>(false, "获取百度坐标信息出现异常");
         }
     }
 
@@ -195,7 +195,7 @@ public ResultEntity<BaiDuMapEntity> getBaiDuMapLocation(String city, String addr
     private final String GEO_TABLE_ID = "175730";
 
     @Override
-    public ResultEntity lbsUpload(BaiDuMapEntity location, String title, String address, long houseId, int price, int area) {
+    public ServiceResultEntity lbsUpload(BaiDuMapEntity location, String title, String address, long houseId, int price, int area) {
         LOGGER.debug("开始上传LBS数据到百度存储, House:{}", houseId);
         HttpClient httpClient = HttpClients.createDefault();
         List<NameValuePair> nvps = Lists.newArrayList();
@@ -223,22 +223,22 @@ public ResultEntity lbsUpload(BaiDuMapEntity location, String title, String addr
             String result = EntityUtils.toString(response.getEntity(), "UTF-8");
             if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
                 LOGGER.error("上传LBS数据到百度云存储失败, Response: {}", result);
-                return new ResultEntity(false, "上传LBS数据到百度云存储失败");
+                return new ServiceResultEntity(false, "上传LBS数据到百度云存储失败");
             } else {
                 JsonNode jsonNode = objectMapper.readTree(result);
                 int status = jsonNode.get("status").asInt();
                 if (status != 0) {
                     String message = jsonNode.get("message").asText();
                     LOGGER.error("上传LBS数据到百度云存储失败, Status: {}. Message: {}", status, message);
-                    return new ResultEntity(false, "上传LBS数据到百度云存储失败");
+                    return new ServiceResultEntity(false, "上传LBS数据到百度云存储失败");
                 } else {
-                    return ResultEntity.success();
+                    return ServiceResultEntity.success();
                 }
             }
 
         } catch (IOException e) {
             LOGGER.error("上传LBS数据到百度云存储异常");
-            return new ResultEntity(false, "上传LBS数据到百度云存储异常");
+            return new ServiceResultEntity(false, "上传LBS数据到百度云存储异常");
         }
     }
 
@@ -277,7 +277,7 @@ private boolean isLbsDataExists(Long houseId) {
     }
 
     @Override
-    public ResultEntity removeLbs(Long houseId) {
+    public ServiceResultEntity removeLbs(Long houseId) {
         LOGGER.debug("开始移除LBS数据, House: {}", houseId);
         HttpClient httpClient = HttpClients.createDefault();
         List<NameValuePair> nvps = Lists.newArrayListWithCapacity(3);
@@ -292,20 +292,20 @@ public ResultEntity removeLbs(Long houseId) {
             String result = EntityUtils.toString(response.getEntity(), "UTF-8");
             if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
                 LOGGER.error("移除LBS数据失败, Response: {}", response);
-                return new ResultEntity(false, "移除LBS数据失败");
+                return new ServiceResultEntity(false, "移除LBS数据失败");
             }
 
             JsonNode jsonNode = objectMapper.readTree(result);
             int status = jsonNode.get("status").asInt();
             if (status != 0) {
                 String message = jsonNode.get("message").asText();
                 LOGGER.error("移除LBS数据失败, Message: {}", message);
-                return new ResultEntity(false, "移除LBS数据失败, Message: {}" + message);
+                return new ServiceResultEntity(false, "移除LBS数据失败, Message: {}" + message);
             }
-            return ResultEntity.success();
+            return ServiceResultEntity.success();
         } catch (IOException e) {
             LOGGER.error("移除LBS数据异常");
-            return new ResultEntity(false, "移除LBS数据异常");
+            return new ServiceResultEntity(false, "移除LBS数据异常");
         }
     }
 

src/main/java/com/bubble/house/service/house/HouseService.java

@@ -4,8 +4,8 @@
 import com.bubble.house.entity.param.DatatableSearchParam;
 import com.bubble.house.entity.param.HouseParam;
 import com.bubble.house.entity.param.RentSearchParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.search.MapSearchEntity;
 
 /**
@@ -18,62 +18,63 @@ public interface HouseService {
     /**
      * 新增House信息
      */
-    ResultEntity<HouseDTO> save(HouseParam houseParam);
+    ServiceResultEntity<HouseDTO> save(HouseParam houseParam);
 
     /**
      * House信息展示：分页、筛选、搜索
      */
-    MultiResultEntity<HouseDTO> adminQuery(DatatableSearchParam searchBody);
+    ServiceMultiResultEntity<HouseDTO> adminQuery(DatatableSearchParam searchBody);
 
     /**
      * 查询完整房源信息
      */
-    ResultEntity<HouseDTO> findCompleteOne(Long id);
+    ServiceResultEntity<HouseDTO> findCompleteOne(Long id);
 
     /**
      * 数据更新
      */
-    ResultEntity update(HouseParam houseParam);
+    ServiceResultEntity update(HouseParam houseParam);
 
     /**
      * 移除图片
      */
-    ResultEntity removePhoto(Long id);
+    ServiceResultEntity removePhoto(Long id);
 
     /**
      * 更新封面
      */
-    ResultEntity updateCover(Long coverId, Long targetId);
+    ServiceResultEntity updateCover(Long coverId, Long targetId);
 
     /**
      * 新增标签
      */
-    ResultEntity addTag(Long houseId, String tag);
+    ServiceResultEntity addTag(Long houseId, String tag);
 
     /**
      * 移除标签
      */
-    ResultEntity removeTag(Long houseId, String tag);
+    ServiceResultEntity removeTag(Long houseId, String tag);
 
     /**
      * 更新房源状态
      */
-    ResultEntity updateStatus(Long id, int status);
+    ServiceResultEntity updateStatus(Long id, int status);
 
 
     /**
      * 查询房源信息集
      */
-    MultiResultEntity<HouseDTO> query(RentSearchParam rentSearch);
+    ServiceMultiResultEntity<HouseDTO> query(RentSearchParam rentSearch);
 
     /**
      * 全地图查询
      */
-    MultiResultEntity<HouseDTO> wholeMapQuery(MapSearchEntity mapSearch);
+    ServiceMultiResultEntity<HouseDTO> wholeMapQuery(MapSearchEntity mapSearch);
 
     /**
      * 精确范围数据查询
      */
-    MultiResultEntity<HouseDTO> boundMapQuery(MapSearchEntity mapSearch);
+    ServiceMultiResultEntity<HouseDTO> boundMapQuery(MapSearchEntity mapSearch);
+
 
 }

src/main/java/com/bubble/house/service/house/HouseServiceImpl.java

@@ -10,8 +10,8 @@
 import com.bubble.house.entity.param.HouseParam;
 import com.bubble.house.entity.param.PhotoParam;
 import com.bubble.house.entity.param.RentSearchParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.search.MapSearchEntity;
 import com.bubble.house.repository.*;
 import com.bubble.house.service.search.SearchService;
@@ -80,9 +80,9 @@ public HouseServiceImpl(SubwayRepository subwayRepository, SubwayStationReposito
     }
 
     @Override
-    public ResultEntity<HouseDTO> save(HouseParam houseParam) {
+    public ServiceResultEntity<HouseDTO> save(HouseParam houseParam) {
         HouseDetailEntity detail = new HouseDetailEntity();
-        ResultEntity<HouseDTO> subwayValidationResult = wrapperDetailInfo(detail, houseParam);
+        ServiceResultEntity<HouseDTO> subwayValidationResult = wrapperDetailInfo(detail, houseParam);
         if (subwayValidationResult != null) {
             return subwayValidationResult;
         }
@@ -123,7 +123,7 @@ public ResultEntity<HouseDTO> save(HouseParam houseParam) {
             houseDTO.setTags(tags);
         }
         LOGGER.info("save house [{}] info successfully", house.getId());
-        return new ResultEntity<>(true, null, houseDTO);
+        return new ServiceResultEntity<>(true, null, houseDTO);
     }
 
     /**
@@ -149,14 +149,14 @@ private List<HousePictureEntity> generatePictures(HouseParam houseParam, Long ho
     /**
      * 房源详细信息对象填充
      */
-    private ResultEntity<HouseDTO> wrapperDetailInfo(HouseDetailEntity houseDetail, HouseParam houseParam) {
+    private ServiceResultEntity<HouseDTO> wrapperDetailInfo(HouseDetailEntity houseDetail, HouseParam houseParam) {
         Optional<SubwayEntity> subwayOp = this.subwayRepository.findById(houseParam.getSubwayLineId());
         if (subwayOp.isPresent()) {
             SubwayEntity subway = subwayOp.get();
             Optional<SubwayStationEntity> subwayStationOp = this.subwayStationRepository.findById(houseParam.getSubwayStationId());
             if (!subwayStationOp.isPresent() || !subway.getId().equals(subwayStationOp.get().getSubwayId())) {
                 LOGGER.error("[{}] Not valid subway station!", houseDetail.getHouseId());
-                return new ResultEntity<>(false, "Not valid subway station!");
+                return new ServiceResultEntity<>(false, "Not valid subway station!");
             } else {
                 SubwayStationEntity subwayStation = subwayStationOp.get();
 
@@ -175,13 +175,13 @@ private ResultEntity<HouseDTO> wrapperDetailInfo(HouseDetailEntity houseDetail,
             }
         } else {
             LOGGER.error("[{}] Not valid subway line!", houseDetail.getHouseId());
-            return new ResultEntity<>(false, "Not valid subway line!");
+            return new ServiceResultEntity<>(false, "Not valid subway line!");
         }
         return null;
     }
 
     @Override
-    public MultiResultEntity<HouseDTO> adminQuery(DatatableSearchParam searchBody) {
+    public ServiceMultiResultEntity<HouseDTO> adminQuery(DatatableSearchParam searchBody) {
         List<HouseDTO> houseDTOS = Lists.newArrayList();
         // 分页查询
         Sort sort = Sort.by(Sort.Direction.fromString(searchBody.getDirection()), searchBody.getOrderBy());
@@ -222,15 +222,15 @@ public MultiResultEntity<HouseDTO> adminQuery(DatatableSearchParam searchBody) {
             houseDTOS.add(houseDTO);
         });
 
-        return new MultiResultEntity<>(houses.getTotalElements(), houseDTOS);
+        return new ServiceMultiResultEntity<>(houses.getTotalElements(), houseDTOS);
 //        return new MultiResultEntity<>(houseDTOS.size(), houseDTOS);
     }
 
     @Override
-    public ResultEntity<HouseDTO> findCompleteOne(Long id) {
+    public ServiceResultEntity<HouseDTO> findCompleteOne(Long id) {
         Optional<HouseEntity> houseOp = houseRepository.findById(id);
         if (!houseOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         HouseDetailEntity detail = houseDetailRepository.findByHouseId(id);
         List<HousePictureEntity> pictures = housePictureRepository.findAllByHouseId(id);
@@ -258,22 +258,22 @@ public ResultEntity<HouseDTO> findCompleteOne(Long id) {
                 result.setSubscribeStatus(subscribe.getStatus());
             }
         }
-        return ResultEntity.of(result);
+        return ServiceResultEntity.of(result);
     }
 
     @Override
     @Transactional
-    public ResultEntity update(HouseParam houseParam) {
+    public ServiceResultEntity update(HouseParam houseParam) {
         Optional<HouseEntity> houseOp = this.houseRepository.findById(houseParam.getId());
         if (!houseOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         HouseEntity house = houseOp.get();
         HouseDetailEntity detail = this.houseDetailRepository.findByHouseId(house.getId());
         if (detail == null) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
-        ResultEntity wrapperResult = wrapperDetailInfo(detail, houseParam);
+        ServiceResultEntity wrapperResult = wrapperDetailInfo(detail, houseParam);
         if (wrapperResult != null) {
             return wrapperResult;
         }
@@ -293,91 +293,91 @@ public ResultEntity update(HouseParam houseParam) {
             this.searchService.index(house.getId());
         }
 
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 
     @Override
-    public ResultEntity removePhoto(Long id) {
+    public ServiceResultEntity removePhoto(Long id) {
         Optional<HousePictureEntity> pictureOp = this.housePictureRepository.findById(id);
         if (pictureOp.isPresent()) {
             try {
                 Response response = this.qiNiuService.delete(pictureOp.get().getPath());
                 if (response.isOK()) {
                     this.housePictureRepository.deleteById(id);
-                    return ResultEntity.success();
+                    return ServiceResultEntity.success();
                 } else {
-                    return new ResultEntity(false, response.error);
+                    return new ServiceResultEntity(false, response.error);
                 }
             } catch (QiniuException e) {
                 LOGGER.error("删除七牛云图片[{}]异常", id);
-                return new ResultEntity(false, e.getMessage());
+                return new ServiceResultEntity(false, e.getMessage());
             }
         } else {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
     }
 
     @Override
     @Transactional
-    public ResultEntity updateCover(Long coverId, Long targetId) {
+    public ServiceResultEntity updateCover(Long coverId, Long targetId) {
         Optional<HousePictureEntity> coverOp = this.housePictureRepository.findById(coverId);
         if (!coverOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         this.houseRepository.updateCover(targetId, coverOp.get().getPath());
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 
     @Override
     @Transactional
-    public ResultEntity addTag(Long houseId, String tag) {
+    public ServiceResultEntity addTag(Long houseId, String tag) {
         Optional<HouseEntity> houseOp = this.houseRepository.findById(houseId);
         if (!houseOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
 
         HouseTagEntity houseTag = this.houseTagRepository.findByNameAndHouseId(tag, houseId);
         if (houseTag != null) {
-            return new ResultEntity(false, "标签已存在");
+            return new ServiceResultEntity(false, "标签已存在");
         }
         this.houseTagRepository.save(new HouseTagEntity(houseId, tag));
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 
     @Override
     @Transactional
-    public ResultEntity removeTag(Long houseId, String tag) {
+    public ServiceResultEntity removeTag(Long houseId, String tag) {
         Optional<HouseEntity> houseOp = this.houseRepository.findById(houseId);
         if (!houseOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
 
         HouseTagEntity houseTag = this.houseTagRepository.findByNameAndHouseId(tag, houseId);
         if (houseTag == null) {
-            return new ResultEntity(false, "标签不存在");
+            return new ServiceResultEntity(false, "标签不存在");
         }
 
         this.houseTagRepository.deleteById(houseTag.getId());
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 
 
     @Override
     @Transactional
-    public ResultEntity updateStatus(Long id, int status) {
+    public ServiceResultEntity updateStatus(Long id, int status) {
         Optional<HouseEntity> houseOp = this.houseRepository.findById(id);
         if (!houseOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         HouseEntity house = houseOp.get();
         if (house.getStatus() == status) {
-            return new ResultEntity(false, "状态没有发生变化");
+            return new ServiceResultEntity(false, "状态没有发生变化");
         }
         if (house.getStatus() == HouseStatus.RENTED.getValue()) {
-            return new ResultEntity(false, "已出租的房源不允许修改状态");
+            return new ServiceResultEntity(false, "已出租的房源不允许修改状态");
         }
         if (house.getStatus() == HouseStatus.DELETED.getValue()) {
-            return new ResultEntity(false, "已删除的资源不允许操作");
+            return new ServiceResultEntity(false, "已删除的资源不允许操作");
         }
         this.houseRepository.updateStatus(id, status);
 
@@ -387,23 +387,23 @@ public ResultEntity updateStatus(Long id, int status) {
         } else {
             searchService.remove(id);
         }
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 
     @Override
-    public MultiResultEntity<HouseDTO> query(RentSearchParam rentSearch) {
+    public ServiceMultiResultEntity<HouseDTO> query(RentSearchParam rentSearch) {
         if (rentSearch.getKeywords() != null && !rentSearch.getKeywords().isEmpty()) {
-            MultiResultEntity<Long> multiResult = this.searchService.query(rentSearch);
+            ServiceMultiResultEntity<Long> multiResult = this.searchService.query(rentSearch);
             if (multiResult.getTotal() == 0) {
-                return new MultiResultEntity<>(0, Lists.newArrayList());
+                return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
             }
-            return new MultiResultEntity<>(multiResult.getTotal(), wrapperHouseResult(multiResult.getResult()));
+            return new ServiceMultiResultEntity<>(multiResult.getTotal(), wrapperHouseResult(multiResult.getResult()));
         }
         // 简单查询
         return simpleQuery(rentSearch);
     }
 
-    private MultiResultEntity<HouseDTO> simpleQuery(RentSearchParam rentSearch) {
+    private ServiceMultiResultEntity<HouseDTO> simpleQuery(RentSearchParam rentSearch) {
         Sort sort = HouseSort.generateSort(rentSearch.getOrderBy(), rentSearch.getOrderDirection());
         int page = rentSearch.getStart() / rentSearch.getSize();
         Pageable pageable = PageRequest.of(page, rentSearch.getSize(), sort);
@@ -440,7 +440,7 @@ private MultiResultEntity<HouseDTO> simpleQuery(RentSearchParam rentSearch) {
         List<Long> houseIds = Lists.newArrayList();
         houses.forEach(h -> houseIds.add(h.getId()));
         List<HouseDTO> houseDTOS = wrapperHouseResult(houseIds);
-        return new MultiResultEntity<>(houses.getTotalElements(), houseDTOS);
+        return new ServiceMultiResultEntity<>(houses.getTotalElements(), houseDTOS);
     }
 
     /**
@@ -483,25 +483,25 @@ private void wrapperHouseList(List<Long> houseIds, Map<Long, HouseDTO> idToHouse
 
 
     @Override
-    public MultiResultEntity<HouseDTO> wholeMapQuery(MapSearchEntity mapSearch) {
-        MultiResultEntity<Long> serviceResult = searchService.mapQuery(mapSearch.getCityEnName(), mapSearch.getOrderBy(), mapSearch.getOrderDirection(), mapSearch.getStart(), mapSearch.getSize());
+    public ServiceMultiResultEntity<HouseDTO> wholeMapQuery(MapSearchEntity mapSearch) {
+        ServiceMultiResultEntity<Long> serviceResult = searchService.mapQuery(mapSearch.getCityEnName(), mapSearch.getOrderBy(), mapSearch.getOrderDirection(), mapSearch.getStart(), mapSearch.getSize());
 
         if (serviceResult.getTotal() == 0) {
-            return new MultiResultEntity<>(0, Lists.newArrayList());
+            return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
         }
         List<HouseDTO> houses = wrapperHouseResult(serviceResult.getResult());
-        return new MultiResultEntity<>(serviceResult.getTotal(), houses);
+        return new ServiceMultiResultEntity<>(serviceResult.getTotal(), houses);
     }
 
     @Override
-    public MultiResultEntity<HouseDTO> boundMapQuery(MapSearchEntity mapSearch) {
-        MultiResultEntity<Long> serviceResult = searchService.mapQuery(mapSearch);
+    public ServiceMultiResultEntity<HouseDTO> boundMapQuery(MapSearchEntity mapSearch) {
+        ServiceMultiResultEntity<Long> serviceResult = searchService.mapQuery(mapSearch);
         if (serviceResult.getTotal() == 0) {
-            return new MultiResultEntity<>(0, Lists.newArrayList());
+            return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
         }
 
         List<HouseDTO> houses = wrapperHouseResult(serviceResult.getResult());
-        return new MultiResultEntity<>(serviceResult.getTotal(), houses);
+        return new ServiceMultiResultEntity<>(serviceResult.getTotal(), houses);
     }
 
 }

src/main/java/com/bubble/house/service/house/SubscribeService.java

@@ -0,0 +1,23 @@
+package com.bubble.house.service.house;
+
+import com.bubble.house.entity.result.ServiceResultEntity;
+
+/**
+ * 预约管理服务
+ *
+ * @author wugang
+ * date: 2020-10-27 18:13
+ **/
+public interface SubscribeService {
+
+    /* --- 房源预约管理 --- */
+
+    /**
+     * 加入预约清单
+     *
+     * @param houseId 房源ID
+     * @return ResultEntity
+     */
+    ServiceResultEntity addSubscribeOrder(Long houseId);
+
+}

src/main/java/com/bubble/house/service/house/SubscribeServiceImpl.java

@@ -0,0 +1,61 @@
+package com.bubble.house.service.house;
+
+import com.bubble.house.base.LoginUserUtil;
+import com.bubble.house.entity.house.HouseEntity;
+import com.bubble.house.entity.house.HouseSubscribeEntity;
+import com.bubble.house.entity.house.HouseSubscribeStatus;
+import com.bubble.house.entity.result.ServiceResultEntity;
+import com.bubble.house.repository.HouseRepository;
+import com.bubble.house.repository.HouseSubscribeRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.Optional;
+
+/**
+ * 房源预约管理服务实现
+ *
+ * @author wugang
+ * date: 2020-10-27 18:14
+ **/
+@Service
+public class SubscribeServiceImpl implements SubscribeService {
+    private final Logger logger = LoggerFactory.getLogger(SubscribeServiceImpl.class);
+
+    private final HouseSubscribeRepository subscribeRepository;
+    private final HouseRepository houseRepository;
+
+    public SubscribeServiceImpl(HouseSubscribeRepository subscribeRepository, HouseRepository houseRepository) {
+        this.subscribeRepository = subscribeRepository;
+        this.houseRepository = houseRepository;
+    }
+
+    @Override
+    @Transactional
+    public ServiceResultEntity addSubscribeOrder(Long houseId) {
+        Long userId = LoginUserUtil.getLoginUserId();
+        HouseSubscribeEntity subscribe = subscribeRepository.findByHouseIdAndUserId(houseId, userId);
+        if (subscribe != null) {
+            return new ServiceResultEntity(false, "已加入预约");
+        }
+
+        Optional<HouseEntity> houseOp = houseRepository.findById(houseId);
+        if (!houseOp.isPresent()) {
+            return new ServiceResultEntity(false, "查无此房");
+        }
+        HouseEntity house = houseOp.get();
+        subscribe = new HouseSubscribeEntity();
+        Date now = new Date();
+        subscribe.setCreateTime(now);
+        subscribe.setLastUpdateTime(now);
+        subscribe.setUserId(userId);
+        subscribe.setHouseId(houseId);
+        subscribe.setStatus(HouseSubscribeStatus.IN_ORDER_LIST.getValue());
+        subscribe.setAdminId(house.getAdminId());
+        subscribeRepository.save(subscribe);
+        return ServiceResultEntity.success();
+    }
+}

src/main/java/com/bubble/house/service/search/SearchService.java

@@ -1,8 +1,8 @@
 package com.bubble.house.service.search;
 
 import com.bubble.house.entity.param.RentSearchParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.search.HouseBucketEntity;
 import com.bubble.house.entity.search.MapSearchEntity;
 
@@ -29,32 +29,32 @@ public interface SearchService {
     /**
      * 查询房源接口
      */
-    MultiResultEntity<Long> query(RentSearchParam rentSearch);
+    ServiceMultiResultEntity<Long> query(RentSearchParam rentSearch);
 
     /**
      * 获取补全建议关键词
      */
-    ResultEntity<List<String>> suggest(String prefix);
+    ServiceResultEntity<List<String>> suggest(String prefix);
 
     /**
      * 聚合特定小区的房间数
      */
-    ResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regionEnName, String district);
+    ServiceResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regionEnName, String district);
 
     /**
      * 聚合城市数据
      */
-    MultiResultEntity<HouseBucketEntity> mapAggregate(String cityEnName);
+    ServiceMultiResultEntity<HouseBucketEntity> mapAggregate(String cityEnName);
 
     /**
      * 城市级别查询
      */
-    MultiResultEntity<Long> mapQuery(String cityEnName, String orderBy,
-                                     String orderDirection, int start, int size);
+    ServiceMultiResultEntity<Long> mapQuery(String cityEnName, String orderBy,
+                                            String orderDirection, int start, int size);
 
     /**
      * 精确范围数据查询
      */
-    MultiResultEntity<Long> mapQuery(MapSearchEntity mapSearch);
+    ServiceMultiResultEntity<Long> mapQuery(MapSearchEntity mapSearch);
 
 }

src/main/java/com/bubble/house/service/search/SearchServiceImpl.java

@@ -8,8 +8,8 @@
 import com.bubble.house.entity.BaiDuMapEntity;
 import com.bubble.house.entity.house.*;
 import com.bubble.house.entity.param.RentSearchParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.search.HouseBucketEntity;
 import com.bubble.house.entity.search.MapSearchEntity;
 import com.bubble.house.entity.search.RentValueBlockEntity;
@@ -144,7 +144,7 @@ private void removeIndex(HouseIndexMessage message) {
             if (result == DocWriteResponse.Result.DELETED) {
                 LOGGER.info("删除[{}]成功.", houseId);
 
-                ResultEntity serviceResult = addressService.removeLbs(houseId);
+                ServiceResultEntity serviceResult = addressService.removeLbs(houseId);
                 if (!serviceResult.isSuccess()) {
                     LOGGER.error("删除LBS data [{}]失败.", houseId);
                     // 重新加入消息队列
@@ -181,7 +181,7 @@ private void createOrUpdateIndex(HouseIndexMessage message) {
         CityEntity region = cityRepository.findByEnNameAndLevel(house.getRegionEnName(), CityLevel.REGION.getValue());
 
         String address = city.getCnName() + region.getCnName() + house.getStreet() + house.getDistrict() + detail.getDetailAddress();
-        ResultEntity<BaiDuMapEntity> location = addressService.getBaiDuMapLocation(city.getCnName(), address);
+        ServiceResultEntity<BaiDuMapEntity> location = addressService.getBaiDuMapLocation(city.getCnName(), address);
         if (!location.isSuccess()) {
             this.index(message.getHouseId(), message.getRetry() + 1);
             return;
@@ -213,7 +213,7 @@ private void createOrUpdateIndex(HouseIndexMessage message) {
                 success = deleteAndCreate(totalHit, indexTemplate);
             }
 
-            ResultEntity serviceResult = addressService.lbsUpload(location.getResult(), house.getStreet() + house.getDistrict(),
+            ServiceResultEntity serviceResult = addressService.lbsUpload(location.getResult(), house.getStreet() + house.getDistrict(),
                     city.getCnName() + region.getCnName() + house.getStreet() + house.getDistrict(),
                     message.getHouseId(), house.getPrice(), house.getArea());
 
@@ -345,7 +345,7 @@ public void remove(Long houseId) {
     }
 
     @Override
-    public MultiResultEntity<Long> query(RentSearchParam rentSearch) {
+    public ServiceMultiResultEntity<Long> query(RentSearchParam rentSearch) {
         // city_en_name
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         boolQuery.filter(QueryBuilders.termQuery(HouseIndexConstants.CITY_EN_NAME, rentSearch.getCityEnName()));
@@ -435,20 +435,20 @@ public MultiResultEntity<Long> query(RentSearchParam rentSearch) {
                     String houseId = String.valueOf(hit.getSourceAsMap().get(HouseIndexConstants.HOUSE_ID));
                     houseIds.add(Long.parseLong(houseId));
                 }
-                return new MultiResultEntity<>(totalHits.value, houseIds);
+                return new ServiceMultiResultEntity<>(totalHits.value, houseIds);
             } else {
                 LOGGER.error("Search status is not ok for: {}", request);
-                return new MultiResultEntity<>(0, houseIds);
+                return new ServiceMultiResultEntity<>(0, houseIds);
             }
         } catch (IOException e) {
             LOGGER.error("Query Error...");
         }
 
-        return new MultiResultEntity<>(0, Lists.newArrayList());
+        return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
     }
 
     @Override
-    public ResultEntity<List<String>> suggest(String prefix) {
+    public ServiceResultEntity<List<String>> suggest(String prefix) {
         SearchRequest searchRequest = new SearchRequest(HouseIndexConstants.INDEX_NAME);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         SuggestionBuilder suggestion = SuggestBuilders.completionSuggestion("suggest").prefix(prefix).size(HouseIndexConstants.SUGGESTION_COUNT);
@@ -462,7 +462,7 @@ public ResultEntity<List<String>> suggest(String prefix) {
             if (response.status() == RestStatus.OK) {
                 Suggest suggest = response.getSuggest();
                 if (null == suggest) {
-                    return ResultEntity.of(Lists.newArrayList());
+                    return ServiceResultEntity.of(Lists.newArrayList());
                 }
                 Suggest.Suggestion result = suggest.getSuggestion(HouseIndexConstants.SUGGESTION_NAME);
                 int maxSuggest = 0;
@@ -487,15 +487,15 @@ public ResultEntity<List<String>> suggest(String prefix) {
                     }
                 }
                 List<String> suggests = Lists.newArrayList(suggestSet.toArray(new String[]{}));
-                return ResultEntity.of(suggests);
+                return ServiceResultEntity.of(suggests);
             } else {
-                return ResultEntity.of(Lists.newArrayList());
+                return ServiceResultEntity.of(Lists.newArrayList());
             }
         } catch (IOException e) {
             LOGGER.error("异常");
         }
 
-        return ResultEntity.of(Lists.newArrayList());
+        return ServiceResultEntity.of(Lists.newArrayList());
     }
 
     private boolean updateSuggest(HouseIndexTemplate indexTemplate) {
@@ -539,7 +539,7 @@ private boolean updateSuggest(HouseIndexTemplate indexTemplate) {
     }
 
     @Override
-    public ResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regionEnName, String district) {
+    public ServiceResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regionEnName, String district) {
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery()
                 .filter(QueryBuilders.termQuery(HouseIndexConstants.CITY_EN_NAME, cityEnName))
                 .filter(QueryBuilders.termQuery(HouseIndexConstants.REGION_EN_NAME, regionEnName))
@@ -557,7 +557,7 @@ public ResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regio
                 Terms terms = response.getAggregations().get(HouseIndexConstants.AGG_DISTRICT);
                 if (null != terms) { // ES中无该数据时
                     if (null != terms.getBuckets() && !terms.getBuckets().isEmpty()) {
-                        return ResultEntity.of(terms.getBucketByKey(district).getDocCount());
+                        return ServiceResultEntity.of(terms.getBucketByKey(district).getDocCount());
                     }
                 }
             } else {
@@ -567,11 +567,11 @@ public ResultEntity<Long> aggregateDistrictHouse(String cityEnName, String regio
             LOGGER.info("aggregate district house 异常");
         }
 
-        return ResultEntity.of(0L);
+        return ServiceResultEntity.of(0L);
     }
 
     @Override
-    public MultiResultEntity<HouseBucketEntity> mapAggregate(String cityEnName) {
+    public ServiceMultiResultEntity<HouseBucketEntity> mapAggregate(String cityEnName) {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         boolQuery.filter(QueryBuilders.termQuery(HouseIndexConstants.CITY_EN_NAME, cityEnName));
         AggregationBuilder aggregationBuilder = AggregationBuilders.terms(HouseIndexConstants.AGG_REGION)
@@ -588,22 +588,22 @@ public MultiResultEntity<HouseBucketEntity> mapAggregate(String cityEnName) {
             List<HouseBucketEntity> buckets = Lists.newArrayList();
             if (response.status() != RestStatus.OK) {
                 LOGGER.error("Aggregate status is not ok for: {}", searchRequest.toString());
-                return new MultiResultEntity<>(0, buckets);
+                return new ServiceMultiResultEntity<>(0, buckets);
             }
             Terms terms = response.getAggregations().get(HouseIndexConstants.AGG_REGION);
             for (Terms.Bucket bucket : terms.getBuckets()) {
                 buckets.add(new HouseBucketEntity(bucket.getKeyAsString(), bucket.getDocCount()));
             }
-            return new MultiResultEntity<>(response.getHits().getTotalHits().value, buckets);
+            return new ServiceMultiResultEntity<>(response.getHits().getTotalHits().value, buckets);
         } catch (IOException e) {
             LOGGER.error("map aggregate error.");
         }
 
-        return new MultiResultEntity<>(0, Lists.newArrayList());
+        return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
     }
 
     @Override
-    public MultiResultEntity<Long> mapQuery(String cityEnName, String orderBy, String orderDirection, int start, int size) {
+    public ServiceMultiResultEntity<Long> mapQuery(String cityEnName, String orderBy, String orderDirection, int start, int size) {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         boolQuery.filter(QueryBuilders.termQuery(HouseIndexConstants.CITY_EN_NAME, cityEnName));
 
@@ -621,20 +621,20 @@ public MultiResultEntity<Long> mapQuery(String cityEnName, String orderBy, Strin
 
             if (response.status() != RestStatus.OK) {
                 LOGGER.error("Search status is not ok for: {}", searchRequest.toString());
-                return new MultiResultEntity<>(0, houseIds);
+                return new ServiceMultiResultEntity<>(0, houseIds);
             }
             for (SearchHit hit : response.getHits()) {
                 houseIds.add(Long.parseLong(String.valueOf(hit.getSourceAsMap().get(HouseIndexConstants.HOUSE_ID))));
             }
-            return new MultiResultEntity<>(response.getHits().getTotalHits().value, houseIds);
+            return new ServiceMultiResultEntity<>(response.getHits().getTotalHits().value, houseIds);
         } catch (IOException e) {
             LOGGER.error("异常");
         }
-        return new MultiResultEntity<>(0, Lists.newArrayList());
+        return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
     }
 
     @Override
-    public MultiResultEntity<Long> mapQuery(MapSearchEntity mapSearch) {
+    public ServiceMultiResultEntity<Long> mapQuery(MapSearchEntity mapSearch) {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         boolQuery.filter(QueryBuilders.termQuery(HouseIndexConstants.CITY_EN_NAME, mapSearch.getCityEnName()));
 
@@ -660,16 +660,16 @@ public MultiResultEntity<Long> mapQuery(MapSearchEntity mapSearch) {
 
             if (response.status() != RestStatus.OK) {
                 LOGGER.error("Search status is not ok for: {}", searchRequest.toString());
-                return new MultiResultEntity<>(0, houseIds);
+                return new ServiceMultiResultEntity<>(0, houseIds);
             }
             for (SearchHit hit : response.getHits()) {
                 houseIds.add(Long.parseLong(String.valueOf(hit.getSourceAsMap().get(HouseIndexConstants.HOUSE_ID))));
             }
-            return new MultiResultEntity<>(response.getHits().getTotalHits().value, houseIds);
+            return new ServiceMultiResultEntity<>(response.getHits().getTotalHits().value, houseIds);
         } catch (IOException e) {
             LOGGER.error("异常");
         }
-        return new MultiResultEntity<>(0, Lists.newArrayList());
+        return new ServiceMultiResultEntity<>(0, Lists.newArrayList());
     }
 
 }

src/main/java/com/bubble/house/service/user/SMSService.java

@@ -1,6 +1,6 @@
 package com.bubble.house.service.user;
 
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 
 /**
  * SMS短信服务：验证码服务
@@ -13,7 +13,7 @@ public interface SMSService {
     /**
      * 发送验证码到指定手机 并 缓存验证码 10分钟 及 请求间隔时间1分钟
      */
-    ResultEntity<String> sendSms(String telephone);
+    ServiceResultEntity<String> sendSms(String telephone);
 
     /**
      * 获取缓存中的验证码

src/main/java/com/bubble/house/service/user/SMSServiceImpl.java

@@ -8,7 +8,7 @@
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -51,12 +51,12 @@ public SMSServiceImpl(RedisTemplate<String, String> redisTemplate) {
 
 
     @Override
-    public ResultEntity<String> sendSms(String telephone) {
+    public ServiceResultEntity<String> sendSms(String telephone) {
         String gapKey = "SMS::CODE::INTERVAL::" + telephone;
         String result = redisTemplate.opsForValue().get(gapKey);
         if (result != null) {
             LOGGER.error("send sms [{}] 请求次数太频繁", telephone);
-            return new ResultEntity<>(false, "请求次数太频繁");
+            return new ServiceResultEntity<>(false, "请求次数太频繁");
         }
         String code = generateRandomSmsCode();
         String templateParam = String.format("{\"code\": \"%s\"}", code);
@@ -83,10 +83,10 @@ public ResultEntity<String> sendSms(String telephone) {
         if (success) {
             redisTemplate.opsForValue().set(gapKey, code, 60, TimeUnit.SECONDS);
             redisTemplate.opsForValue().set(SMS_CODE_CONTENT_PREFIX + telephone, code, 10, TimeUnit.MINUTES);
-            return ResultEntity.of(code);
+            return ServiceResultEntity.of(code);
         } else {
             LOGGER.error("send sms [{}] 服务忙，请稍后重试", telephone);
-            return new ResultEntity<>(false, "服务忙，请稍后重试");
+            return new ServiceResultEntity<>(false, "服务忙，请稍后重试");
         }
     }
 

src/main/java/com/bubble/house/service/user/UserService.java

@@ -1,7 +1,7 @@
 package com.bubble.house.service.user;
 
 import com.bubble.house.entity.dto.UserDTO;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.user.UserEntity;
 
 /**
@@ -12,23 +12,45 @@
  **/
 public interface UserService {
 
+    /**
+     * 根据用户名查询并获取用户权限
+     *
+     * @param userName 用户名
+     * @return 用户实体
+     */
     UserEntity findUserByName(String userName);
 
-    ResultEntity<UserDTO> findById(Long userId);
+    /**
+     * 根据用户ID查询
+     *
+     * @param userId 用户ID
+     * @return ResultEntity<UserDTO>
+     */
+    ServiceResultEntity<UserDTO> findById(Long userId);
 
     /**
      * 根据电话号码寻找用户
+     *
+     * @param telephone 联系方式
+     * @return UserEntity
      */
     UserEntity findUserByTelephone(String telephone);
 
     /**
      * 通过手机号注册用户
+     *
+     * @param telephone 手机号
+     * @return UserEntity
      */
     UserEntity addUserByPhone(String telephone);
 
     /**
      * 修改指定属性值
+     *
+     * @param profile 要修改的属性
+     * @param value   值
+     * @return ResultEntity
      */
-    ResultEntity modifyUserProfile(String profile, String value);
+    ServiceResultEntity modifyUserProfile(String profile, String value);
 
 }

src/main/java/com/bubble/house/service/user/UserServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.bubble.house.base.ToolKits;
 import com.bubble.house.entity.dto.UserDTO;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.user.RoleEntity;
 import com.bubble.house.entity.user.UserEntity;
 import com.bubble.house.repository.RoleRepository;
@@ -61,7 +61,7 @@ public UserEntity findUserByName(String userName) {
                 LOGGER.error("用户[{}]无权限", userName);
                 throw new DisabledException("用户[" + userName + "]无权限");
             }
-
+            // 设置用户权限
             List<GrantedAuthority> authorities = new ArrayList<>();
             roles.forEach(role -> authorities.add(new SimpleGrantedAuthority("ROLE_" + role.getName())));
             user.setAuthorityList(authorities);
@@ -71,13 +71,13 @@ public UserEntity findUserByName(String userName) {
     }
 
     @Override
-    public ResultEntity<UserDTO> findById(Long userId) {
+    public ServiceResultEntity<UserDTO> findById(Long userId) {
         Optional<UserEntity> userOp = userRepository.findById(userId);
         if (!userOp.isPresent()) {
-            return ResultEntity.notFound();
+            return ServiceResultEntity.notFound();
         }
         UserDTO userDTO = modelMapper.map(userOp.get(), UserDTO.class);
-        return ResultEntity.of(userDTO);
+        return ServiceResultEntity.of(userDTO);
     }
 
     @Override
@@ -119,10 +119,10 @@ public UserEntity addUserByPhone(String telephone) {
 
     @Override
     @Transactional
-    public ResultEntity modifyUserProfile(String profile, String value) {
+    public ServiceResultEntity modifyUserProfile(String profile, String value) {
         Long userId = ToolKits.getLoginUserId();
         if (profile == null || profile.isEmpty()) {
-            return new ResultEntity(false, "属性不可以为空");
+            return new ServiceResultEntity(false, "属性不可以为空");
         }
         switch (profile) {
             case "name":
@@ -136,8 +136,8 @@ public ResultEntity modifyUserProfile(String profile, String value) {
                 userRepository.updatePassword(userId, value);
                 break;
             default:
-                return new ResultEntity(false, "不支持的属性");
+                return new ServiceResultEntity(false, "不支持的属性");
         }
-        return ResultEntity.success();
+        return ServiceResultEntity.success();
     }
 }

src/main/java/com/bubble/house/web/controller/HomeController.java

@@ -5,7 +5,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
- * 首页
+ * 首页和功能性页面接口定义
  *
  * @author wugang
  * date: 2019-11-04 14:45
@@ -48,9 +48,11 @@ public String internalError() {
         return "status/500";
     }
 
+    /**
+     * 登出 注销页面
+     */
     @GetMapping("/logout/page")
     public String logoutPage() {
-        // 登出页面
         return "logout";
     }
 

src/main/java/com/bubble/house/web/controller/AdminController.java src/main/java/com/bubble/house/web/controller/admin/AdminController.java

@@ -1,4 +1,4 @@
-package com.bubble.house.web.controller;
+package com.bubble.house.web.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import com.bubble.house.base.api.ApiDataTableResponse;
@@ -10,8 +10,8 @@
 import com.bubble.house.entity.house.*;
 import com.bubble.house.entity.param.DatatableSearchParam;
 import com.bubble.house.entity.param.HouseParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.service.house.AddressService;
 import com.bubble.house.service.house.HouseService;
 import com.bubble.house.service.house.QiNiuService;
@@ -34,7 +34,7 @@
 import java.util.Map;
 
 /**
- * 后台管理中心
+ * 角色为Admin：Admin用户的后台管理中心
  *
  * @author wugang
  * date: 2019-11-05 11:32
@@ -43,6 +43,9 @@
 public class AdminController {
     private final static Logger LOGGER = LoggerFactory.getLogger(AdminController.class);
 
+    /**
+     * 图片上传到本地的文件路径
+     */
     @Value("${spring.http.multipart.location}")
     private String imageLocation;
 
@@ -103,7 +106,7 @@ public String houseListPage() {
     @ResponseBody
     public ApiDataTableResponse houses(@ModelAttribute DatatableSearchParam searchBody) {
         LOGGER.debug("进入房源信息展示接口：[admin/houses]");
-        MultiResultEntity<HouseDTO> result = houseService.adminQuery(searchBody);
+        ServiceMultiResultEntity<HouseDTO> result = houseService.adminQuery(searchBody);
         ApiDataTableResponse response = new ApiDataTableResponse(ApiStatus.SUCCESS);
         response.setData(result.getResult());
         response.setRecordsFiltered(result.getTotal());
@@ -140,7 +143,7 @@ public ApiResponse addHouse(@Valid @ModelAttribute("form-house-add") HouseParam
             return ApiResponse.ofStatus(ApiStatus.NOT_VALID_PARAM);
         }
 
-        ResultEntity<HouseDTO> result = this.houseService.save(houseParam);
+        ServiceResultEntity<HouseDTO> result = this.houseService.save(houseParam);
         if (result.isSuccess()) {
             return ApiResponse.ofSuccess(result.getResult());
         }
@@ -156,7 +159,7 @@ public String houseEditPage(@RequestParam(value = "id") Long id, Model model) {
         if (id == null || id < 1) {
             return "status/404";
         }
-        ResultEntity<HouseDTO> serviceResult = houseService.findCompleteOne(id);
+        ServiceResultEntity<HouseDTO> serviceResult = houseService.findCompleteOne(id);
         if (!serviceResult.isSuccess()) {
             return "status/404";
         }
@@ -168,12 +171,12 @@ public String houseEditPage(@RequestParam(value = "id") Long id, Model model) {
         model.addAttribute("region", addressMap.get(CityLevel.REGION));
 
         HouseDetailDTO detailDTO = result.getHouseDetail();
-        ResultEntity<SubwayEntity> subwayServiceResult = addressService.findSubway(detailDTO.getSubwayLineId());
+        ServiceResultEntity<SubwayEntity> subwayServiceResult = addressService.findSubway(detailDTO.getSubwayLineId());
         if (subwayServiceResult.isSuccess()) {
             model.addAttribute("subway", subwayServiceResult.getResult());
         }
 
-        ResultEntity<SubwayStationEntity> subwayStationServiceResult = addressService.findSubwayStation(detailDTO.getSubwayStationId());
+        ServiceResultEntity<SubwayStationEntity> subwayStationServiceResult = addressService.findSubwayStation(detailDTO.getSubwayStationId());
         if (subwayStationServiceResult.isSuccess()) {
             model.addAttribute("station", subwayStationServiceResult.getResult());
         }
@@ -195,7 +198,7 @@ public ApiResponse saveHouse(@Valid @ModelAttribute("form-house-edit") HousePara
             return ApiResponse.ofSuccess(ApiStatus.NOT_VALID_PARAM);
         }
 
-        ResultEntity result = houseService.update(houseParam);
+        ServiceResultEntity result = houseService.update(houseParam);
         if (result.isSuccess()) {
             return ApiResponse.ofSuccess(null);
         }
@@ -244,7 +247,7 @@ public ApiResponse uploadPhoto(@RequestParam("file") MultipartFile file) {
     public ApiResponse removeHousePhoto(@RequestParam(value = "id") Long id) {
         LOGGER.debug("进入图片删除接口：[admin/house/photo]");
 
-        ResultEntity result = this.houseService.removePhoto(id);
+        ServiceResultEntity result = this.houseService.removePhoto(id);
         if (result.isSuccess()) {
             return ApiResponse.ofStatus(ApiStatus.SUCCESS);
         } else {
@@ -261,7 +264,7 @@ public ApiResponse updateCover(@RequestParam(value = "cover_id") Long coverId,
                                    @RequestParam(value = "target_id") Long targetId) {
         LOGGER.debug("进入修改房源封面接口：[admin/house/cover]");
 
-        ResultEntity result = this.houseService.updateCover(coverId, targetId);
+        ServiceResultEntity result = this.houseService.updateCover(coverId, targetId);
 
         if (result.isSuccess()) {
             return ApiResponse.ofStatus(ApiStatus.SUCCESS);
@@ -282,7 +285,7 @@ public ApiResponse addHouseTag(@RequestParam(value = "house_id") Long houseId,
         if (houseId < 1 || Strings.isNullOrEmpty(tag)) {
             return ApiResponse.ofStatus(ApiStatus.BAD_REQUEST);
         }
-        ResultEntity result = this.houseService.addTag(houseId, tag);
+        ServiceResultEntity result = this.houseService.addTag(houseId, tag);
         if (result.isSuccess()) {
             return ApiResponse.ofStatus(ApiStatus.SUCCESS);
         } else {
@@ -303,7 +306,7 @@ public ApiResponse removeHouseTag(@RequestParam(value = "house_id") Long houseId
             return ApiResponse.ofStatus(ApiStatus.BAD_REQUEST);
         }
 
-        ResultEntity result = this.houseService.removeTag(houseId, tag);
+        ServiceResultEntity result = this.houseService.removeTag(houseId, tag);
         if (result.isSuccess()) {
             return ApiResponse.ofStatus(ApiStatus.SUCCESS);
         } else {
@@ -323,7 +326,7 @@ public ApiResponse operateHouse(@PathVariable(value = "id") Long id,
         if (id <= 0) {
             return ApiResponse.ofStatus(ApiStatus.NOT_VALID_PARAM);
         }
-        ResultEntity result;
+        ServiceResultEntity result;
         switch (operation) {
             case HouseOperation.PASS:
                 result = this.houseService.updateStatus(id, HouseStatus.PASSES.getValue());

src/main/java/com/bubble/house/web/controller/HouseController.java src/main/java/com/bubble/house/web/controller/house/HouseController.java

@@ -1,4 +1,4 @@
-package com.bubble.house.web.controller;
+package com.bubble.house.web.controller.house;
 
 import com.bubble.house.base.api.ApiResponse;
 import com.bubble.house.base.api.ApiStatus;
@@ -9,8 +9,8 @@
 import com.bubble.house.entity.house.SubwayEntity;
 import com.bubble.house.entity.house.SubwayStationEntity;
 import com.bubble.house.entity.param.RentSearchParam;
-import com.bubble.house.entity.result.MultiResultEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceMultiResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.entity.search.HouseBucketEntity;
 import com.bubble.house.entity.search.MapSearchEntity;
 import com.bubble.house.entity.search.RentValueBlockEntity;
@@ -56,7 +56,7 @@ public HouseController(AddressService addressService, HouseService houseService,
     @GetMapping("address/support/cities")
     @ResponseBody
     public ApiResponse getSupportCity() {
-        MultiResultEntity<CityEntity> result = addressService.findAllCities();
+        ServiceMultiResultEntity<CityEntity> result = addressService.findAllCities();
         if (result.getResultSize() == 0) {
             return ApiResponse.ofStatus(ApiStatus.NOT_FOUND);
         }
@@ -69,7 +69,7 @@ public ApiResponse getSupportCity() {
     @GetMapping("address/support/regions")
     @ResponseBody
     public ApiResponse getSupportRegions(@RequestParam(name = "city_name") String cityEnName) {
-        MultiResultEntity<CityEntity> addressResult = addressService.findAllRegionsByCityEnName(cityEnName);
+        ServiceMultiResultEntity<CityEntity> addressResult = addressService.findAllRegionsByCityEnName(cityEnName);
         if (addressResult.getResult() == null || addressResult.getTotal() < 1) {
             return ApiResponse.ofStatus(ApiStatus.NOT_FOUND);
         }
@@ -122,21 +122,21 @@ public String rentHousePage(@ModelAttribute RentSearchParam rentSearch,
             session.setAttribute("cityEnName", rentSearch.getCityEnName());
         }
         // 获取城市信息
-        ResultEntity<CityEntity> city = addressService.findCity(rentSearch.getCityEnName());
+        ServiceResultEntity<CityEntity> city = addressService.findCity(rentSearch.getCityEnName());
         if (!city.isSuccess()) {
             redirectAttributes.addAttribute("msg", "must_chose_city");
             // 跳转到index.html页面
             return "redirect:/index";
         }
         model.addAttribute("currentCity", city.getResult());
 
-        MultiResultEntity<CityEntity> addressResult = addressService.findAllRegionsByCityEnName(rentSearch.getCityEnName());
+        ServiceMultiResultEntity<CityEntity> addressResult = addressService.findAllRegionsByCityEnName(rentSearch.getCityEnName());
         if (addressResult.getResult() == null || addressResult.getTotal() < 1) {
             redirectAttributes.addAttribute("msg", "must_chose_city");
             return "redirect:/index";
         }
 
-        MultiResultEntity<HouseDTO> serviceMultiResult = houseService.query(rentSearch);
+        ServiceMultiResultEntity<HouseDTO> serviceMultiResult = houseService.query(rentSearch);
 
         // 添加视图信息
         model.addAttribute("total", serviceMultiResult.getTotal());
@@ -171,7 +171,7 @@ public ApiResponse autocomplete(@RequestParam(value = "prefix") String prefix) {
         if (prefix.isEmpty()) {
             return ApiResponse.ofStatus(ApiStatus.BAD_REQUEST);
         }
-        ResultEntity<List<String>> result = this.searchService.suggest(prefix);
+        ServiceResultEntity<List<String>> result = this.searchService.suggest(prefix);
         return ApiResponse.ofSuccess(result.getResult());
     }
 
@@ -184,7 +184,7 @@ public String show(@PathVariable(value = "id") Long houseId,
         if (houseId <= 0) {
             return "status/404";
         }
-        ResultEntity<HouseDTO> serviceResult = houseService.findCompleteOne(houseId);
+        ServiceResultEntity<HouseDTO> serviceResult = houseService.findCompleteOne(houseId);
         if (!serviceResult.isSuccess()) {
             return "status/404";
         }
@@ -196,12 +196,12 @@ public String show(@PathVariable(value = "id") Long houseId,
         model.addAttribute("city", city);
         model.addAttribute("region", region);
 
-        ResultEntity<UserDTO> userDTOServiceResult = userService.findById(houseDTO.getAdminId());
+        ServiceResultEntity<UserDTO> userDTOServiceResult = userService.findById(houseDTO.getAdminId());
         // 经纪人
         model.addAttribute("agent", userDTOServiceResult.getResult());
         model.addAttribute("house", houseDTO);
         // 聚合数据：房源信息在小区中的数量
-        ResultEntity<Long> aggResult = searchService.aggregateDistrictHouse(city.getEnName(), region.getEnName(), houseDTO.getDistrict());
+        ServiceResultEntity<Long> aggResult = searchService.aggregateDistrictHouse(city.getEnName(), region.getEnName(), houseDTO.getDistrict());
         model.addAttribute("houseCountInDistrict", aggResult.getResult());
 //        model.addAttribute("houseCountInDistrict", 0);
         return "house-detail";
@@ -213,17 +213,17 @@ public String show(@PathVariable(value = "id") Long houseId,
     @GetMapping("rent/house/map")
     public String rentMapPage(@RequestParam(value = "cityEnName") String cityEnName, Model model,
                               HttpSession session, RedirectAttributes redirectAttributes) {
-        ResultEntity<CityEntity> city = addressService.findCity(cityEnName);
+        ServiceResultEntity<CityEntity> city = addressService.findCity(cityEnName);
         if (!city.isSuccess()) {
             redirectAttributes.addAttribute("msg", "must_chose_city");
             return "redirect:/index";
         } else {
             session.setAttribute("cityName", cityEnName);
             model.addAttribute("city", city.getResult());
         }
-        MultiResultEntity<CityEntity> regions = addressService.findAllRegionsByCityEnName(cityEnName);
+        ServiceMultiResultEntity<CityEntity> regions = addressService.findAllRegionsByCityEnName(cityEnName);
 
-        MultiResultEntity<HouseBucketEntity> serviceResult = searchService.mapAggregate(cityEnName);
+        ServiceMultiResultEntity<HouseBucketEntity> serviceResult = searchService.mapAggregate(cityEnName);
 
         model.addAttribute("aggData", serviceResult.getResult());
         model.addAttribute("total", serviceResult.getTotal());
@@ -240,7 +240,7 @@ public ApiResponse rentMapHouses(@ModelAttribute MapSearchEntity mapSearch) {
         if (mapSearch.getCityEnName() == null) {
             return ApiResponse.ofMessage(HttpStatus.BAD_REQUEST.value(), "必须选择城市");
         }
-        MultiResultEntity<HouseDTO> serviceMultiResult;
+        ServiceMultiResultEntity<HouseDTO> serviceMultiResult;
         if (mapSearch.getLevel() < 13) {
             serviceMultiResult = houseService.wholeMapQuery(mapSearch);
         } else {

src/main/java/com/bubble/house/web/controller/user/UserController.java

@@ -0,0 +1,89 @@
+package com.bubble.house.web.controller.user;
+
+import com.bubble.house.base.LoginUserUtil;
+import com.bubble.house.base.api.ApiResponse;
+import com.bubble.house.base.api.ApiStatus;
+import com.bubble.house.entity.result.ServiceResultEntity;
+import com.bubble.house.service.house.HouseService;
+import com.bubble.house.service.house.SubscribeService;
+import com.bubble.house.service.user.UserService;
+import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 角色为User：一般用户的处理逻辑接口
+ *
+ * @author wugang
+ * date: 2020-10-27 17:48
+ **/
+@Controller
+public class UserController {
+    private final Logger logger = LoggerFactory.getLogger(UserController.class);
+
+    private final UserService userService;
+    private final HouseService houseService;
+    private final SubscribeService subscribeService;
+
+    public UserController(UserService userService, HouseService houseService, SubscribeService subscribeService) {
+        this.userService = userService;
+        this.houseService = houseService;
+        this.subscribeService = subscribeService;
+    }
+
+    /**
+     * 普通用户登录页面
+     */
+    @GetMapping("/user/login")
+    public String loginPage() {
+        return "user/login";
+    }
+
+    /**
+     * 普通用户管理页面
+     */
+    @GetMapping("/user/center")
+    public String centerPage() {
+        return "user/center";
+    }
+
+    @PostMapping(value = "/api/user/info")
+    @ResponseBody
+    public ApiResponse updateUserInfo(@RequestParam(value = "profile") String profile, @RequestParam(value = "value") String value) {
+        if (value.isEmpty()) {
+            return ApiResponse.ofStatus(ApiStatus.BAD_REQUEST);
+        }
+        if ("email".equals(profile) && !LoginUserUtil.checkEmail(value)) {
+            return ApiResponse.ofMessage(HttpStatus.SC_BAD_REQUEST, "不支持的邮箱格式");
+        }
+        ServiceResultEntity result = userService.modifyUserProfile(profile, value);
+        if (result.isSuccess()) {
+            return ApiResponse.ofSuccess("");
+        } else {
+            return ApiResponse.ofMessage(HttpStatus.SC_BAD_REQUEST, result.getMessage());
+        }
+    }
+
+    /**
+     * 加入预约清单
+     *
+     * @param houseId 房源ID
+     * @return ApiResponse
+     */
+    @PostMapping(value = "api/user/house/subscribe")
+    @ResponseBody
+    public ApiResponse subscribeHouse(@RequestParam(value = "house_id") Long houseId) {
+        ServiceResultEntity result = subscribeService.addSubscribeOrder(houseId);
+        if (result.isSuccess()) {
+            return ApiResponse.ofSuccess("");
+        } else {
+            return ApiResponse.ofMessage(HttpStatus.SC_BAD_REQUEST, result.getMessage());
+        }
+    }
+
+}

src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
       force: true
       charset: UTF-8
       enabled: true
-    # multipart config
+    # 文件上传 multipart config
     multipart:
       enabled: true
       location: /Users/wugang/code/java/elasticsearch-house/tmp/images/

src/main/resources/log4j2.xml

@@ -70,6 +70,7 @@
     </Appenders>
 
     <Loggers>
+        <logger name="org" level="info"/>
         <logger name="org.springframework" level="INFO"/>
         <logger name="com.zaxxer" level="INFO"/>
         <logger name="org.hibernate" level="INFO"/>

src/main/resources/static/js/admin/upload.js

@@ -216,10 +216,10 @@
         // 当有文件添加进来时执行，负责view的创建
         function addFile(file) {
             var $li = $('<li id="' + file.id + '">' +
-                    '<p class="title">' + file.name + '</p>' +
-                    '<p class="imgWrap"></p>' +
-                    '<p class="progress"><span></span></p>' +
-                    '</li>'),
+                '<p class="title">' + file.name + '</p>' +
+                '<p class="imgWrap"></p>' +
+                '<p class="progress"><span></span></p>' +
+                '</li>'),
 
                 $btns = $('<div class="file-panel">' +
                     '<span class="cancel">删除</span>' +

src/main/resources/templates/admin/login.html

@@ -1,20 +1,22 @@
 <!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
     <title>房搜搜-后台登录系统</title>
 
     <!--- CSS --->
-    <link rel="stylesheet" href="/static/css/admin/login-style.css" type="text/css" />
+    <link rel="stylesheet" href="/static/css/admin/login-style.css" type="text/css"/>
 
 
     <!--- Javascript libraries (jQuery and Selectivizr) used for the custom checkbox --->
 
     <!--[if (gte IE 6)&(lte IE 8)]>
     <script type="text/javascript" src="/static/lib/jquery/1.9.1/jquery.js"></script>
     <script type="text/javascript" src="/static/js/admin/selectivizr.js"></script>
-    <noscript><link rel="stylesheet" href="/static/css/admin/login-fallback.css" /></noscript>
+    <noscript>
+        <link rel="stylesheet" href="/static/css/admin/login-fallback.css"/>
+    </noscript>
     <![endif]-->
 
 </head>
@@ -23,7 +25,7 @@
 <div id="container">
     <form action="#" th:action="@{/login}" method="post">
         <div class="login">管理员登录</div>
-        <div th:if="${param.error}" style="position: absolute; color: red; padding-top: 6%; padding-left: 3%">
+        <div th:if="${param.error}" style="position: absolute; color: #ff0000; padding-top: 6%; padding-left: 3%">
             非法的用户名或密码
         </div>
         <div class="username-text">用户名:</div>
@@ -32,7 +34,7 @@
             <input type="text" name="username" placeholder="请输入用户名"/>
         </div>
         <div class="password-field">
-            <input type="password" name="password" placeholder="请输入密码" />
+            <input type="password" name="password" placeholder="请输入密码"/>
         </div>
 
 

src/test/java/com/bubble/house/AddressServiceTests.java

@@ -1,7 +1,7 @@
 package com.bubble.house;
 
 import com.bubble.house.entity.BaiDuMapEntity;
-import com.bubble.house.entity.result.ResultEntity;
+import com.bubble.house.entity.result.ServiceResultEntity;
 import com.bubble.house.service.house.AddressService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -23,7 +23,7 @@ public class AddressServiceTests extends ApplicationTests {
     public void testGetMapLocation() {
         String city = "北京";
         String address = "望京SOHO";
-        ResultEntity<BaiDuMapEntity> result = addressService.getBaiDuMapLocation(city, address);
+        ServiceResultEntity<BaiDuMapEntity> result = addressService.getBaiDuMapLocation(city, address);
         System.out.println(result.getResult().getLongitude());
         System.out.println(result.getResult().getLatitude());