From 94d3e2fbe618bce177b206321bb85da687f9f982 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 9 May 2023 18:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E9=80=9A?= =?UTF-8?q?=E9=81=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalPhotoController.java | 1 - .../model/DyLineTreeAndChannelListModel.java | 13 ++++++++++++- .../vo/TerminalAndTimeForOpenVo.java | 10 +++++----- .../xymanager_common/vo/TerminalPhotoVo.java | 2 +- .../xymanager_dao/dao/TerminalChannelsDao.java | 4 +++- .../resources/mappers/TerminalChannelsDao.xml | 8 ++++++++ .../impl/TerminalChannelServiceImpl.java | 16 ++++++++++++++-- .../impl/TerminalPhotoServiceImpl.java | 10 +++++----- .../service/TerminalChannelService.java | 3 ++- 9 files changed, 50 insertions(+), 17 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java index f9604dd..6eb6846 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java @@ -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") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeAndChannelListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeAndChannelListModel.java index 65c897d..05a7ab4 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeAndChannelListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeAndChannelListModel.java @@ -14,7 +14,7 @@ import java.util.List; @ApiModel(value = "电压线路和通道树状图列表", description = "电压线路和通道树状图列表信息") public class DyLineTreeAndChannelListModel implements Serializable { @ApiModelProperty(value = "通道列表", example = "[]") - private List channellist; + private List channellist; @ApiModelProperty(value = "电压列表", example = "[]") private List 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; + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java index a82a31f..aedceb5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java @@ -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; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java index e970a59..13a28b8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java @@ -24,7 +24,7 @@ public class TerminalPhotoVo { private Short preset; @NotNull(message = "图片类型") - @ApiModelProperty(value = "图片类型", example = "123455") + @ApiModelProperty(value = "图片类型", example = "0--图片 1--视频") private Short captureType; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java index 0e34fd7..b67dc53 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java @@ -15,7 +15,9 @@ public interface TerminalChannelsDao { int insertList(@Param("list") List record,@Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update); - List selectChannelList(); + List selectChannelList(@Param("status") Integer status); + + List selectAllChannelList(); List selectChannelByTowerId(@Param("towerid") Integer towerid, @Param("status") Integer status); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml index 22a1ced..d72d7cf 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml @@ -57,6 +57,14 @@ select from terminal_channels + where status = #{status} + + +