孙永军 1 vuosi sitten
vanhempi
commit
2c6e54da77

+ 5 - 1
src/main/java/com/sxtvs/open/api/bid/entity/BidFiles.java

@@ -1,6 +1,7 @@
 package com.sxtvs.open.api.bid.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -36,7 +37,7 @@ public class BidFiles implements Serializable {
 
     private Integer fileType;
 
-    private Object similarity;
+    private Double similarity;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
@@ -49,4 +50,7 @@ public class BidFiles implements Serializable {
     private Integer pageSize;
 
     private String fileSizeH;
+
+    @TableField(exist = false)
+    private String color;
 }

+ 3 - 1
src/main/java/com/sxtvs/open/api/bid/service/impl/BidFilesServiceImpl.java

@@ -30,7 +30,9 @@ import java.util.stream.Collectors;
 public class BidFilesServiceImpl extends ServiceImpl<BidFilesMapper, BidFiles> implements IBidFilesService {
 
     public List<BidFiles> byProject(Long id){
-        return lambdaQuery().eq(BidFiles::getProjectId, id).list();
+        return lambdaQuery().eq(BidFiles::getProjectId, id).list().stream().peek(data -> {
+            data.setColor(data.getSimilarity() >= 60 ? "red" : "green");
+        }).collect(Collectors.toList());
     }
 
     @Transactional

+ 13 - 1
src/main/java/com/sxtvs/open/api/h5template/service/impl/OSSService.java

@@ -10,6 +10,7 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.*;
+import com.sxtvs.open.core.advice.BizException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
@@ -158,8 +159,11 @@ public class OSSService {
     }
 
 
-    @SneakyThrows
+
     public String bidDocPut(MultipartFile file,  Long id)  {
+        try {
+
+
         // 读取DOC文件
         ByteArrayInputStream fis = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
 
@@ -186,6 +190,14 @@ public class OSSService {
         xwpfDocument.close();
 
         return "https://cxzx.smcic.net/" + encodedString;
+        }catch (IllegalArgumentException e){
+            log.error("doc文件转换错误, {} {}", file.getOriginalFilename(), e.getMessage());
+            return bidPut(file, id) + "x";
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("doc文件转换错误, {} {}", file.getOriginalFilename(), e.getMessage());
+            throw  new BizException("不支持的文件");
+        }
     }
 
 }