add

src/main/java/com/zfire/jiasm/syncdata/download/order/DetailDownloadInstallTask.java

@@ -66,10 +66,10 @@ public class DetailDownloadInstallTask {
 			for (Map<String, Object> downloadType : types) {
 				int topDownloadTaskType = (Integer) downloadType.get("download_task_type");
 				// 关联任务表提取相应的数据
-				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
+				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
 
 				// 测试用
-				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
+				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
 
 				for (Map<String, Object> row : result) {
 					// ID

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -146,7 +146,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				+ " c.download_task_type_name "
 				+ " FROM itf_gree_to_fa_download_task_list a,itf_gree_to_fa_download_task_type c "
 				+ " where a.download_task_type=c.download_task_type "
-				+ " and a.id=14042 ");
+				+ " and a.download_key_value='8aaa99ed8a7e4979018a9710cf14273c' ");
 		return result;
 	}
 	
@@ -1005,7 +1005,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 		// 提取采集数据
 		oids = orderInstallDetailService.lambdaQuery()
-				.select(OrderInstallDetail::getPgwcmxid,OrderInstallDetail::getId)
 				.eq(OrderInstallDetail::getPgwcmxid,pgguid).list();
 		oidsMap = oids.stream().collect(Collectors.groupingBy(OrderInstallDetail::getPgwcmxid));
 
@@ -1060,7 +1059,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 		// 提取采集数据
 		oids = orderInstallDetailService.lambdaQuery()
-				.select(OrderInstallDetail::getPgwcmxid,OrderInstallDetail::getId)
 				.eq(OrderInstallDetail::getPgwcmxid,pgguid).list();
 		oidsMap = oids.stream().collect(Collectors.groupingBy(OrderInstallDetail::getPgwcmxid));
 
@@ -1114,7 +1112,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 		// 提取采集数据
 		oids = orderInstallDetailService.lambdaQuery()
-				.select(OrderInstallDetail::getPgwcmxid,OrderInstallDetail::getId)
 				.eq(OrderInstallDetail::getPgwcmxid,pgguid).list();
 		oidsMap = oids.stream().collect(Collectors.groupingBy(OrderInstallDetail::getPgwcmxid));
 
@@ -1296,12 +1293,28 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		a.setPgwcmxid(item.getPgwcmxid());
 		// 服务器存储图片路径
 		a.setBrandFilePath(item.getFjserverpath());
-		a.setFileType(item.getType());
+
+		a.setFileType(21);
+		if (item.getType()==0){
+			a.setFileType(1);
+		} else if (item.getType()==1){
+			a.setFileType(3);
+		} else if (item.getType()==4){
+			a.setFileType(4);
+		} else if (item.getType()==5){
+			a.setFileType(16);
+		} else if (item.getType()==7){
+			a.setFileType(5);
+		} else if (item.getType()==8){
+			a.setFileType(44);
+		}
+
 		a.setSortNum(item.getFjsequence());
 		a.setCreateTime(item.getCreatedDate());
 		a.setCreateBy(item.getCreatedBy());
 		a.setUpdateTime(item.getLastModifiedDate());
 		a.setUpdateBy(item.getLastModifiedBy());
+		a.setOutPicture(item.getFjserverpath());
 		odfs.add(a);
 	}
 
@@ -1321,12 +1334,26 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		a.setPgwcmxid(item.getPgwcmxid());
 		// 服务器存储图片路径
 		a.setBrandFilePath(item.getFjserverpath());
-		a.setFileType(item.getType());
+		a.setFileType(21);
+		if (item.getType()==0){
+			a.setFileType(1);
+		} else if (item.getType()==1){
+			a.setFileType(3);
+		} else if (item.getType()==4){
+			a.setFileType(4);
+		} else if (item.getType()==5){
+			a.setFileType(16);
+		} else if (item.getType()==7){
+			a.setFileType(5);
+		} else if (item.getType()==8){
+			a.setFileType(44);
+		}
 		a.setSortNum(item.getFjsequence());
 		a.setCreateTime(item.getCreatedDate());
 		a.setCreateBy(item.getCreatedBy());
 		a.setUpdateTime(item.getLastModifiedDate());
 		a.setUpdateBy(item.getLastModifiedBy());
+		a.setOutPicture(item.getFjserverpath());
 		odfs.add(a);
 	}
 

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=prdt
+spring.profiles.active=prd
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略