diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignBasedataAreaService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignBasedataAreaService.java index 04289ce..1ccad9e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignBasedataAreaService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignBasedataAreaService.java @@ -10,4 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam; public interface FeignBasedataAreaService { @GetMapping({"/area/selectAreaNameSForTaskByAreaIdS"}) AjaxResult selectAreaNameSForTaskByAreaIdS(@RequestParam("baseDataArea") JSONObject var1); + + @GetMapping({"/area/list"}) + AjaxResult list(@RequestParam("baseDataArea") JSONObject var1); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 6277e92..ff19ead 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -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 areaNames = data.stream() + .map(item -> ((JSONObject) item).getString("areaName")) + .collect(Collectors.toList()); + task.setAreaName(StringUtils.join(areaNames, ",")); + } + } } return getDataTable(taskList);