소스 검색

性别问题修改,BeanUtils.copyProperties改为使用spring的

liweifan 2 년 전
부모
커밋
f4b6abd484
51개의 변경된 파일118개의 추가작업 그리고 376개의 파일을 삭제
  1. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsArticleDto.java
  2. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsCollectDto.java
  3. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsConfigLabelDto.java
  4. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsFollowDto.java
  5. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsLikeDto.java
  6. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsPrivateMessageDto.java
  7. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsReplyDto.java
  8. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsCollectVo.java
  9. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsConfigLabelVo.java
  10. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsFollowVo.java
  11. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsLikeVo.java
  12. 0 10
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsPrivateMessageVo.java
  13. 0 11
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyAuditVo.java
  14. 0 1
      cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyVo.java
  15. 6 12
      cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java
  16. 5 10
      cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserWithdrawalController.java
  17. 6 12
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EmployeeDto.java
  18. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomBuyRecordDto.java
  19. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomSettingsDto.java
  20. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTotalDto.java
  21. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherTotalDto.java
  22. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundBillDto.java
  23. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundDto.java
  24. 13 4
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java
  25. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java
  26. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java
  27. 0 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java
  28. 2 5
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java
  29. 1 1
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GenderEnum.java
  30. 3 6
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java
  31. 3 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java
  32. 2 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthMusicianRecordServiceImpl.java
  33. 3 7
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java
  34. 3 6
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java
  35. 10 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java
  36. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceSettingsVo.java
  37. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicianAuthEntryRecordVo.java
  38. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFens.java
  39. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java
  40. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomBuyRecordVo.java
  41. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomSettingsVo.java
  42. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomeVo.java
  43. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentTotalVo.java
  44. 6 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java
  45. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/SysUserContractRecordVo.java
  46. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuthEntryRecordVo.java
  47. 6 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java
  48. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherTotalVo.java
  49. 7 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherVo.java
  50. 0 10
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderRefundBillVo.java
  51. 0 11
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderRefundVo.java

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsArticleDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsArticle;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsArticleDto extends BbsArticle{
 	private static final long serialVersionUID = 1L;
     
-    public BbsArticleDto buildDto(BbsArticle bbsArticle){
-        try {
-            BeanUtils.copyProperties(this,bbsArticle);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsCollectDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsCollect;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsCollectDto extends BbsCollect{
 	private static final long serialVersionUID = 1L;
     
-    public BbsCollectDto buildDto(BbsCollect bbsCollect){
-        try {
-            BeanUtils.copyProperties(this,bbsCollect);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsConfigLabelDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsConfigLabel;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsConfigLabelDto extends BbsConfigLabel{
 	private static final long serialVersionUID = 1L;
     
-    public BbsConfigLabelDto buildDto(BbsConfigLabel bbsConfigLabel){
-        try {
-            BeanUtils.copyProperties(this,bbsConfigLabel);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsFollowDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsFollow;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsFollowDto对象", description = "关注数据传输对象")
 public class BbsFollowDto extends BbsFollow{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsFollowDto buildDto(BbsFollow bbsFollow){
-        try {
-            BeanUtils.copyProperties(this,bbsFollow);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsLikeDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsLike;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsLikeDto extends BbsLike{
 	private static final long serialVersionUID = 1L;
     
-    public BbsLikeDto buildDto(BbsLike bbsLike){
-        try {
-            BeanUtils.copyProperties(this,bbsLike);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsPrivateMessageDto.java

@@ -4,7 +4,6 @@ import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.List;
 
@@ -83,13 +82,4 @@ public class BbsPrivateMessageDto extends BbsPrivateMessage{
         this.userAvatar = userAvatar;
     }
 
-    public BbsPrivateMessageDto buildDto(BbsPrivateMessage bbsPrivateMessage){
-        try {
-            BeanUtils.copyProperties(this,bbsPrivateMessage);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsReplyDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsReply;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsReplyDto对象", description = "文章评论数据传输对象")
 public class BbsReplyDto extends BbsReply{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsReplyDto buildDto(BbsReply bbsReply){
-        try {
-            BeanUtils.copyProperties(this,bbsReply);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsCollectVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsCollect;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -48,13 +47,4 @@ public class BbsCollectVo extends BbsCollect{
         this.labelName = labelName;
     }
 
-    public BbsCollectVo buildVo(BbsCollect bbsCollect){
-        try {
-            BeanUtils.copyProperties(this,bbsCollect);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsConfigLabelVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsConfigLabel;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsConfigLabelVo对象", description = "论坛标签设置查询视图对象")
 public class BbsConfigLabelVo extends BbsConfigLabel{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsConfigLabelVo buildVo(BbsConfigLabel bbsConfigLabel){
-        try {
-            BeanUtils.copyProperties(this,bbsConfigLabel);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsFollowVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsFollow;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -35,13 +34,4 @@ public class BbsFollowVo extends BbsFollow{
         this.avatar = avatar;
     }
 
-    public BbsFollowVo buildVo(BbsFollow bbsFollow){
-        try {
-            BeanUtils.copyProperties(this,bbsFollow);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsLikeVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsLike;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsLikeVo extends BbsLike{
 	private static final long serialVersionUID = 1L;
     
-    public BbsLikeVo buildVo(BbsLike bbsLike){
-        try {
-            BeanUtils.copyProperties(this,bbsLike);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsPrivateMessageVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsPrivateMessageVo对象", description = "私信查询视图对象")
 public class BbsPrivateMessageVo extends BbsPrivateMessage{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsPrivateMessageVo buildVo(BbsPrivateMessage bbsPrivateMessage){
-        try {
-            BeanUtils.copyProperties(this,bbsPrivateMessage);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 11
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyAuditVo.java

@@ -1,9 +1,7 @@
 package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsReply;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.Date;
 
@@ -81,15 +79,6 @@ public class BbsReplyAuditVo extends BbsReply {
         this.verifyTime = verifyTime;
     }
 
-    public BbsReplyAuditVo buildVo(BbsReply bbsReply) {
-        try {
-            BeanUtils.copyProperties(this, bbsReply);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
     public String getArticleTitle() {
         return articleTitle;
     }

+ 0 - 1
cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsReply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.List;
 

+ 6 - 12
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.*;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -61,19 +61,13 @@ public class UserOrderController extends BaseController {
     public void export(@RequestBody OrderSearch query) {
         List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
         List<UserOrderExport> list = new ArrayList<>();
-        userOrderVos.forEach(o-> {
+        userOrderVos.forEach(o -> {
             UserOrderExport export = new UserOrderExport();
-            try {
-                BeanUtils.copyProperties(export,o);
-                if(null == export.getFeeAmt()){
-                    export.setFeeAmt(BigDecimal.ZERO);
-                }
-                list.add(export);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
+            BeanUtils.copyProperties(o, export);
+            if (null == export.getFeeAmt()) {
+                export.setFeeAmt(BigDecimal.ZERO);
             }
+            list.add(export);
         });
         ExcelUtils.exportExcel(list, "订单列表数据" + System.currentTimeMillis(),
                 "订单列表数据");

+ 5 - 10
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserWithdrawalController.java

@@ -12,7 +12,8 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.*;
 import io.swagger.annotations.*;
-import org.apache.commons.beanutils.BeanUtils;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,7 +24,6 @@ import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.service.UserWithdrawalService;
 
 import javax.validation.Valid;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 @RestController
@@ -67,14 +67,9 @@ public class UserWithdrawalController extends BaseController {
         List<UserWithdrawalExport> list = new ArrayList<>();
         withdrawalVoList.forEach(o -> {
             UserWithdrawalExport export = new UserWithdrawalExport();
-            try {
-                BeanUtils.copyProperties(export, o);
-                list.add(export);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
+            BeanUtils.copyProperties(o, export);
+            list.add(export);
+
         });
         ExcelUtils.exportExcel(list, "结算列表数据" + System.currentTimeMillis(),
                 "列表数据");

+ 6 - 12
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EmployeeDto.java

@@ -5,7 +5,6 @@ import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -51,8 +50,12 @@ public class EmployeeDto extends Employee{
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     
@@ -83,13 +86,4 @@ public class EmployeeDto extends Employee{
         this.entryDate = entryDate;
     }
 
-    public EmployeeDto toEmployeeDto(Employee employee){
-        try {
-            BeanUtils.copyProperties(this,employee);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomBuyRecordDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomBuyRecord;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomBuyRecordDto对象", description = "购买会员卡记录表数据传输对象")
 public class PianoRoomBuyRecordDto extends PianoRoomBuyRecord{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomBuyRecordDto buildDto(PianoRoomBuyRecord pianoRoomBuyRecord){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomBuyRecord);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomSettingsDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomSettingsDto对象", description = "数据传输对象")
 public class PianoRoomSettingsDto extends PianoRoomSettings{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomSettingsDto buildDto(PianoRoomSettings pianoRoomSettings){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomSettings);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTotalDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class StudentTotalDto extends StudentTotal{
 	private static final long serialVersionUID = 1L;
     
-    public StudentTotalDto buildDto(StudentTotal studentTotal){
-        try {
-            BeanUtils.copyProperties(this,studentTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherTotalDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "TeacherTotalDto对象", description = "教师统计总表数据传输对象")
 public class TeacherTotalDto extends TeacherTotal{
 	private static final long serialVersionUID = 1L;
-    
-    public TeacherTotalDto buildDto(TeacherTotal teacherTotal){
-        try {
-            BeanUtils.copyProperties(this,teacherTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundBillDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class UserOrderRefundBillDto extends UserOrderRefundBill {
 	private static final long serialVersionUID = 1L;
     
-    public UserOrderRefundBillDto buildDto(UserOrderRefundBill userOrderRefundBill){
-        try {
-            BeanUtils.copyProperties(this, userOrderRefundBill);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefund;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "UserOrderRefundDto对象", description = "退款申请表数据传输对象")
 public class UserOrderRefundDto extends UserOrderRefund{
 	private static final long serialVersionUID = 1L;
-    
-    public UserOrderRefundDto buildDto(UserOrderRefund userOrderRefund){
-        try {
-            BeanUtils.copyProperties(this,userOrderRefund);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 13 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java

@@ -68,11 +68,20 @@ public class TeacherApplyDetailReq implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
-    }
+    public void setGender(Object gender) {
+        if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
+    }
+/*
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
+    }*/
 
-    
 
     public Date getBirthdate() {
         return birthdate;

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -45,8 +45,12 @@ public class EmployeeSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -45,8 +45,12 @@ public class StudentSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     public String getSubjectId() {

+ 0 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,7 +27,6 @@ public class Teacher implements Serializable {
     */
     @ApiModelProperty("对应user表用户编号 ")
     @TableId(value = "user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
     /** 
     * 学历 

+ 2 - 5
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,14 +28,12 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核单id ")
     @TableId(value = "id_", type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /** 
     * 对应user表用户编号 
     */
     @ApiModelProperty("对应user表用户编号 ")
 	@TableField(value = "user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
     /** 
     * 专业技能(支持多个,用逗号分隔),对应乐器表id 
@@ -88,7 +86,6 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核人 ")
 	@TableField(value = "verify_user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long verifyUserId;
     /** 
     * 审核理由 

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GenderEnum.java

@@ -11,7 +11,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
     GIRL(0, "女"),
     BOY(1, "男");
-    //@EnumValue
+    @EnumValue
     private Integer code;
     private String msg;
 

+ 3 - 6
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -18,8 +18,8 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.Student;
@@ -64,11 +64,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     public StudentHomeVo queryUserInfo(SysUser user) {
         StudentVo detail = detail(user.getId());
         StudentHomeVo studentHomeVo = new StudentHomeVo();
-        try {
-            BeanUtils.copyProperties(studentHomeVo, detail);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(detail, studentHomeVo);
+
         //身份证号、手机号脱敏
         studentHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(studentHomeVo.getIdCardNo()));
         studentHomeVo.setPhone(ValueUtil.fuzzyMobile(studentHomeVo.getPhone()));

+ 3 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -21,9 +21,9 @@ import com.yonge.toolset.base.string.StringPool;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
@@ -93,7 +93,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
             teacher.setUpdateTime(new Date());
 
             Teacher newTeacher = new Teacher();
-            BeanUtils.copyProperties(newTeacher, teacher);
+            BeanUtils.copyProperties(teacher, newTeacher);
             teacherDao.updateById(newTeacher);
 
             // 发送审核通知
@@ -154,7 +154,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         }
         //新增申请记录
         TeacherAuthEntryRecord teacherAuthEntryRecord = new TeacherAuthEntryRecord();
-        BeanUtils.copyProperties(teacherAuthEntryRecord, teacherApplyDetailDto);
+        BeanUtils.copyProperties(teacherApplyDetailDto, teacherAuthEntryRecord);
         teacherAuthEntryRecord.setTeacherAuthStatus(AuthStatusEnum.DOING);
 
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthMusicianRecordServiceImpl.java

@@ -19,9 +19,9 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.string.StringPool;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
-import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
@@ -113,7 +113,7 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
             teacher.setUpdateTime(new Date());
 
             Teacher newTeacher = new Teacher();
-            BeanUtils.copyProperties(newTeacher, teacher);
+            BeanUtils.copyProperties(teacher, newTeacher);
             teacherDao.updateById(newTeacher);
 
             // 发送审核通知

+ 3 - 7
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
@@ -25,9 +24,9 @@ import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -107,11 +106,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             return HttpResponseResult.failed("未查询到老师信息");
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
-        try {
-            BeanUtils.copyProperties(teacherHomeVo, teacher);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(teacher,teacherHomeVo);
+   
         //身份证号、手机号脱敏
         teacherHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(teacherHomeVo.getIdCardNo()));
         teacherHomeVo.setPhone(ValueUtil.fuzzyMobile(teacherHomeVo.getPhone()));

+ 3 - 6
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -30,10 +30,10 @@ import com.yonge.toolset.payment.base.model.Payment;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.PaymentClient;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
@@ -594,11 +594,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             throw new BizException("创建订单失败");
         }
         UserOrderVo vo = new UserOrderVo();
-        try {
-            BeanUtils.copyProperties(vo, userOrder);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+
+        BeanUtils.copyProperties(userOrder, vo);
         vo.setOrderDetailList(orderDetailList);
         return vo;
     }

+ 10 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
 
@@ -31,6 +31,7 @@ public class EmployeeVo extends Employee {
     private List<Long> roleIds;
     @ApiModelProperty(value = "用户对象")
     private SysUser sysUser;
+
     public String getUsername() {
         return username;
     }
@@ -43,11 +44,14 @@ public class EmployeeVo extends Employee {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if (gender instanceof GenderEnum) {
+            this.gender = (GenderEnum) gender;
+        } else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
-    
 
     public String getPhone() {
         return phone;
@@ -90,14 +94,10 @@ public class EmployeeVo extends Employee {
     }
 
     public EmployeeVo buildVo(Employee employee) {
-        if(null == employee){
+        if (null == employee) {
             return new EmployeeVo();
         }
-        try {
-            BeanUtils.copyProperties(this, employee);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(employee, this);
         return this;
     }
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceSettingsVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -23,13 +22,4 @@ public class MemberPriceSettingsVo extends MemberPriceSettings{
         this.modifierName = modifierName;
     }
 
-    public MemberPriceSettingsVo buildVo(MemberPriceSettings memberPriceSettings){
-        try {
-            BeanUtils.copyProperties(this,memberPriceSettings);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicianAuthEntryRecordVo.java

@@ -103,8 +103,12 @@ public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFens.java

@@ -67,8 +67,12 @@ public class MyFens extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java

@@ -90,8 +90,12 @@ public class MyFollow extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomBuyRecordVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomBuyRecord;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomBuyRecordVo对象", description = "购买会员卡记录表查询视图对象")
 public class PianoRoomBuyRecordVo extends PianoRoomBuyRecord{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomBuyRecordVo buildVo(PianoRoomBuyRecord pianoRoomBuyRecord){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomBuyRecord);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomSettingsVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomSettingsVo对象", description = "查询视图对象")
 public class PianoRoomSettingsVo extends PianoRoomSettings{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomSettingsVo buildVo(PianoRoomSettings pianoRoomSettings){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomSettings);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomeVo.java

@@ -148,8 +148,12 @@ public class StudentHomeVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentTotalVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class StudentTotalVo extends StudentTotal{
 	private static final long serialVersionUID = 1L;
     
-    public StudentTotalVo buildVo(StudentTotal studentTotal){
-        try {
-            BeanUtils.copyProperties(this,studentTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 6 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java

@@ -65,8 +65,12 @@ public class StudentVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     
@@ -132,7 +136,6 @@ public class StudentVo extends Student {
     }
 
     public void setIsVip(YesOrNoEnum isVip) {
-
         this.isVip = isVip;
     }
 

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/SysUserContractRecordVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -43,13 +42,4 @@ public class SysUserContractRecordVo extends SysUserContractRecord{
         this.version = version;
     }
 
-    public SysUserContractRecordVo buildVo(SysUserContractRecord sysUserContractRecord){
-        try {
-            BeanUtils.copyProperties(this,sysUserContractRecord);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuthEntryRecordVo.java

@@ -51,8 +51,12 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 6 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java

@@ -175,8 +175,12 @@ public class TeacherHomeVo extends Teacher implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherTotalVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class TeacherTotalVo extends TeacherTotal{
 	private static final long serialVersionUID = 1L;
     
-    public TeacherTotalVo buildVo(TeacherTotal teacherTotal){
-        try {
-            BeanUtils.copyProperties(this,teacherTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 7 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherVo.java

@@ -147,11 +147,15 @@ public class TeacherVo extends Teacher {
         return gender;
     }
 
-    public void setGender(GenderEnum gender) {
-        this.gender = gender;
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
-    
+
 
     public UserLockFlag getLockFlag() {
         return lockFlag;

+ 0 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderRefundBillVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class UserOrderRefundBillVo extends UserOrderRefundBill {
 	private static final long serialVersionUID = 1L;
     
-    public UserOrderRefundBillVo buildVo(UserOrderRefundBill userOrderRefundBill){
-        try {
-            BeanUtils.copyProperties(this, userOrderRefundBill);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

+ 0 - 11
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderRefundVo.java

@@ -5,7 +5,6 @@ import com.yonge.cooleshow.biz.dal.entity.UserOrderRefund;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -38,14 +37,4 @@ public class UserOrderRefundVo extends UserOrderRefund{
     public void setOrderType(OrderTypeEnum orderType) {
         this.orderType = orderType;
     }
-
-    public UserOrderRefundVo buildVo(UserOrderRefund userOrderRefund){
-        try {
-            BeanUtils.copyProperties(this,userOrderRefund);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }