文件头像

src/main/java/com/chinaitop/DepotBasicApplication.java

@@ -8,6 +8,8 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 //import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -24,4 +26,9 @@ public class DepotBasicApplication {
 		System.setProperty("druid.validationQuery", "SELECT 1 FROM DUAL");
 		SpringApplication.run(DepotBasicApplication.class, args);
 	}
+
+	@Bean
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
 }

src/main/java/com/chinaitop/depot/basic/model/DRyxxsjyVO.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.chinaitop.depot.basic.model.vo.*;
+import com.chinaitop.depot.basic.param.FileObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -145,7 +146,7 @@ public class DRyxxsjyVO {
 	 * 岗位代码，11：后勤，12：业务，13：财务，14：统计，15：仓储，16：化验，17：管理，18：防治，19：保安，20：其他
 	 */
 	@ApiModelProperty("岗位代码，11：后勤，12：业务，13：财务，14：统计，15：仓储，16：化验，17：管理，18：防治，19：保安，20：其他")
-	private Integer gwdm;
+	private String gwdm;
 
 	/**
 	 * 技术职称代码，401：仓储管理员，402：农产品检验员，403：其他
@@ -335,4 +336,10 @@ public class DRyxxsjyVO {
 	private List<Object> otherVoList;
 	@ApiModelProperty(value = "职务类型变更记录")
 	private List<ZwlxbgjlVO> zwlxbgjlVOList;
+
+	// 文件对象
+	@ApiModelProperty(value = "文件url")
+	private String fileUrl;
+	@ApiModelProperty(value = "文件名称")
+	private String fileName;
 }

src/main/java/com/chinaitop/depot/basic/model/vo/CertificatesVO.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.basic.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -21,4 +22,10 @@ public class CertificatesVO {
     private Date acquisitionTime;
     // 证书附件
     private String fjid;
+
+    // 文件对象
+    @ApiModelProperty(value = "文件url")
+    private String fileUrl;
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
 }

src/main/java/com/chinaitop/depot/basic/model/vo/ReportVO.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.basic.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -32,4 +33,10 @@ public class ReportVO {
     private String occupation;
     // 证书附件
     private String fjid;
+
+    // 文件对象
+    @ApiModelProperty(value = "文件url")
+    private String fileUrl;
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
 }

src/main/java/com/chinaitop/depot/basic/model/vo/RotaterotateVO.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.basic.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -20,4 +21,10 @@ public class RotaterotateVO {
     private Date businessTime;
     // 文件编号
     private String serialNumber;
+
+    // 文件对象
+    @ApiModelProperty(value = "文件url")
+    private String fileUrl;
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
 }

src/main/java/com/chinaitop/depot/basic/param/FileObject.java

@@ -0,0 +1,27 @@
+package com.chinaitop.depot.basic.param;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-26 17:45
+ */
+@Getter
+@Setter
+public class FileObject implements Serializable {
+    private static final long serialVersionUID = 1020140835552562036L;
+    private Integer id;
+    private Integer version;
+    private Date createTime;
+    private String createByPeople;
+    private String name;
+    private Integer fileSize;
+    private String link;
+    private String businessId;
+    private String status;
+}

src/main/java/com/chinaitop/depot/basic/param/FileParam.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.basic.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-26 17:29
+ */
+@Data
+public class FileParam implements Serializable {
+    private static final long serialVersionUID = 7294849869061545523L;
+    private String status;
+    private Integer infoCode;
+    private String msg;
+    private FileObject data;
+}

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -1,13 +1,18 @@
 package com.chinaitop.depot.basic.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.basic.mapper.DRyxxsjyMapper;
 import com.chinaitop.depot.basic.model.DRyxxsjyVO;
 import com.chinaitop.depot.basic.model.vo.*;
 import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+import com.chinaitop.depot.basic.param.FileObject;
+import com.chinaitop.depot.basic.param.FileParam;
 import com.chinaitop.depot.basic.service.DRyxxsjyService;
+import com.chinaitop.depot.utils.FileUrlUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
+import org.springframework.util.*;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -18,9 +23,12 @@ import java.util.List;
  * @create 2024-11-21 20:05
  */
 @Service
+@SuppressWarnings("all")
 public class DRyxxsjyServiceImpl implements DRyxxsjyService {
     @Resource
     private DRyxxsjyMapper dRyxxsjyMapper;
+    @Resource
+    private FileUrlUtil fileUrlUtil;
 
     @Override
     public List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam) {
@@ -33,6 +41,16 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         if (ObjectUtils.isEmpty(dRyxxsjyVO)) {
             return dRyxxsjyVO;
         }
+
+        // 获取文件
+        if (StringUtils.hasText(dRyxxsjyVO.getAvatorUrl())) {
+            FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getAvatorUrl());
+            if (!ObjectUtils.isEmpty(data)) {
+                dRyxxsjyVO.setFileUrl(data.getLink());
+                dRyxxsjyVO.setFileName(data.getName());
+            }
+        }
+
         // 学历学位情况
         // 全日制
         List<EducationVO> educationVOList = dRyxxsjyMapper.getQuanById(rybh);
@@ -48,6 +66,16 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         List<RotaterotateVO> rotaterotateVOList = dRyxxsjyMapper.getRotaterotateById(rybh);
         if (!CollectionUtils.isEmpty(rotaterotateVOList)) {
             dRyxxsjyVO.setRotaterotateVOList(rotaterotateVOList);
+            // 文件
+            rotaterotateVOList.forEach(rotateVO -> {
+                if (StringUtils.hasText(rotateVO.getSerialNumber())) {
+                    FileObject data = fileUrlUtil.getData(rotateVO.getSerialNumber());
+                    if (!ObjectUtils.isEmpty(data)) {
+                        rotateVO.setFileUrl(data.getLink());
+                        rotateVO.setFileName(data.getName());
+                    }
+                }
+            });
         }
         // 技能等级
         List<SkillVO> skillVOList = dRyxxsjyMapper.getSkillListById(rybh);
@@ -58,11 +86,31 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         List<ReportVO> reportVOList = dRyxxsjyMapper.getReportListById(rybh);
         if (!CollectionUtils.isEmpty(reportVOList)) {
             dRyxxsjyVO.setReportVOList(reportVOList);
+            // 文件
+            reportVOList.forEach(reportVO -> {
+                if (StringUtils.hasText(reportVO.getFjid())) {
+                    FileObject data = fileUrlUtil.getData(reportVO.getFjid());
+                    if (!ObjectUtils.isEmpty(data)) {
+                        reportVO.setFileUrl(data.getLink());
+                        reportVO.setFileName(data.getName());
+                    }
+                }
+            });
         }
         // 上岗其它证书
         List<CertificatesVO> certificatesVOList = dRyxxsjyMapper.getCertificatesListById(rybh);
         if (!CollectionUtils.isEmpty(certificatesVOList)) {
             dRyxxsjyVO.setCertificatesVOList(certificatesVOList);
+            // 文件
+            certificatesVOList.forEach(certificatesVO -> {
+                if (StringUtils.hasText(certificatesVO.getFjid())) {
+                    FileObject data = fileUrlUtil.getData(certificatesVO.getFjid());
+                    if (!ObjectUtils.isEmpty(data)) {
+                        certificatesVO.setFileUrl(data.getLink());
+                        certificatesVO.setFileName(data.getName());
+                    }
+                }
+            });
         }
         // 其它附件-暂无
         // 职务类型变更记录

src/main/java/com/chinaitop/depot/utils/FileUrlUtil.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.chinaitop.depot.basic.param.FileObject;
+import com.chinaitop.depot.basic.param.FileParam;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-27 10:50
+ */
+@Component
+public class FileUrlUtil {
+    @Resource
+    private RestTemplate restTemplate;
+    @Value("${sptFile}")
+    private String sptFile;
+
+    /**
+     * 获取市平台文件url
+     *
+     * @param fileId
+     * @return
+     */
+    public FileObject getData(String fileId) {
+        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+        sendMap.add("id", fileId);
+        String forObject = restTemplate.postForObject(String.format("%s%s", sptFile, "/file/findById"), sendMap, String.class);
+        if (!ObjectUtils.isEmpty(forObject)) {
+            FileParam fileParam = JSON.parseObject(forObject, FileParam.class);
+            if (200 == fileParam.getInfoCode()) {
+                FileObject data = fileParam.getData();
+                data.setLink(String.format("%s%s", sptFile, data.getLink()));
+                return data;
+            }
+        }
+        return null;
+    }
+
+}

src/main/resources/bootstrap.yml

@@ -93,4 +93,6 @@ web:
 
 logging:
   level:
-    com.chinaitop.depot.basic.mapper: debug
+    com.chinaitop.depot.basic.mapper: debug
+# 调用市平台获取文件-紫光云
+sptFile: http://101.36.160.140:8097/file/