删除没用到的类

pom.xml

@@ -273,7 +273,7 @@
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>xyqb-user-rpc-commons</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.1.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/cn/quantgroup/user/enums/EducationEnum.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum EducationEnum {
+    UNKNOWN("暂无"),
+    MASTER("硕士及以上"),
+    UNDER_GRADUATE("本科"),
+    JUNIOR_COLLEGE("大专"),
+    TECHNICAL_SECONDARY_SCHOOL("中专"),
+    TECHNICAL_SCHOOL("技校"),
+    HIGH_SCHOOL("高中"),
+    MIDDLE_SCHOOL("初中"),
+    PRIMARY_SCHOOL("小学"),
+    OTHER("其他");
+
+    private String name;
+
+    EducationEnum(String name) {
+        this.name = name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/cn/quantgroup/user/enums/Gender.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by Miraculous on 15/7/10.
+ */
+public enum Gender {
+    UNKNOWN("未知"),
+    FEMALE("女"),
+    MALE("男");
+
+    private String name;
+
+    Gender(String name) {
+        this.name = name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/cn/quantgroup/user/enums/IdType.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by FrankChow on 15/7/15.
+ */
+public enum IdType {
+    ID_CARD("身份证"),
+    HOUSEHOLD_REGISTER("户口薄"),
+    PASSPORT("护照"),
+    OFFICER_CARD("军官证"),
+    SOLDIERS_CARD("士兵证"),
+    HK_GATE_PASS("港澳居民来往内地通行证"),
+    TW_GATE_PASS("台湾同胞来往内地通行证"),
+    TEMP_ID_CARD("临时身份证"),
+    FOREIGN_RESIDENCE_PERMIT("外国人居留证"),
+    POLICER_CARD("警官证"),
+    OTHER("其他证件");
+
+    private String name;
+
+    IdType(String name) {
+        this.name = name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/cn/quantgroup/user/enums/IncomeEnum.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum IncomeEnum {
+    UNKNOWN("未知"),
+    CASH("现金计算"),
+    PAY_CARD("工资卡"),
+    CASH_AND_PAY_CARD("混合");
+    private String desc;
+
+    private IncomeEnum(String desc){
+        this.desc = desc;
+    }
+}
\ No newline at end of file

src/main/java/cn/quantgroup/user/enums/IncomeRangeEnum.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum IncomeRangeEnum {
+    UNKNOWN("暂无"),
+    BELOW_1000("小于1000元"),
+    BELOW_3000("1000至3000元"),
+    BELOW_5000("3000至5000元"),
+    BELOW_8000("5000至8000元"),
+    BELOW_10000("8000至10000元"),
+    BELOW_15000("10000至15000元"),
+    BELOW_20000("15000至20000元"),
+    ABOVE_20000("大于20000元");
+
+    private String desc;
+
+    private IncomeRangeEnum(String desc){
+        this.desc = desc;
+    }
+
+}

src/main/java/cn/quantgroup/user/enums/MaritalStatus.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by sunnan on 2016-11-24.
+ */
+public enum MaritalStatus {
+
+    UNKNOWN("未知"),
+    SINGLE("未婚"), // 1
+    MARRIED("已婚"), // 2
+    DIVORCED("离异"), // 3
+    WINDOWED("丧偶"), // 4
+    OTHER("其他");
+
+
+    String description;
+
+    MaritalStatus(String desc) {
+        description = desc;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("MaritalStatus{");
+        sb.append("description='").append(description).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}

src/main/java/cn/quantgroup/user/enums/OccupationEnum.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum OccupationEnum {
+    UNKNOWN("暂未填写"),
+    WORKER("工人"),
+    TEACHER("教师"),
+    WHITE_COLLAR("白领"),
+    STUDENT("学生"),
+    CAREER_BUILDER("创业者"),
+    SELF_EMPLOYER("个体户"),
+    EMPLOYEE("公司职员"),
+    BISUNESS_ENTITY("企业法人"),
+    ONLINE_STORE_OWNER("网店店主"),
+    UNEMPLOYED("暂无职业"),
+    OTHER("其他");
+
+    private String name;
+
+    OccupationEnum(String name) {
+        this.name = name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/cn/quantgroup/user/enums/Relation.java

+package cn.quantgroup.user.enums;
+
+/**
+ * Created by Miraculous on 2017/1/3.
+ */
+public enum Relation {
+
+    PARENT("父母"),
+    CHILDREN("子女"),
+    BROTHER("兄弟姐妹"),
+    COLLEAGUE("同事"),
+    CLASSMATE("同学"),
+    FRIEND("朋友"),
+    SPOUSE("夫妻"),
+    SELF("本人"),
+    OTHER("其他");
+
+    String description;
+
+    Relation(String desc) {
+        description = desc;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("Relation{");
+        sb.append("description='").append(description).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -4,10 +4,9 @@ import cn.quantgroup.motan.bean.*;
 import cn.quantgroup.motan.retbean.*;
 import cn.quantgroup.motan.service.UserMotanService;
 import cn.quantgroup.motan.vo.UserSysResult;
+import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
-//import cn.quantgroup.xyqb.entity.enumerate.*;
-import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
@@ -44,7 +43,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
+
 import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ERROR;
+
 /**
  * Created by 11 on 2017/2/27.
  */
@@ -414,9 +415,9 @@ public class MotanUserServiceImpl implements UserMotanService {
 
   @Override
   public UserSysResult<XUserExtInfo> updateUserExtInfo(
-      Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
-      OccupationEnum occupationEnum, EducationEnum educationEnum, Boolean hasCar,
-      Boolean hasSocialSecurity, Boolean hasHouse, Boolean hasCreditCard, MaritalStatus maritalStatus) {
+      Long userId, cn.quantgroup.motan.enums.IncomeEnum incomeEnum, cn.quantgroup.motan.enums.IncomeRangeEnum incomeRangeEnum,
+      cn.quantgroup.motan.enums.OccupationEnum occupationEnum, cn.quantgroup.motan.enums.EducationEnum educationEnum, Boolean hasCar,
+      Boolean hasSocialSecurity, Boolean hasHouse, Boolean hasCreditCard, cn.quantgroup.motan.enums.MaritalStatus maritalStatus) {
     UserSysResult<XUserExtInfo> userSysResult = returnValue(null, null);
     if (null == userId || 0L == userId) {
       return returnErrorValue("用户id为空");
@@ -531,7 +532,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     xUserSpouse.setSpouseName(userSpouse.getSpouseName());
     xUserSpouse.setCreatedAt(userSpouse.getCreatedAt());
     xUserSpouse.setUpdateAt(userSpouse.getUpdateAt());
-    xUserSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
+    xUserSpouse.setStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
     return xUserSpouse;
   }
 
@@ -586,10 +587,10 @@ public class MotanUserServiceImpl implements UserMotanService {
     if (xUserSpouse.getUserId() == null || xUserSpouse.getUserId() == 0) {
       return returnErrorValue("用户不能为空");
     }
-    cn.quantgroup.user.enums.MaritalStatus status = xUserSpouse.getStatus();
+    cn.quantgroup.motan.enums.MaritalStatus status = xUserSpouse.getStatus();
     String spousePhone = xUserSpouse.getSpousePhone();
     String spouseName = xUserSpouse.getSpouseName();
-    if (xUserSpouse.getStatus() == cn.quantgroup.user.enums.MaritalStatus.MARRIED) {
+    if (xUserSpouse.getStatus() == cn.quantgroup.motan.enums.MaritalStatus.MARRIED) {
       if (!ValidationUtil.validatePhoneNo(spousePhone)) {
         return returnErrorValue("手机号格式错误");
       }
@@ -603,8 +604,8 @@ public class MotanUserServiceImpl implements UserMotanService {
       userSpouse = new UserSpouse(xUserSpouse.getUserId());
       userSpouse.setCreatedAt(timestamp);
     }
-    userSpouse.setSpouseName(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spouseName : "");
-    userSpouse.setSpousePhone(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spousePhone : "");
+    userSpouse.setSpouseName(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spouseName : "");
+    userSpouse.setSpousePhone(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spousePhone : "");
     userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);

src/main/java/cn/quantgroup/xyqb/entity/UserDetail.java

@@ -75,10 +75,10 @@ public class UserDetail implements Serializable {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

@@ -51,14 +51,14 @@ public class UserExtInfo implements Serializable {
     XUserExtInfo xUserExtInfo = new XUserExtInfo();
     xUserExtInfo.setId(this.id);
     xUserExtInfo.setUserId(this.userId);
-    xUserExtInfo.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.valueOf(this.educationEnum.name()));
-    xUserExtInfo.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
-    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.user.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
-    xUserExtInfo.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
+    xUserExtInfo.setEducationEnum(cn.quantgroup.motan.enums.EducationEnum.valueOf(this.educationEnum.name()));
+    xUserExtInfo.setIncomeEnum(cn.quantgroup.motan.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
+    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.motan.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
+    xUserExtInfo.setOccupationEnum(cn.quantgroup.motan.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
     xUserExtInfo.setHasCar(this.hasCar);
     xUserExtInfo.setHasSocialSecurity(this.hasSocialSecurity);
     xUserExtInfo.setHasCreditCard(this.hasCreditCard);
-    xUserExtInfo.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(this.marryStatus.name()));
+    xUserExtInfo.setMarryStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(this.marryStatus.name()));
     xUserExtInfo.setCreatedAt(this.createdAt);
     xUserExtInfo.setUpdateAt(this.updateAt);
     return xUserExtInfo;

src/main/java/cn/quantgroup/xyqb/service/user/vo/UserDetailVO.java

@@ -68,10 +68,10 @@ public class UserDetailVO {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());