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

Merge branch 'schedule' of http://61.169.135.146:8081/git/xymp/backend into schedule

Browse Source
dev
liuguijing 1 year ago
parent 2745357395 8aaaf93221
commit 347b79b34c
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

30
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
Unescape Escape View File

@ -7,7 +7,6 @@ import com.shxy.xymanager_common.entity.*;
import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.exception.ApiException;
import com.shxy.xymanager_common.model.PhotoDayModel; import com.shxy.xymanager_common.model.PhotoDayModel;
import com.shxy.xymanager_common.model.TerminalGpsModel; import com.shxy.xymanager_common.model.TerminalGpsModel;
import com.shxy.xymanager_common.page.TableDataInfo;
import com.shxy.xymanager_common.vo.TerminalSelectVo; import com.shxy.xymanager_common.vo.TerminalSelectVo;
import com.shxy.xymanager_dao.dao.TerminalPositionsDao; import com.shxy.xymanager_dao.dao.TerminalPositionsDao;
import com.shxy.xymanager_dao.dao.TerminalStatusDao; import com.shxy.xymanager_dao.dao.TerminalStatusDao;
@ -20,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@RestController @RestController
@ -85,7 +83,7 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithAll") @GetMapping("listWithAll")
@ApiOperation("查询附带全部额外信息") @ApiOperation("查询附带全部额外信息")
public ResponseReult<List<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol, Integer devType, Integer isonline, Integer protocol, Integer devType,
Long start, Long end, Long start, Long end,
Integer channelId, Integer channelId,
@ -93,14 +91,14 @@ public class TerminalExtController extends BaseController {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
long cost = System.currentTimeMillis(); long cost = System.currentTimeMillis();
List<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline, protocol, devType, isonline, protocol, devType,
pageNum, pageSize); pageNum, pageSize);
cost = System.currentTimeMillis() - cost; cost = System.currentTimeMillis() - cost;
log.info("getTerminalList cost=" + cost); log.info("getTerminalList cost=" + cost);
if (!CollectionUtils.isEmpty(result)) { if (!CollectionUtils.isEmpty(result.getList())) {
cost = System.currentTimeMillis(); cost = System.currentTimeMillis();
for (View_Dy_Line_Tower_Terminals terminal : result) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId()) TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId())
.getData(); .getData();
terminal.setLastGps(last); terminal.setLastGps(last);
@ -124,16 +122,16 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithWeather") @GetMapping("listWithWeather")
@ApiOperation("查询附带天气") @ApiOperation("查询附带天气")
public ResponseReult<List<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol, Integer devType, Integer isonline, Integer protocol, Integer devType,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
List<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline, protocol, devType, isonline, protocol, devType,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result)) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
Weathers last = weatherService.getLast(terminal.getId()); Weathers last = weatherService.getLast(terminal.getId());
last.setCmdid(terminal.getCmdid()); last.setCmdid(terminal.getCmdid());
last.setPhase(terminal.getPhase()); last.setPhase(terminal.getPhase());
@ -145,16 +143,16 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithLeadPull") @GetMapping("listWithLeadPull")
@ApiOperation("查询附带拉力") @ApiOperation("查询附带拉力")
public ResponseReult<List<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol, Integer devType, Integer isonline, Integer protocol, Integer devType,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
List<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline, protocol, devType, isonline, protocol, devType,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result)) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
LeadPulls last = leadPullsService.getLast(terminal.getId()); LeadPulls last = leadPullsService.getLast(terminal.getId());
last.setCmdid(terminal.getCmdid()); last.setCmdid(terminal.getCmdid());
last.setPhase(terminal.getPhase()); last.setPhase(terminal.getPhase());
@ -171,7 +169,7 @@ public class TerminalExtController extends BaseController {
return ResponseReult.success(list); return ResponseReult.success(list);
} }
private List<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search, private PageInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol, Integer devType, Integer isonline, Integer protocol, Integer devType,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
TerminalSelectVo vo = new TerminalSelectVo(); TerminalSelectVo vo = new TerminalSelectVo();
@ -184,7 +182,7 @@ public class TerminalExtController extends BaseController {
vo.setDevType(devType); vo.setDevType(devType);
vo.setPageindex(pageNum); vo.setPageindex(pageNum);
vo.setPagesize(pageSize); vo.setPagesize(pageSize);
List<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalList(vo); PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalList(vo);
return result; return result;
} }
} }

10
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.shxy.xymanager_common.bean.PermissionDetail;
import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.entity.*;
import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.exception.ApiException;
import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.util.xinyin.TerminalUtils; import com.shxy.xymanager_common.util.xinyin.TerminalUtils;
import com.shxy.xymanager_common.vo.TerminalSelectVo; import com.shxy.xymanager_common.vo.TerminalSelectVo;
import com.shxy.xymanager_dao.dao.MntnRawReportsMapper; import com.shxy.xymanager_dao.dao.MntnRawReportsMapper;
@ -46,7 +47,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
@Override @Override
public List<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo) { public PageInfo<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo) {
if (vo.getCmaExclude() == null) { if (vo.getCmaExclude() == null) {
vo.setCmaExclude(false); vo.setCmaExclude(false);
} }
@ -114,15 +115,16 @@ public class TerminalExtServiceImpl implements TerminalExtService {
} }
criteria.andIdIn(idList); criteria.andIdIn(idList);
} }
PageUtils.SetPage(vo.getPageindex(), vo.getPagesize());
List<View_Dy_Line_Tower_Terminals> list = viewDyLineTowerTerminalsDao.selectByExample(example); List<View_Dy_Line_Tower_Terminals> list = viewDyLineTowerTerminalsDao.selectByExample(example);
return list; return new PageInfo<>(list);
} }
@Override @Override
public List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo) { public List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo) {
List<View_Dy_Line_Tower_Terminals> list = this.getTerminalList(vo); PageInfo<View_Dy_Line_Tower_Terminals> page = this.getTerminalList(vo);
List<View_Dy_Line_Tower_Terminals> result = this.fillReport(list, vo); List<View_Dy_Line_Tower_Terminals> result = this.fillReport(page.getList(), vo);
return result; return result;
} }

2
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.util.List;
public interface TerminalExtService { public interface TerminalExtService {
List<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo); PageInfo<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo);
List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo); List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo);

Write Preview
Loading…
Cancel
Save