Merge branch 'schedule' of http://192.168.111.189:80/git/xymp/backend into schedule
liuguijing
1 year ago
commit
e7b92c9d64
@ -0,0 +1,127 @@
|
||||
package com.shxy.xymanager_admin.controller;
|
||||
|
||||
import com.shxy.xymanager_common.base.BaseController;
|
||||
import com.shxy.xymanager_common.base.ResponseReult;
|
||||
import com.shxy.xymanager_common.entity.LeadPulls;
|
||||
import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
|
||||
import com.shxy.xymanager_common.entity.Weathers;
|
||||
import com.shxy.xymanager_common.model.PhotoDayModel;
|
||||
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_service.service.*;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@RestController
|
||||
@Api(tags = {"装置附带额外信息接口"})
|
||||
@RequestMapping("terminal")
|
||||
@Slf4j
|
||||
@Validated
|
||||
public class TerminalExtController extends BaseController {
|
||||
|
||||
@Resource
|
||||
TerminalService terminalService;
|
||||
@Resource
|
||||
TerminalGpsService gpsService;
|
||||
@Resource
|
||||
WeatherService weatherService;
|
||||
@Resource
|
||||
LeadPullsService leadPullsService;
|
||||
@Resource
|
||||
TerminalPhotoService photoService;
|
||||
|
||||
|
||||
@GetMapping("listWithGPS")
|
||||
@ApiOperation("查询附带定位")
|
||||
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithGPS(Integer dyId, Integer lineId, Integer towerId, String search,
|
||||
Integer pageNum, Integer pageSize) {
|
||||
pageNum = this.initPageNum(pageNum);
|
||||
pageSize = this.initPageSize(pageSize);
|
||||
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
|
||||
pageNum, pageSize);
|
||||
if (!CollectionUtils.isEmpty(result.getList())) {
|
||||
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
||||
TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId())
|
||||
.getData();
|
||||
terminal.setLastGps(last);
|
||||
}
|
||||
}
|
||||
return ResponseReult.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("listWithPhoto")
|
||||
@ApiOperation("查询附带图片统计")
|
||||
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, String search,
|
||||
@NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end,
|
||||
Integer channelId,
|
||||
Integer pageNum, Integer pageSize) {
|
||||
pageNum = this.initPageNum(pageNum);
|
||||
pageSize = this.initPageSize(pageSize);
|
||||
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
|
||||
pageNum, pageSize);
|
||||
if (!CollectionUtils.isEmpty(result.getList())) {
|
||||
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
||||
PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
|
||||
terminal.setPhotoInfo(photoInfo);
|
||||
}
|
||||
}
|
||||
return ResponseReult.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("listWithWeather")
|
||||
@ApiOperation("查询附带天气")
|
||||
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search,
|
||||
Integer pageNum, Integer pageSize) {
|
||||
pageNum = this.initPageNum(pageNum);
|
||||
pageSize = this.initPageSize(pageSize);
|
||||
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
|
||||
pageNum, pageSize);
|
||||
if (!CollectionUtils.isEmpty(result.getList())) {
|
||||
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
||||
Weathers last = weatherService.getLast(terminal.getId());
|
||||
terminal.setLastWeathers(last);
|
||||
}
|
||||
}
|
||||
return ResponseReult.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("listWithLeadPull")
|
||||
@ApiOperation("查询附带拉力")
|
||||
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search,
|
||||
Integer pageNum, Integer pageSize) {
|
||||
pageNum = this.initPageNum(pageNum);
|
||||
pageSize = this.initPageSize(pageSize);
|
||||
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
|
||||
pageNum, pageSize);
|
||||
if (!CollectionUtils.isEmpty(result.getList())) {
|
||||
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
||||
LeadPulls last = leadPullsService.getLast(terminal.getId());
|
||||
terminal.setLastLeadPulls(last);
|
||||
}
|
||||
}
|
||||
return ResponseReult.success(result);
|
||||
}
|
||||
|
||||
private TableDataInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search,
|
||||
Integer pageNum, Integer pageSize) {
|
||||
TerminalSelectVo vo = new TerminalSelectVo();
|
||||
vo.setDyId(dyId);
|
||||
vo.setLineId(lineId);
|
||||
vo.setTowerId(towerId);
|
||||
vo.setSearch(search);
|
||||
vo.setPageindex(pageNum);
|
||||
vo.setPagesize(pageSize);
|
||||
TableDataInfo<View_Dy_Line_Tower_Terminals> result = terminalService.getTerminalList(vo).getData();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.shxy.xymanager_common.model;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
@Data
|
||||
public class PhotoDayModel implements Serializable {
|
||||
|
||||
private long firstPhotoTime;
|
||||
|
||||
private long lastRecvTime;
|
||||
|
||||
private long photoCount;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue