心理咨询接口功能优化及bug修复

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/PropertyConstant.java → epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/PsychologyConstant.java

@@ -5,7 +5,7 @@ package com.elink.esua.epdc.dto.constant;
  * @Author zhy
  * @Date 2020/6/10 17:26
  */
-public interface PropertyConstant {
+public interface PsychologyConstant {
 
     /**
      * 匿名用户

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyAnswerFormDTO.java

@@ -20,9 +20,8 @@ package com.elink.esua.epdc.dto.psychology.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -34,38 +33,33 @@ import java.util.List;
 @Data
 public class PsychologyAnswerFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 网格ID
-     */
-    private Long gridId;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
+    private static final long serialVersionUID = 1044413617379389644L;
 
+    // ---------------------- 前端上送字段
     /**
      * 页码
      */
-    @NotBlank(message = "页码不能为空")
+    @NotNull(message = "页码不能为空")
     private Integer pageIndex;
 
     /**
      * 页容量
      */
-    @NotBlank(message = "页容量不能为空")
+    @NotNull(message = "页容量不能为空")
     private Integer pageSize;
 
     /**
      * 第一页查询发起时的时间
      */
+    @NotBlank(message = "查询时间戳不能为空")
     private String timestamp;
 
+
+    // ---------------------- 查询冗余字段
+
     /**
-     *
+     * 用户ID
      */
-    private List<String> questionIds;
+    private String userId;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyQuestionFormDTO.java

@@ -20,12 +20,12 @@ package com.elink.esua.epdc.dto.psychology.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
- * 心理问题提问表
+ * 居民端 用户发布心理咨询问题
  *
  * @author zhangyuan qu@elink-cn.com
  * @since v1.0.0 2020-06-08
@@ -33,27 +33,9 @@ import java.util.Date;
 @Data
 public class PsychologyQuestionFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 7271144322478960187L;
 
-    /**
-     * 主键
-     */
-	private String id;
-
-    /**
-     * 提问者 用户id
-     */
-	private String userId;
-
-    /**
-     * 提问者用户名
-     */
-	private String userName;
-
-    /**
-     * 用户的头像
-     */
-	private String userAvatar;
+    // -------------- 前端上送字段
 
     /**
      * 问题内容
@@ -70,46 +52,25 @@ public class PsychologyQuestionFormDTO implements Serializable {
     /**
      * 咨询师id （被绑定的管理端用户id）用户指定向谁提问
      */
-	private String psychologistId;
+    private String psychologistId;
 
-    /**
-     * 问题已几有人回复
-     */
-	private Integer answerNum;
-
-    /**
-     * 是否展示 0否 ，1是
-     */
-	private String displayFlag;
-
-    /**
-     * 删除标记 0：未删除，1：已删除
-     */
-	private String delFlag;
 
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
+    // -------------- 冗余用户信息
 
     /**
-     * 创建人
+     * 提问者 用户id
      */
-	private String createdBy;
+    private String userId;
 
     /**
-     * 创建时间
+     * 提问者用户名
      */
-	private Date createdTime;
+    private String userName;
 
     /**
-     * 更新人
+     * 用户的头像
      */
-	private String updatedBy;
+    private String userAvatar;
 
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologySubmitAnswerFormDTO.java

@@ -24,7 +24,7 @@ import java.io.Serializable;
 
 
 /**
- * 心理问题答复表
+ * 工作端 回复心理咨询问题
  *
  * @author zhangyuan qu@elink-cn.com
  * @since v1.0.0 2020-06-08

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyUnansweredFormDTO.java

@@ -20,11 +20,12 @@ package com.elink.esua.epdc.dto.psychology.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
 /**
- * 心理问题答复表
+ * 获取待回答心理问题列表
  *
  * @author zhangyuan qu@elink-cn.com
  * @since v1.0.0 2020-06-08
@@ -32,39 +33,40 @@ import java.io.Serializable;
 @Data
 public class PsychologyUnansweredFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1122485087380112034L;
 
-    /**
-     * 网格ID
-     */
-    private Long gridId;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
+    // ---------------------- 前端上送字段
 
     /**
      * 页码
      */
-    @NotBlank(message = "页码不能为空")
+    @NotNull(message = "页码不能为空")
     private Integer pageIndex;
 
     /**
      * 页容量
      */
-    @NotBlank(message = "页容量不能为空")
+    @NotNull(message = "页容量不能为空")
     private Integer pageSize;
 
     /**
      * 第一页查询发起时的时间
      */
+    @NotBlank(message = "查询时间戳不能为空")
     private String timestamp;
 
     /**
      * 是否已指定咨询师 0否 1是  。传0查询公共问题
      */
     @NotBlank(message = "问题类型不能为空")
-    private String designated_flag;
+    private String designatedFlag;
+
+
+    // ---------------------- 查询冗余字段
+
+    /**
+     * 用户ID
+     */
+    private String userId;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyAnswerListUserResultDTO.java

@@ -32,7 +32,7 @@ import java.util.List;
 @Data
 public class PsychologyAnswerListUserResultDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1661300423990183882L;
 
         /**
          * 问题id

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyAnswerOfMineResultDTO.java

@@ -34,24 +34,24 @@ public class PsychologyAnswerOfMineResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-        /**
-         * 问题id
-         */
-        private String id;
-
-        /**
-         * 问题内容
-         */
-        private String questionContent;
-
-        /**
-         * 提问发布时间 yyyy.MM.dd HH:mm
-         */
-        private String questionTime;
-
-        /**
-         *
-         */
-        private List<PsychologyAnswerUserInfoResultDTO> answerList;
+    /**
+     * 问题id
+     */
+    private String id;
+
+    /**
+     * 问题内容
+     */
+    private String questionContent;
+
+    /**
+     * 提问发布时间 yyyy.MM.dd HH:mm
+     */
+    private String questionTime;
+
+    /**
+     * 问题的回复
+     */
+    private List<PsychologyAnswerUserInfoResultDTO> answerList;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyUnansweredResultDTO.java

@@ -31,7 +31,7 @@ import java.io.Serializable;
 @Data
 public class PsychologyUnansweredResultDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -957727534463395709L;
 
     /**
      * 问题id