|
|
@@ -24,10 +24,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Slf4j
|
|
|
@@ -135,11 +132,21 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
List<Map<String, Object>> result = jdbcTemplate.queryForList("SELECT a.*, "
|
|
|
+ " 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 "
|
|
|
+ + " where a.download_task_type=c.download_task_type "
|
|
|
+ " and c.download_task_type not in (92,31) and c.download_task_type=? "
|
|
|
+ " and a.download_status=0 and (download_times is null or download_times<=5) order by a.id limit 1000 ",new Object[] {downloadTaskType});
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<Map<String, Object>> getTaskDataInstallTest(int downloadTaskType) {
|
|
|
+ List<Map<String, Object>> result = jdbcTemplate.queryForList("SELECT a.*, "
|
|
|
+ + " 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=193634 ");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public List<Map<String, Object>> getTaskDataRepair(int downloadTaskType) {
|
|
|
@@ -182,10 +189,12 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void insertData(String downloadTaskNo, List<DetailDownloadData> detailDownloadDatas,
|
|
|
- int downloadTaskType, String pgguid,Map<String, List<SysDict>> sysDictRefDLMap)
|
|
|
+ int downloadTaskType, String pgguid,Map<String, List<SysDict>> sysDictRefDLMap,Long id)
|
|
|
throws Exception {
|
|
|
|
|
|
// 写入下载表
|
|
|
@@ -194,10 +203,22 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
detailDownloadData.getArySrcTabColValue());
|
|
|
}
|
|
|
|
|
|
+ if (detailDownloadDatas.size()<=0){
|
|
|
+ // 修改同步表状态信息
|
|
|
+ updateSyncTable(id,"获取的数据为空");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
// 写入本地表
|
|
|
process(downloadTaskNo, downloadTaskType, pgguid, sysDictRefDLMap);
|
|
|
}
|
|
|
|
|
|
+ public void updateSyncTable(Long synReqId, String msg) {
|
|
|
+ jdbcTemplate.update("update itf_gree_to_fa_download_task_list set download_status=1,download_time=?,download_err_msg=? where id=?",
|
|
|
+ new Object[] { new Date(System.currentTimeMillis()), msg, synReqId });
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void insertDataRepair(String downloadTaskNo, List<DetailDownloadData> detailDownloadDatas,
|
yaozhixue