Merge branch 'energy-manage-chy2'

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/datatransfer/DataTransferVo.java

@@ -70,5 +70,10 @@ public class DataTransferVo {
      */
     private String timeGranularityName;
 
+    /**
+     * 下载地址
+     */
+    private String downloadUrl;
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/impl/DataTransferServiceImpl.java

@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -51,6 +52,9 @@ public class DataTransferServiceImpl implements DataTransferService {
     @Autowired
     private DataTransferTypeMapper typeMapper;
 
+    @Value("${download.url}")
+    private String downloadUrl;
+
     /**
      * 转换中状态
      */
@@ -90,6 +94,7 @@ public class DataTransferServiceImpl implements DataTransferService {
                 dataTransferVos.parallelStream().forEach(item -> {
                     item.setTransferTypeName(getDataTransferTypeName(typeVos,item.getTransferType()));
                     item.setTimeGranularityName(item.getTransferTypeName().replace("路径","时间粒度"));
+                    item.setDownloadUrl(downloadUrl);
                 });
             }
         }