diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java index 2e55f3a..b79cc25 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java @@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; @RestController @Api(tags = {"拉力相关接口"}) @@ -32,7 +34,12 @@ public class LeadPullsController extends BaseController { public ResponseReult> list(Integer lineId, Integer towerId, Integer termId, Long start, Long end, Integer pageNum, Integer pageSize) { - PageInfo result = service.list(lineId, towerId, termId, + List idList = null; + if (termId != null) { + idList = new ArrayList<>(); + idList.add(termId); + } + PageInfo result = service.list(lineId, towerId, idList, start, end, pageNum, pageSize); return ResponseReult.success(result); } @@ -44,7 +51,12 @@ public class LeadPullsController extends BaseController { Long start, Long end, Integer pageNum, Integer pageSize, HttpServletResponse response) throws Exception { - PageInfo result = service.list(lineId, towerId, termId, + List idList = null; + if (termId != null) { + idList = new ArrayList<>(); + idList.add(termId); + } + PageInfo result = service.list(lineId, towerId, idList, start, end, pageNum, pageSize); EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), LeadPulls.class); } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java index c4bb474..cb1a9c0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; @RestController @Api(tags = {"气象相关接口"}) @@ -30,7 +32,12 @@ public class WeatherController extends BaseController { public ResponseReult> list(Integer lineId, Integer towerId, Integer termId, Long start, Long end, Integer pageNum, Integer pageSize) { - PageInfo result = service.list(lineId, towerId, termId, + List idList = null; + if (termId != null) { + idList = new ArrayList<>(); + idList.add(termId); + } + PageInfo result = service.list(lineId, towerId, idList, start, end, pageNum, pageSize); return ResponseReult.success(result); } @@ -42,7 +49,12 @@ public class WeatherController extends BaseController { Long start, Long end, Integer pageNum, Integer pageSize, HttpServletResponse response) throws Exception { - PageInfo result = service.list(lineId, towerId, termId, + List idList = null; + if (termId != null) { + idList = new ArrayList<>(); + idList.add(termId); + } + PageInfo result = service.list(lineId, towerId, idList, start, end, pageNum, pageSize); EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), Weathers.class); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java index 4cab902..62c8a39 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java @@ -27,15 +27,15 @@ public class LeadPullsServiceImpl implements LeadPullsService { TerminalService terminalService; @Override - public PageInfo list(Integer lineId, Integer towerId, Integer termId, + public PageInfo list(Integer lineId, Integer towerId, List termIdList, Long start, Long end, Integer pageNum, Integer pageSize) { List terminalsList = terminalService.getByLineAndTower(lineId, towerId); List idList = new ArrayList<>(); for (Terminals terminals : terminalsList) { idList.add(terminals.getId()); } - if (termId != null) { - idList.add(termId); + if (termIdList != null) { + idList.addAll(termIdList); } LeadPullsExample example = new LeadPullsExample(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java index 6c50615..ab27065 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java @@ -25,15 +25,15 @@ public class WeatherServiceImpl implements WeatherService { TerminalService terminalService; @Override - public PageInfo list(Integer lineId, Integer towerId, Integer termId, + public PageInfo list(Integer lineId, Integer towerId, List termIdList, Long start, Long end, Integer pageNum, Integer pageSize) { List terminalsList = terminalService.getByLineAndTower(lineId, towerId); List idList = new ArrayList<>(); for (Terminals terminals : terminalsList) { idList.add(terminals.getId()); } - if (termId != null) { - idList.add(termId); + if (termIdList != null) { + idList.addAll(termIdList); } WeathersExample example = new WeathersExample(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java index 1fd5f0d..1ce1810 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java @@ -4,9 +4,11 @@ package com.shxy.xymanager_service.service; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.entity.LeadPulls; +import java.util.List; + public interface LeadPullsService { - PageInfo list(Integer lineId, Integer towerId, Integer termId, + PageInfo list(Integer lineId, Integer towerId, List termIdList, Long start, Long end, Integer pageNum, Integer pageSize); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java index 345498b..ef5194c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java @@ -4,9 +4,11 @@ package com.shxy.xymanager_service.service; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.entity.Weathers; +import java.util.List; + public interface WeatherService { - PageInfo list(Integer lineId, Integer towerId, Integer termId, + PageInfo list(Integer lineId, Integer towerId, List termIdList, Long start, Long end, Integer pageNum, Integer pageSize);