Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

# Conflicts:
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/EnumUtils.class

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -90,4 +90,5 @@ public class TicketController {
         return responseBean;
 
     }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java

@@ -6,6 +6,9 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface TpTicketRecordMapper {
     int deleteByPrimaryKey(Integer id);
@@ -19,6 +22,7 @@ public interface TpTicketRecordMapper {
     int updateByPrimaryKeySelective(TpTicketRecord record);
 
     int updateByPrimaryKey(TpTicketRecord record);
-	
+
 	List<TpTicketRecord> getTicketRecordByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -1,6 +1,10 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.constant.enums.TicketStatusEnum;
+import com.community.commom.constant.enums.TicketTypeEnum;
+import com.community.commom.constant.enums.TicketUserTypeEnum;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.EnumUtils;
 import com.community.huiju.dao.TpTicketMapper;
 import com.community.huiju.dao.TpTicketRecordCommentMapper;
 import com.community.huiju.dao.TpTicketRecordMapper;
@@ -8,6 +12,9 @@ import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.service.ITicketService;
+import com.community.huiju.vo.RecordCommentVO;
+import com.community.huiju.vo.TpTicketRecordCommentVO;
+import com.community.huiju.vo.TpTicketRecordVO;
 import com.community.huiju.vo.TpTicketVO;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
@@ -19,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 工单业务 实现

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/RecordCommentVO.java

@@ -0,0 +1,43 @@
+package com.community.huiju.vo;
+
+import com.community.commom.constant.enums.TicketUserTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 工单处理
+ *
+ *     回复/追问 数据
+ *
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RecordCommentVO {
+
+    /** 编号 **/
+    private Integer id;
+
+    /** 追问人id(tp_user_id也就是物业用户)  或者是 发起人id(ta_user_id也就是住户app的id) **/
+    private Integer uuid;
+
+    /** 对应上面 uuid 的 用户姓名 **/
+    private String userName;
+
+    /** 用户类型 追问人/发起人 **/
+    private String userType;
+
+    /** 追问内容 或者 回复记录 **/
+    private String content;
+
+    /** 回复的是哪一条记录, 0表示当前(比如 待分配 等状态)状态下第一条 **/
+    private Integer parentId;
+
+    /** 创建时间 **/
+    private Date createDate;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 用户数据
  * @author weiximei
  */
 @Data

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketInfoVO.java

@@ -7,6 +7,8 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
+ * 工单不包含所有的 答复 记录
+ * 只包含最新的 答复和答复时间
  * @author weiximei
  */
 @Data
@@ -24,16 +26,6 @@ public class TpTicketInfoVO extends TpTicketVO {
     /** 报修类型 0:公共区域  1: 房屋质量  2::户内设施   **/
     private String repairType;
 
-    private String ticketMatchImg1;
-
-    private String ticketMatchImg2;
-
-    private String ticketMatchImg3;
-
-    private String ticketMatchImg4;
-
-    private String ticketMatchImg5;
-
     /** 评分 **/
     private String score;
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketRecordCommentVO.java

@@ -0,0 +1,43 @@
+package com.community.huiju.vo;
+
+import com.community.commom.constant.enums.TicketTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工单包含 答复记录
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpTicketRecordCommentVO {
+
+    /** 编号 **/
+    private Integer id;
+
+    /** 小区编号 **/
+    private Integer communityId;
+
+    /** 用户app的id **/
+    private Integer taUserId;
+
+    /** ================================ **/
+
+    /** 工单标题 **/
+    private String ticketTitle;
+
+    /** 类型 报修/投诉/联系单 **/
+    private String type;
+
+    /** 工单 创建时间 **/
+    private Date createDate;
+
+    /** 待分配,已分配等记录 集合 **/
+    List<TpTicketRecordVO> content;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketRecordVO.java

@@ -0,0 +1,35 @@
+package com.community.huiju.vo;
+
+import com.community.commom.constant.enums.TicketStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工单 处理记录
+ *
+ *  比如 待分配,已分配等记录
+ *
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpTicketRecordVO {
+
+    /** 工单处理ID **/
+    private Integer id;
+
+    /** 工单记录 流转状态 **/
+    private String status;
+
+    /** 创建时间 **/
+    private Date createDate;
+
+    /** 回复/追问 记录 集合 **/
+    private List<RecordCommentVO> comments;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
+ * 工单列表数据
  * @author weiximei
  */
 @Data
@@ -20,7 +21,7 @@ public class TpTicketVO {
     /** 小区编号 **/
     private Integer communityId;
 
-    /** 用户appd的id **/
+    /** 用户app的id **/
     private Integer taUserId;
 
     /** ================================ **/

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml

@@ -104,6 +104,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
+
   <select id="getTicketRecordByTicketId" resultType="com.community.huiju.model.TpTicketRecord">
     SELECT
         t.id,
@@ -117,5 +118,6 @@
     WHERE
         community_id = #{communityId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
+
   </select>
 </mapper>

CODE/smart-community/community-common/pom.xml

@@ -66,6 +66,13 @@
             <artifactId>core</artifactId>
             <version>3.2.1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.2</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/CodeEnum.java

@@ -0,0 +1,11 @@
+package com.community.commom.constant.enums;
+
+/**
+ * 公共接口
+ * @author weiximei
+ */
+public interface CodeEnum {
+
+    Integer getCode();
+
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/TaUserVerifyStatusEnum.java

@@ -0,0 +1,46 @@
+package com.community.commom.constant.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * app用户  认证状态
+ *
+ * 认证状态  0 是未认证    1是认证通过   2是已作废
+ *
+ * @author weiximei
+ */
+@Getter
+public enum  TaUserVerifyStatusEnum implements CodeEnum {
+
+    UNAUTHORIZED(0,"未认证"),
+
+    CERTIFICATION_BY(1,"认证通过"),
+
+    THE_CANCELLATION(2,"已作废"),
+
+    ;
+
+    private Integer code;
+
+    private String comments;
+
+    TaUserVerifyStatusEnum(Integer code, String comments) {
+        this.code = code;
+        this.comments = comments;
+    }
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("code",code);
+        object.put("comments",comments);
+        return object.toString();
+    }
+
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/TicketRepairTypeEnum.java

@@ -0,0 +1,45 @@
+package com.community.commom.constant.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+
+/**
+ * 工单 报修类型
+ *
+ * 0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
+ *
+ * @author weiximei
+ */
+@Getter
+public enum  TicketRepairTypeEnum implements CodeEnum {
+
+    THE_PUBLIC_AREAS(0,"公共区域"),
+
+    BUILDING_QUALITY(1,"房子质量"),
+
+    INDOOR_FACILITIES(2,"户内设施"),
+
+    ;
+
+    private Integer code;
+
+    private String comments;
+
+    TicketRepairTypeEnum(Integer code, String comments) {
+        this.code = code;
+        this.comments = comments;
+    }
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("code",code);
+        object.put("comments",comments);
+        return object.toString();
+    }
+
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/TicketStatusEnum.java

@@ -0,0 +1,53 @@
+package com.community.commom.constant.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+
+/**
+ * 工单 流转状态
+ *
+ *  0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:被终止
+ *
+ * @author weiximei
+ */
+@Getter
+public enum TicketStatusEnum implements CodeEnum {
+
+    TO_BE_DISTRIBUTED(0,"待分配"),
+
+    REFUSED_TO_ACCEPT(1,"拒绝受理"),
+
+    TO_BE_PROCESSED(2,"待处理"),
+
+    ARE_DEALING_WITH(3,"正在处理"),
+
+    TO_EVALUATE(4,"待评价"),
+
+    HAVE_EVALUATION(5,"已评价"),
+
+    BE_TERMINATED(6,"被终止"),
+
+    ;
+
+    private Integer code;
+
+    private String comments;
+
+    TicketStatusEnum(Integer code, String comments) {
+        this.code = code;
+        this.comments = comments;
+    }
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("code",code);
+        object.put("comments",comments);
+        return object.toString();
+    }
+
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/TicketTypeEnum.java

@@ -0,0 +1,42 @@
+package com.community.commom.constant.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+
+/**
+ * 工单类型
+ * @author weiximei
+ */
+@Getter
+public enum TicketTypeEnum implements CodeEnum {
+
+    REPAIRS(0,"报修"),
+
+    COMPLAINT(1,"投诉"),
+
+    LIAISON(2,"联系单"),
+
+    ;
+
+    private Integer code;
+
+    private String comments;
+
+    TicketTypeEnum(Integer code, String comments) {
+        this.code = code;
+        this.comments = comments;
+    }
+
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("code",code);
+        object.put("comments",comments);
+        return object.toString();
+    }
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/enums/TicketUserTypeEnum.java

@@ -0,0 +1,39 @@
+package com.community.commom.constant.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+
+/**
+ * 追问表 用户类型
+ * @author weiximei
+ */
+@Getter
+public enum TicketUserTypeEnum implements CodeEnum {
+
+    ASK_A_PERSON(0,"追问人"),
+
+    THE_ORIGINATOR(1,"发起人"),
+    ;
+
+    private Integer code;
+
+    private String comments;
+
+    TicketUserTypeEnum(Integer code, String comments) {
+        this.code = code;
+        this.comments = comments;
+    }
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("code",code);
+        object.put("comments",comments);
+        return object.toString();
+    }
+
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/EnumUtils.java

@@ -1,5 +1,8 @@
 package com.community.commom.utils;
 
+import com.community.commom.constant.enums.CodeEnum;
+import com.community.commom.constant.enums.TicketRepairTypeEnum;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -117,4 +120,25 @@ public class EnumUtils {
         }
         return enumConstants;
     }
+
+
+    /**
+     * 获取枚举类型
+     *
+     * @param code
+     * @param enumClass
+     * @param <T>
+     * @return
+     */
+    public static <T extends CodeEnum> T getByCode(Integer code,Class<T> enumClass){
+        for (T each:enumClass.getEnumConstants()){
+            if (code.equals(each.getCode())){
+                return each;
+            }
+        }
+
+        return null;
+    }
+
+
 }