德飞试验对接

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

@@ -23,6 +23,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.apache.commons.lang.StringUtils;
 import org.springblade.business.dto.TrialSystemDockingDTO;
 import org.springblade.business.dto.TrialSystemDockingDTO1;
 import org.springblade.business.entity.TrialClassificationTree;
@@ -127,6 +128,9 @@ public class TrialSystemDockingController extends BladeController {
 	public R update(@Valid @RequestBody TrialSystemDockingDTO1 trialSystemDockingDTO) {
 		TrialSystemDocking trialSystemDocking = trialSystemDockingService.getById(trialSystemDockingDTO.getId());
 		BeanUtil.copy(trialSystemDockingDTO,trialSystemDocking);
+		if(StringUtils.isNotEmpty(trialSystemDockingDTO.getFileUrl())){
+			trialSystemDockingService.syncUpdateFile1(trialSystemDocking);
+		}
 		return R.status(trialSystemDockingService.updateById(trialSystemDocking));
 	}
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSystemDockingMapper.xml

@@ -3,9 +3,8 @@
 <mapper namespace="org.springblade.business.mapper.TrialSystemDockingMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="trialSystemDockingResultMap" type="org.springblade.business.entity.TrialSystemDocking">
+    <resultMap id="trialSystemDockingResultMap" type="org.springblade.business.vo.TrialSystemDockingVO">
         <result column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
         <result column="report_name" property="reportName"/>
         <result column="report_number" property="reportNumber"/>
         <result column="unit_name" property="unitName"/>
@@ -15,7 +14,6 @@
         <result column="purpose_location" property="purposeLocation"/>
         <result column="report_date" property="reportDate"/>
         <result column="file_url" property="fileUrl"/>
-        <result column="file_url_oss" property="fileUrlOss"/>
         <result column="person_in_charge" property="personInCharge"/>
     </resultMap>
 

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSystemDockingService.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.service;
 
+import org.springblade.business.dto.TrialSystemDockingDTO1;
 import org.springblade.business.entity.TrialSystemDocking;
 import org.springblade.business.vo.TrialSystemDockingVO;
 import org.springblade.core.mp.base.BaseService;
@@ -44,4 +45,6 @@ public interface ITrialSystemDockingService extends BaseService<TrialSystemDocki
     void syncUpdateFile(List<TrialSystemDocking> list);
 
 	void updatedelete(List<Long> longList);
+
+	void syncUpdateFile1(@Valid TrialSystemDocking trialSystemDocking);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSystemDockingServiceImpl.java

@@ -18,6 +18,7 @@ package org.springblade.business.service.impl;
 
 import com.aliyun.oss.OSSClient;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.springblade.business.dto.TrialSystemDockingDTO1;
 import org.springblade.business.entity.TrialSystemDocking;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.vo.TrialSystemDockingVO;
@@ -53,7 +54,8 @@ public class TrialSystemDockingServiceImpl extends BaseServiceImpl<TrialSystemDo
 
 	@Override
 	public IPage<TrialSystemDockingVO> selectTrialSystemDockingPage(IPage<TrialSystemDockingVO> page, TrialSystemDockingVO trialSystemDocking) {
-		return page.setRecords(baseMapper.selectTrialSystemDockingPage(page, trialSystemDocking));
+		List<TrialSystemDockingVO> trialSystemDockingVOS = baseMapper.selectTrialSystemDockingPage(page, trialSystemDocking);
+		return page.setRecords(trialSystemDockingVOS);
 	}
 
 	@Async("taskExecutor1")
@@ -96,6 +98,33 @@ public class TrialSystemDockingServiceImpl extends BaseServiceImpl<TrialSystemDo
 		}
 	}
 
+	@Override
+	@Async("taskExecutor1")
+	@Transactional
+	public void syncUpdateFile1(TrialSystemDocking trialSystemDocking) {
+		String file_path = FileUtils.getSysLocalFileUrl()+"/trial/";
+		try {
+			String localFilePath = file_path + trialSystemDocking.getId() + ".pdf";
+			//下载文件到本地路径
+			boolean b = downloadFileFromUrl(trialSystemDocking.getFileUrl(), localFilePath);
+			if(b){
+				String fileName=trialSystemDocking.getProjectId()+"/"+trialSystemDocking.getId() + ".pdf";
+				BladeFile bladeFile = newIOSSClient.uploadFile(fileName, localFilePath);
+				if(bladeFile!=null){
+					trialSystemDocking.setFileUrlOss(bladeFile.getLink());
+					trialSystemDocking.setIsUpdateOss(1);
+				}else {
+					trialSystemDocking.setIsUpdateOss(3);
+				}
+			}else{
+				trialSystemDocking.setIsUpdateOss(0);
+			}
+		} catch (Exception e) {
+			trialSystemDocking.setIsUpdateOss(3);
+		}
+		this.updateById(trialSystemDocking);
+	}
+
 	public boolean downloadFileFromUrl(String fileUrl, String localPath) {
 		try {
 			URL url = new URL(fileUrl);