diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java index 73b98be..7dca681 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.expert.assembler; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.expert.model.*; import com.ningdatech.pmapi.expert.model.bo.ExpertInfoSensitiveFieldCheckBO; import com.ningdatech.pmapi.expert.model.cmd.ExpertFullInfoSaveCmd; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java index 3231f86..9053101 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java @@ -1,26 +1,10 @@ package com.ningdatech.pmapi.expert.assembler; -//import com.ningdatech.emapi.common.enumeration.BoolDisplayEnum; -//import com.ningdatech.emapi.common.helper.RegionCache; -//import com.ningdatech.emapi.common.utils.JSONObject; -//import com.ningdatech.emapi.expert.constants.DictExpertInfoTypeEnum; -//import com.ningdatech.emapi.expert.constants.ExpertApplyTypeEnum; -//import com.ningdatech.emapi.expert.constants.ExpertTagEnum; -//import com.ningdatech.emapi.expert.entity.*; -//import com.ningdatech.emapi.expert.entity.domain.*; -//import com.ningdatech.emapi.expert.entity.dto.*; -//import com.ningdatech.emapi.expert.entity.vo.ExpertFullInfoVO; -//import com.ningdatech.emapi.sys.file.entity.FileBasicInfo; -//import com.ningdatech.emapi.sys.file.entity.vo.result.AttachFileVo; -//import com.ningdatech.emapi.sys.meta.entity.RegionDtoMapKey; -//import com.ningdatech.emapi.sys.meta.entity.dto.DictionaryDTO; -//import com.ningdatech.emapi.sys.meta.entity.dto.TagDTO; -//import com.ningdatech.emapi.sys.meta.helper.DictionaryCache; -//import com.ningdatech.emapi.sys.meta.helper.TagCache; import com.alibaba.fastjson.JSONObject; import com.ningdatech.file.entity.vo.result.AttachFileVo; import com.ningdatech.pmapi.common.enumeration.BoolDisplayEnum; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.expert.constant.ExpertApplyTypeEnum; import com.ningdatech.pmapi.expert.entity.ExpertAvoidCompany; import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java index 9e7005e..68ddd4a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.exception.BizException; import com.ningdatech.file.entity.vo.result.AttachFileVo; import com.ningdatech.file.service.FileService; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; import com.ningdatech.pmapi.expert.constant.ExpertSensitiveFieldTypeEnum; import com.ningdatech.pmapi.expert.constant.ExpertUserInfoSensitiveFieldEnum; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java index a55d6f3..5e701fd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java @@ -3,6 +3,7 @@ package com.ningdatech.pmapi.expert.manage; import com.ningdatech.basic.exception.BizException; import com.ningdatech.file.entity.vo.result.AttachFileVo; import com.ningdatech.file.service.FileService; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.expert.assembler.ExpertInfoCmdAssembler; import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; import com.ningdatech.pmapi.expert.constant.ExpertAccountStatusEnum; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertBasicInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertBasicInfo.java index 5687d1e..56a64b4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertBasicInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertBasicInfo.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.meta.model.ExpertRegionInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertEduInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertEduInfo.java index 00dda08..d9c66bd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertEduInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertEduInfo.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertProfessionalInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertProfessionalInfo.java index 6c0ed92..98e92d9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertProfessionalInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertProfessionalInfo.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertRecommendInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertRecommendInfo.java index 86056aa..f56e0b5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertRecommendInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExpertRecommendInfo.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExtraMaterialDO.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExtraMaterialDO.java index a0e8abf..70561dd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExtraMaterialDO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ExtraMaterialDO.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/FileBasicInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/FileBasicInfo.java deleted file mode 100644 index 8a3ffb4..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/FileBasicInfo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ningdatech.pmapi.expert.model; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author liuxinxin - * @date 2022/7/25 下午1:55 - * 用于包装使用 - */ -@Data -@ApiModel("文件信息基类") -public class FileBasicInfo { - - @ApiModelProperty("文件id") - private Long fileId; - - @ApiModelProperty("文件url") - private String url; - - @ApiModelProperty("文件名") - private String fileName; -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ModifyApplyExtraInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ModifyApplyExtraInfo.java index ff1965c..4327473 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ModifyApplyExtraInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/ModifyApplyExtraInfo.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ModifyApplyExtraInfoDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ModifyApplyExtraInfoDTO.java index 7cb05ea..082c5fc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ModifyApplyExtraInfoDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ModifyApplyExtraInfoDTO.java @@ -1,6 +1,6 @@ package com.ningdatech.pmapi.expert.model.dto; -import com.ningdatech.pmapi.expert.model.FileBasicInfo; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java index 674a010..2354a51 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.expert.model.req; +import com.ningdatech.pmapi.common.model.FileBasicInfo; import com.ningdatech.pmapi.expert.model.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty;