Browse Source

枚举修改

wwl 4 years ago
parent
commit
606719b86c

+ 9 - 9
hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -12,7 +12,7 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.PictureType;
+import com.miaxis.common.enums.PictureTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.SecurityUtils;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
@@ -114,14 +114,14 @@ public class UserInfoController extends BaseController{
     })
     })
     public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
     public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
         String prefix = "";
         String prefix = "";
-        if (PictureType.IDCARDFRONT.getCode().equals(type)){
-            prefix = PictureType.IDCARDFRONT.getPrefix();
-        }else if (PictureType.IDCARDFRONT.getCode().equals(type)){
-            prefix = PictureType.IDCARDREVERSE.getPrefix();
-        }else if (PictureType.FACES.getCode().equals(type)){
-            prefix = PictureType.FACES.getPrefix();
-        }else if (PictureType.FACES.getCode().equals(type)){
-            prefix = PictureType.FACES.getPrefix();
+        if (PictureTypeEnum.IDCARDFRONT.getCode().equals(type)){
+            prefix = PictureTypeEnum.IDCARDFRONT.getPrefix();
+        }else if (PictureTypeEnum.IDCARDFRONT.getCode().equals(type)){
+            prefix = PictureTypeEnum.IDCARDREVERSE.getPrefix();
+        }else if (PictureTypeEnum.FACES.getCode().equals(type)){
+            prefix = PictureTypeEnum.FACES.getPrefix();
+        }else if (PictureTypeEnum.FACES.getCode().equals(type)){
+            prefix = PictureTypeEnum.FACES.getPrefix();
         }else {
         }else {
             throw new CustomException("类型错误!");
             throw new CustomException("类型错误!");
         }
         }

+ 2 - 2
hzgzpt-common/src/main/java/com/miaxis/common/enums/PictureType.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/PictureTypeEnum.java

@@ -6,7 +6,7 @@ package com.miaxis.common.enums;
  * @Date 2021/1/5
  * @Date 2021/1/5
  * @Version 1.0
  * @Version 1.0
  */
  */
-public enum PictureType {
+public enum PictureTypeEnum {
 
 
     IDCARDFRONT("1", "身份证正面","idCardFront"),
     IDCARDFRONT("1", "身份证正面","idCardFront"),
     IDCARDREVERSE("2", "身份证反面","idCardReverse"),
     IDCARDREVERSE("2", "身份证反面","idCardReverse"),
@@ -16,7 +16,7 @@ public enum PictureType {
     private final String info;
     private final String info;
     private final String prefix;
     private final String prefix;
 
 
-    PictureType(String code, String info,String prefix)
+    PictureTypeEnum(String code, String info, String prefix)
     {
     {
         this.code = code;
         this.code = code;
         this.info = info;
         this.info = info;

+ 0 - 5
hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolEvaluateDto.java

@@ -1,9 +1,5 @@
 package com.miaxis.app.school.dto;
 package com.miaxis.app.school.dto;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +12,6 @@ import lombok.Data;
  * @date 2020-12-28
  * @date 2020-12-28
  */
  */
 @Data
 @Data
-@TableName("school_evaluate")
 @ApiModel(value = "SchoolEvaluate", description = "驾校评价对象 school_evaluate")
 @ApiModel(value = "SchoolEvaluate", description = "驾校评价对象 school_evaluate")
 public class SchoolEvaluateDto extends BaseBusinessEntity {
 public class SchoolEvaluateDto extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

+ 1 - 1
hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -161,8 +161,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             throw new CustomException("验证码错误,请重新输入!");
             throw new CustomException("验证码错误,请重新输入!");
         }
         }
 
 
-        UserInfo userInfo = new UserInfo();
         //用户信息表
         //用户信息表
+        UserInfo userInfo = new UserInfo();
         userInfo.setName(userDto.getName());
         userInfo.setName(userDto.getName());
         userInfo.setSex(userDto.getSex());
         userInfo.setSex(userDto.getSex());
         userInfo.setSfzmlx(1l);
         userInfo.setSfzmlx(1l);