Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTreeContract.java

@@ -124,9 +124,10 @@ public class ArchiveTreeContract extends BaseEntity {
 	*/
 	private Integer extType;
 	/**
-	* 扩展关联Id
+	* 扩展Id，如动态工序节点的wbsid
 	*/
 	private Long extId;
+
 	/**
 	* 自动立卷类型
 	*/
@@ -141,6 +142,15 @@ public class ArchiveTreeContract extends BaseEntity {
 	 */
 	private Integer archiveAutoSelect;
 
+	/**
+	 * 来源id，用于后续同步更新
+	 */
+	private Long fromId;
+	/**
+	 * 扩展Id铆钉的树节点id
+	 */
+	private Long extAttachId;
+
 
 	public ArchiveTreeContract() {
 	}
@@ -152,6 +162,7 @@ public class ArchiveTreeContract extends BaseEntity {
 
 		try {
 			BeanUtils.copyProperties(archiveTree,this);
+			this.fromId = archiveTree.getId();
 		} catch (BeansException e) {
 			e.printStackTrace();
 		}

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -57,10 +57,10 @@ import org.springblade.business.service.IImageClassificationFileService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -583,6 +583,14 @@ public class ImageClassificationFileController extends BladeController {
         try {
             ImageClassificationFile newFile = this.copyBeanData(fileVO, true);
             this.setUserData(null, newFile, false);
+            String[] urls = fileVO.getImageUrl().split(",");
+            Long total = 0L;
+            for (String url : urls) {
+                long urlSize = getResourceLength(url);
+                total += urlSize;
+            }
+            String size = formatSize(total);
+            newFile.setFileSize(size);
             //落库数据
             return R.status(this.imageClassificationFileService.save(newFile));
         } catch (Exception e) {
@@ -680,4 +688,39 @@ public class ImageClassificationFileController extends BladeController {
         }
     }
 
+    /**
+     *
+     * @param urlStr
+     * @return  返回Url资源大小
+     * @throws IOException
+     */
+    public long getResourceLength(String urlStr) throws IOException {
+        URL url=new URL(urlStr);
+        URLConnection urlConnection=url.openConnection();
+        urlConnection.connect();
+        //返回响应报文头字段Content-Length的值
+        return urlConnection.getContentLength();
+    }
+    /**
+     * 根据字节返回文件大小
+     */
+    private String formatSize(long fileS) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        String fileSizeString = "";
+        String wrongSize = "0B";
+        if (fileS == 0) {
+            return wrongSize;
+        }
+        if (fileS < 1024) {
+            fileSizeString = df.format((double) fileS) + "B";
+        } else if (fileS < 1048576) {
+            fileSizeString = df.format((double) fileS / 1024) + "KB";
+        } else if (fileS < 1073741824) {
+            fileSizeString = df.format((double) fileS / 1048576) + "MB";
+        } else {
+            fileSizeString = df.format((double) fileS / 1073741824) + "GB";
+        }
+        return fileSizeString;
+    }
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -64,6 +64,8 @@
         <result column="ext_id" property="extId"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
+        <result column="from_id" property="fromId"/>
+        <result column="ext_attach_id" property="extAttachId"/>
     </resultMap>
 
     <resultMap id="ArchiveTreeContractVO2ResultMap" type="org.springblade.manager.vo.ArchiveTreeContractVO2">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -74,6 +74,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 			archiveTree.setParentId(oldNewMap.get(archiveTreeVO.getParentId()));
 			archiveTree.setCreateUser(AuthUtil.getUserId());
 			archiveTree.setProjectId(projectId);
+
 			String anCenstors = archiveTreeVO.getAncestors();
 			if (StringUtils.isNotEmpty(anCenstors)) {
 				String newAnCenstors = "";

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeSupportServiceImpl.java

@@ -0,0 +1,33 @@
+package org.springblade.manager.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.manager.entity.ArchiveTree;
+import org.springblade.manager.entity.ArchiveTreeContract;
+import org.springblade.manager.entity.WbsTree;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class ArchiveTreeSupportServiceImpl {
+
+
+    public List<ArchiveTree> getProcArchiveTree(ArchiveTree rootNode,String displayHierarchy,List<WbsTree> nodes)
+    {
+        List<ArchiveTree> archiveTreeList = new ArrayList<>();
+        for (WbsTree node: nodes) {
+            ArchiveTree archiveTree = new ArchiveTree();
+            archiveTree.setExtType(1);
+            archiveTree.setExtId(node.getId());
+            archiveTree.setAncestors(rootNode.getId().toString());
+            archiveTreeList.add(archiveTree);
+        }
+
+        //设置pid
+
+        return archiveTreeList;
+    }
+
+}