|
|
|
@ -45,6 +45,7 @@ import java.io.ByteArrayInputStream; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
@ -108,6 +109,19 @@ public class PatrolTaskController extends BaseController { |
|
|
|
} else { |
|
|
|
task.setFileStatus("0"); |
|
|
|
} |
|
|
|
String areaIdS = task.getAreaIdS(); |
|
|
|
AjaxResult ajaxResult = FeignBasedataAreaService.list((new JSONObject()).fluentPut("areaIdS", areaIdS)); |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)); |
|
|
|
// 检查响应是否成功 |
|
|
|
if ("200".equals(ajaxResult.get("code").toString())) { |
|
|
|
JSONArray data = jsonObject.getJSONArray("data"); |
|
|
|
if (data != null && data.size() > 0) { |
|
|
|
List<String> areaNames = data.stream() |
|
|
|
.map(item -> ((JSONObject) item).getString("areaName")) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
task.setAreaName(StringUtils.join(areaNames, ",")); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return getDataTable(taskList); |
|
|
|
|