xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: 调整接口

Browse Source
dev
huangfeng 11 months ago
parent 6b656a986a
commit 7ef00b17f8
6 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File

16
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java
Unescape Escape View File

@ -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<PageInfo<LeadPulls>> list(Integer lineId, Integer towerId, Integer termId,
Long start, Long end,
Integer pageNum, Integer pageSize) {
PageInfo<LeadPulls> result = service.list(lineId, towerId, termId,
List<Integer> idList = null;
if (termId != null) {
idList = new ArrayList<>();
idList.add(termId);
}
PageInfo<LeadPulls> 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<LeadPulls> result = service.list(lineId, towerId, termId,
List<Integer> idList = null;
if (termId != null) {
idList = new ArrayList<>();
idList.add(termId);
}
PageInfo<LeadPulls> result = service.list(lineId, towerId, idList,
start, end, pageNum, pageSize);
EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), LeadPulls.class);
}

16
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java
Unescape Escape View File

@ -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<PageInfo<Weathers>> list(Integer lineId, Integer towerId, Integer termId,
Long start, Long end,
Integer pageNum, Integer pageSize) {
PageInfo<Weathers> result = service.list(lineId, towerId, termId,
List<Integer> idList = null;
if (termId != null) {
idList = new ArrayList<>();
idList.add(termId);
}
PageInfo<Weathers> 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<Weathers> result = service.list(lineId, towerId, termId,
List<Integer> idList = null;
if (termId != null) {
idList = new ArrayList<>();
idList.add(termId);
}
PageInfo<Weathers> result = service.list(lineId, towerId, idList,
start, end, pageNum, pageSize);
EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), Weathers.class);
}

6
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
Unescape Escape View File

@ -27,15 +27,15 @@ public class LeadPullsServiceImpl implements LeadPullsService {
TerminalService terminalService;
@Override
public PageInfo<LeadPulls> list(Integer lineId, Integer towerId, Integer termId,
public PageInfo<LeadPulls> list(Integer lineId, Integer towerId, List<Integer> termIdList,
Long start, Long end, Integer pageNum, Integer pageSize) {
List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
List<Integer> 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();

6
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
Unescape Escape View File

@ -25,15 +25,15 @@ public class WeatherServiceImpl implements WeatherService {
TerminalService terminalService;
@Override
public PageInfo<Weathers> list(Integer lineId, Integer towerId, Integer termId,
public PageInfo<Weathers> list(Integer lineId, Integer towerId, List<Integer> termIdList,
Long start, Long end, Integer pageNum, Integer pageSize) {
List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
List<Integer> 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();

4
xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java
Unescape Escape View File

@ -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<LeadPulls> list(Integer lineId, Integer towerId, Integer termId,
PageInfo<LeadPulls> list(Integer lineId, Integer towerId, List<Integer> termIdList,
Long start, Long end,
Integer pageNum, Integer pageSize);

4
xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java
Unescape Escape View File

@ -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<Weathers> list(Integer lineId, Integer towerId, Integer termId,
PageInfo<Weathers> list(Integer lineId, Integer towerId, List<Integer> termIdList,
Long start, Long end,
Integer pageNum, Integer pageSize);

Write Preview
Loading…
Cancel
Save