Commit 6e3843cc authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 503e0207
...@@ -967,8 +967,7 @@ public class TDispatchInfoController { ...@@ -967,8 +967,7 @@ public class TDispatchInfoController {
@PostMapping("/doExportSocialSoldierBackFileById") @PostMapping("/doExportSocialSoldierBackFileById")
@Operation(description = "自动化办理查询导出反馈文件单个") @Operation(description = "自动化办理查询导出反馈文件单个")
@SysLog("自动化办理查询导出反馈文件单个") @SysLog("自动化办理查询导出反馈文件单个")
public String doExportSocialSoldierBackFileById(HttpServletResponse response, HttpServletRequest request, public R<String> doExportSocialSoldierBackFileById(@RequestBody SocialHandleSearchVo searchVo) {
@RequestBody SocialHandleSearchVo searchVo) {
return tDispatchInfoService.doExportSocialSoldierBackFileById(searchVo.getIdStr()); return tDispatchInfoService.doExportSocialSoldierBackFileById(searchVo.getIdStr());
} }
......
...@@ -190,5 +190,5 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> { ...@@ -190,5 +190,5 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
void doExportSocialSoldierAllBackFile(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr); void doExportSocialSoldierAllBackFile(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr);
String doExportSocialSoldierBackFileById(String idStr); R<String> doExportSocialSoldierBackFileById(String idStr);
} }
...@@ -8487,7 +8487,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -8487,7 +8487,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return; return;
} }
// 设置响应头 // 设置响应头
response.setContentType("application/octet-stream"); response.setContentType("application/zip");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" +
URLEncoder.encode("下载自动化办理反馈文件", "UTF-8") + ".zip"); URLEncoder.encode("下载自动化办理反馈文件", "UTF-8") + ".zip");
...@@ -8590,9 +8590,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -8590,9 +8590,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
@Override @Override
public String doExportSocialSoldierBackFileById(String idStr) { public R<String> doExportSocialSoldierBackFileById(String idStr) {
List<SocialSoldierBackVo> list = null; List<SocialSoldierBackVo> list = null;
if (Common.isEmpty(idStr)) { if (!Common.isEmpty(idStr)) {
list = baseMapper.getSocialSoldierAllListBackFile(null, Common.getList(idStr)); list = baseMapper.getSocialSoldierAllListBackFile(null, Common.getList(idStr));
} }
// 收集所有需要下载的 URL // 收集所有需要下载的 URL
...@@ -8617,10 +8617,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -8617,10 +8617,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CollectionUtils.isNotEmpty(requestIdMap)) { if (CollectionUtils.isNotEmpty(requestIdMap)) {
urls = socialFriendConfig.getDownloadFeedbackUrls(restTemplate,requestIdMap.get(list.get(0).getSocialId())); urls = socialFriendConfig.getDownloadFeedbackUrls(restTemplate,requestIdMap.get(list.get(0).getSocialId()));
} }
// 更新反馈文件状态
List<String> dispatchIds = new ArrayList<>();
dispatchIds.add(list.get(0).getDispatchId());
baseMapper.updateBackFileFlag(dispatchIds);
if (Common.isNotNull(urls)){ if (Common.isNotNull(urls)){
return urls.get(0); return R.ok(urls.get(0));
} }
} }
return null; return R.failed("未找到反馈文件");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment