From c17dc9fb890a8ec681826e2ec51d253d2e9bd799 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 26 Apr 2023 10:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A3=E5=BD=B1=E7=AE=A1=E7=90=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=A3=85=E7=BD=AE=E9=80=9A=E9=81=93=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChannelController.java | 13 ++++------- .../controller/TerminalPhotoController.java | 13 +++++++++++ .../model/TerminalChannelListModel.java | 9 +++++++- .../vo/TerminalChannelVo.java | 6 ++--- .../vo/UpdateTerminalChannelVo.java | 2 +- .../resources/mappers/TerminalChannelsDao.xml | 14 +++++++++-- .../impl/TerminalChannelServiceImpl.java | 23 +++++++++++++++---- .../xymanager_service/interaction/Cma.java | 2 +- .../service/TerminalChannelService.java | 7 ++---- 9 files changed, 63 insertions(+), 26 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java index 5aec11d..d9b9f72 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java @@ -8,10 +8,7 @@ import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.model.DyLineTreeAndChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelMapperListModel; -import com.shxy.xymanager_common.vo.TerminalChannelIdListVo; -import com.shxy.xymanager_common.vo.TerminalChannelVo; -import com.shxy.xymanager_common.vo.TerminalIdVo; -import com.shxy.xymanager_common.vo.UpdateTerminalChannelVo; +import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_service.service.TerminalChannelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,8 +35,8 @@ public class ChannelController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getChannelList") @Log(title = "获取所有通道列表", type = "查询") - public ResponseReult getChannelList() { - ServiceBody serviceBody = terminalChannelService.getChannelList(); + public ResponseReult getChannelList(@RequestBody @Validated PageVo vo) { + ServiceBody serviceBody = terminalChannelService.getChannelList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -64,7 +61,7 @@ public class ChannelController extends BaseController { @ApiOperation(value = "修改通道接口", notes = "获取通道列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/updateChannelList") - @Log(title = "修改通道列表", type = "查询") + @Log(title = "修改通道列表", type = "修改") public ResponseReult updateChannelList(@RequestBody @Validated UpdateTerminalChannelVo vo) { ServiceBody serviceBody = terminalChannelService.updateChannelList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { @@ -77,7 +74,7 @@ public class ChannelController extends BaseController { @ApiOperation(value = "删除通道接口", notes = "获取通道列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/deleteChannelList") - @Log(title = "获取通道列表", type = "查询") + @Log(title = "删除通道接口", type = "修改") public ResponseReult deleteChannelList(@RequestBody @Validated TerminalChannelIdListVo vo) { ServiceBody serviceBody = terminalChannelService.deleteChannelList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { 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 28275d1..6f4bc2a 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 @@ -42,4 +42,17 @@ public class TerminalPhotoController extends BaseController { } + @ApiOperation(value = "图片查询", notes = "图片查询接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getPhotoList") + @Log(title = "获取设备列表", type = "查询") + public ResponseReult getPhotoList(@RequestBody @Validated TerminalAndChannelIdAndTimeVo vo) { + ServiceBody serviceBody = terminalPhotoService.getTerminalPhotoList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelListModel.java index 264f1cb..468f001 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelListModel.java @@ -13,7 +13,14 @@ import java.util.List; @Data @ApiModel(value = "通道列表", description = "通道列表信息") public class TerminalChannelListModel implements Serializable { - + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; @ApiModelProperty(value = "通道列表对象", example = "[]") private List list; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java index fb3d323..6b69a51 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java @@ -13,17 +13,17 @@ public class TerminalChannelVo { @NotNull(message = "装置列表不能缺少") @ApiModelProperty(value = "装置通道编号列表", example = "123455") - private List list; + private List list; @Data - public static class Item { + public static class ChannelItem { @NotNull(message = "通道编号") @ApiModelProperty(value = "装置编号", example = "123455") private Integer id; @NotNull(message = "通道编号不能缺少") @ApiModelProperty(value = "通道编号", example = "123455") - private Integer channelname; + private String channelname; @ApiModelProperty(value = "分辨率W", example = "123456") private Integer maxResolutionWidth; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java index c97ff44..ced8c0b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import java.util.List; @Data -@ApiModel(value = "通道对象", description = "通道对象描述") +@ApiModel(value = "修改通道对象", description = "修改通道对象描述") public class UpdateTerminalChannelVo { @NotNull(message = "通道编号") diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml index fdce25d..5ec0190 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml @@ -104,13 +104,23 @@ where id = #{id,jdbcType=INTEGER} - insert into terminal_channels (id, term_id, channel_no, + insert into terminal_channels (id, term_id, channel_name, max_resolution_width, max_resolution_height ) - values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelNo,jdbcType=TINYINT}, + values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelName,jdbcType=VARCHAR}, #{maxResolutionWidth,jdbcType=INTEGER}, #{maxResolutionHeight,jdbcType=INTEGER} ) + + + insert into terminal_channels + (id,channel_name,max_resolution_width,max_resolution_height,status,create_time,update_time) + VALUES + + (#{item.id},#{item.channelName},#{item.maxResolutionWidth},#{item.maxResolutionHeight},#{status},#{createat},#{updateat}) + + + insert into terminal_channels diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java index ee60dfc..492bb0a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; +import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.DyLineAndTerminalAndChannelDto; import com.shxy.xymanager_common.dto.TermChannelAndMapperDto; @@ -12,10 +13,8 @@ import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.DyLineTreeAndChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelMapperListModel; -import com.shxy.xymanager_common.vo.TerminalChannelIdListVo; -import com.shxy.xymanager_common.vo.TerminalChannelVo; -import com.shxy.xymanager_common.vo.TerminalIdVo; -import com.shxy.xymanager_common.vo.UpdateTerminalChannelVo; +import com.shxy.xymanager_common.page.PageUtils; +import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.TerminalChannelsDao; import com.shxy.xymanager_service.service.TerminalChannelService; import lombok.extern.slf4j.Slf4j; @@ -87,7 +86,10 @@ public class TerminalChannelServiceImpl implements TerminalChannelService { * @return */ @Override - public ServiceBody getChannelList() { + public ServiceBody getChannelList(PageVo vo) { + int pageindex = vo.getPageindex(); + int pagesize = vo.getPagesize(); + PageUtils.SetPage(pageindex, pagesize); TerminalChannelListModel model = new TerminalChannelListModel(); List list = terminalChannelsDao.selectChannelList(); boolean empty = CollectionUtil.isEmpty(list); @@ -97,6 +99,17 @@ public class TerminalChannelServiceImpl implements TerminalChannelService { List channelBeans = BeanUtil.copyToList(list, TerminalChannelListModel.ChannelBean.class, CopyOptions.create().ignoreCase()); model.setList(channelBeans); } + PageInfo pageData = PageUtils.getPageData(list); + int currentpage = pageData.getPageNum(); + model.setCurrentpage(currentpage); + long total = pageData.getTotal(); + model.setTotal(total); + + int pageSize = pageData.getPageSize(); + model.setPagesize(pageSize); + int pages = pageData.getPages(); + model.setTotalpage(pages); + return Asserts.success(model); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java index aab5275..5043fab 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java @@ -3,7 +3,7 @@ package com.shxy.xymanager_service.interaction; public class Cma { static { - System.setProperty("java.library.path", "./libs") + System.setProperty("java.library.path", "./libs"); System.loadLibrary("xympj"); initCmaEnv(); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java index ad37e6a..aaaa84f 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java @@ -4,10 +4,7 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.DyLineTreeAndChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelListModel; import com.shxy.xymanager_common.model.TerminalChannelMapperListModel; -import com.shxy.xymanager_common.vo.TerminalChannelIdListVo; -import com.shxy.xymanager_common.vo.TerminalChannelVo; -import com.shxy.xymanager_common.vo.TerminalIdVo; -import com.shxy.xymanager_common.vo.UpdateTerminalChannelVo; +import com.shxy.xymanager_common.vo.*; /** * 通道接口 @@ -42,7 +39,7 @@ public interface TerminalChannelService { * * @return */ - ServiceBody getChannelList(); + ServiceBody getChannelList(PageVo vo); /** * 获取通道