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

获取所有通道接口

Browse Source
jni
liuguijing 2 years ago
parent 3eedc0bd70
commit 94d3e2fbe6
9 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
Unescape Escape View File

@ -34,7 +34,6 @@ public class TerminalPhotoController extends BaseController {
@Autowired
TerminalPhotoService terminalPhotoService;
@ApiOperation(value = "获取图片列表", notes = "获取图片列表接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getTerminalPhotoList")

13
xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeAndChannelListModel.java
Unescape Escape View File

@ -14,7 +14,7 @@ import java.util.List;
@ApiModel(value = "电压线路和通道树状图列表", description = "电压线路和通道树状图列表信息")
public class DyLineTreeAndChannelListModel implements Serializable {
@ApiModelProperty(value = "通道列表", example = "[]")
private List<ChannelBean> channellist;
private List<ChannelChooseBean> channellist;
@ApiModelProperty(value = "电压列表", example = "[]")
private List<DyListBean> list;
@ -83,6 +83,17 @@ public class DyLineTreeAndChannelListModel implements Serializable {
@ApiModelProperty(value = "拍照规则编号", example = "123456")
private Integer scheduleid;
}
@Data
public static class ChannelChooseBean {
@ApiModelProperty(value = "通道id", example = "12321")
private Integer id;
@ApiModelProperty(value = "通道名称", example = "123456")
private String name;
}
}

10
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java
Unescape Escape View File

@ -16,21 +16,21 @@ public class TerminalAndTimeForOpenVo {
@NotNull(message = "装置编号不能缺少")
@ApiModelProperty(value = "装置编号", example = "123455")
private String cmdid;
private String cmdId;
@NotNull(message = "查询开始时间不能缺少")
@ApiModelProperty(value = "查询开始时间", example = "123455")
private Date starttime;
private Date startTime;
@NotNull(message = "查询结束时间不能缺少")
@ApiModelProperty(value = "查询结束时间", example = "123455")
private Date endtime;
private Date endTime;
// @Min(value = 1, message = "分页位置最小从1开始")
@ApiModelProperty(value = "分页位置从1开始", required = false, example = "1")
private Integer pageindex;
private Integer pageIndex;
// @Min(value = 1, message = "分页大小最小为1")
@ApiModelProperty(value = "分页大小", required = false, example = "1")
private Integer pagesize;
private Integer pageSize;
}

2
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class TerminalPhotoVo {
private Short preset;
@NotNull(message = "图片类型")
@ApiModelProperty(value = "图片类型", example = "123455")
@ApiModelProperty(value = "图片类型", example = "0--图片 1--视频")
private Short captureType;

4
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
Unescape Escape View File

@ -15,7 +15,9 @@ public interface TerminalChannelsDao {
int insertList(@Param("list") List<TerminalChannels> record,@Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update);
List<TerminalChannels> selectChannelList();
List<TerminalChannels> selectChannelList(@Param("status") Integer status);
List<TerminalChannels> selectAllChannelList();
List<TermChannelAndMapperDto> selectChannelByTowerId(@Param("towerid") Integer towerid, @Param("status") Integer status);

8
xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
Unescape Escape View File

@ -57,6 +57,14 @@
select
<include refid="Base_Column_List"/>
from terminal_channels
where status = #{status}
</select>
<select id="selectAllChannelList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from terminal_channels
</select>
<select id="selectByTermid" parameterType="java.lang.Integer" resultMap="TerminalAndMapperMap">
select

16
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
Unescape Escape View File

@ -103,7 +103,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
TerminalChannelListModel model = new TerminalChannelListModel();
List<TerminalChannels> list = terminalChannelsDao.selectChannelList();
List<TerminalChannels> list = terminalChannelsDao.selectAllChannelList();
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
@ -127,12 +127,13 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
/**
* 获取所有通道
*
* @return
*/
@Override
public ServiceBody<TerminalAllChannelListModel> getAllChannelList() {
TerminalAllChannelListModel model = new TerminalAllChannelListModel();
List<TerminalChannels> list = terminalChannelsDao.selectChannelList();
List<TerminalChannels> list = terminalChannelsDao.selectAllChannelList();
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
@ -176,6 +177,17 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
@Override
public ServiceBody<DyLineTreeAndChannelListModel> getChannelTreeList(TerminalIdVo vo) {
DyLineTreeAndChannelListModel model = new DyLineTreeAndChannelListModel();
List<TerminalChannels> channellist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
ArrayList<DyLineTreeAndChannelListModel.ChannelChooseBean> channels = new ArrayList<>();
for (TerminalChannels item : channellist) {
Integer id = item.getId();
String channelName = item.getChannelName();
DyLineTreeAndChannelListModel.ChannelChooseBean channelChooseBean = new DyLineTreeAndChannelListModel.ChannelChooseBean();
channelChooseBean.setId(id);
channelChooseBean.setName(channelName);
channels.add(channelChooseBean);
}
model.setChannellist(channels);
List<DyLineAndTerminalAndChannelDto> list = terminalChannelsDao.selectAllAndChannelByTermid(vo.getTermid(), CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {

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

@ -194,15 +194,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
*/
@Override
public ServiceBody<TerminalPhotoListForOpenModel> getPhotoListForOpen(TerminalAndTimeForOpenVo vo) {
String cmdid = vo.getCmdid();
String cmdid = vo.getCmdId();
TerminalPhotoListForOpenModel model = new TerminalPhotoListForOpenModel();
Terminals terminals = terminalsDao.selectByCmdid(cmdid, CommonStatus.EFFECTIVE.value());
if (BeanUtil.isEmpty(terminals)) {
return Asserts.error("没有该装置信息");
}
Integer pageindex = vo.getPageindex();
Integer pagesize = vo.getPagesize();
Integer pageindex = vo.getPageIndex();
Integer pagesize = vo.getPageSize();
if (BeanUtil.isEmpty(pageindex) || pageindex <= 0) {
pageindex = 1;
}
@ -210,8 +210,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
pagesize = 10;
}
PageUtils.SetPage(pageindex, pagesize);
Date starttime = vo.getStarttime();
Date endtime = vo.getEndtime();
Date starttime = vo.getStartTime();
Date endtime = vo.getEndTime();
BigInteger start = MyDateUtils.TimeMillSecond2Second(DateTime.of(starttime));
BigInteger end = MyDateUtils.TimeMillSecond2Second(DateTime.of(endtime));
List<TerminalPhoto> list = terminalPhotoDao.selectPhotoListForOpen(terminals.getId(), start, end);

3
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java
Unescape Escape View File

@ -40,7 +40,8 @@ public interface TerminalChannelService {
*
* @return
*/
ServiceBody<TerminalChannelListModel> getChannelList(PageVo vo); /**
ServiceBody<TerminalChannelListModel> getChannelList(PageVo vo);
/**
* 获取所有通道列表
*
* @return

Write Preview
Loading…
Cancel
Save