From 242be3746963e0066cc8b1ba325c507e4fcac71c Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Mon, 10 Apr 2023 20:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A3=E5=BD=B1=E7=AE=A1=E7=90=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shxy/xymanager_common/vo/TerminalVo.java | 69 +++++++++++++++++++ .../impl/TerminalServiceImpl.java | 42 ++++++++++- .../service/TerminalChannelService.java | 27 ++++++++ .../service/TerminalParamsService.java | 27 ++++++++ .../service/TerminalService.java | 8 +++ 5 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalParamsService.java diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java new file mode 100644 index 0000000..8bddf3b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java @@ -0,0 +1,69 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +@Data +@ApiModel(value = "设备信息对象", description = "设备信息对象描述") +public class TerminalVo { + + @ApiModelProperty(value = "线路编号", example = "123456") + @NotBlank(message = "线路编号不能缺少") + private Integer lineid; + + @ApiModelProperty(value = "杆塔编号", example = "123456") + @NotBlank(message = "杆塔编号不能缺少") + private Integer towerid; + + @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") + @NotBlank(message = "图像监测装置不能缺少") + private String cmdid; + + @ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678") + @NotBlank(message = "各厂家内部识别号不能缺少") + private Short orgId; + + @ApiModelProperty(value = "装置名称", example = "名称名称") + @NotBlank(message = "装置名称不能缺少") + private String equipName; + + @ApiModelProperty(value = "显示名", example = "名称名称") + @NotBlank(message = "显示名不能缺少") + private String displayName; + + @ApiModelProperty(value = "装置型号", example = "型号型号") + @NotBlank(message = "装置型号不能缺少") + private String model; + + @ApiModelProperty(value = "装置基本信息版本号", example = "型号型号") + @NotBlank(message = "装置基本信息版本号不能缺少") + private String essentialInfoVersion; + + @ApiModelProperty(value = "是否带云台", example = " 0： 不带云台 1：带云台") + @NotBlank(message = "是否带云台不能缺少") + private Byte hasPan; + + @ApiModelProperty(value = "生产厂家", example = "生产厂家") + @NotBlank(message = "生产厂家不能缺少") + private String bsManufacturer; + + @ApiModelProperty(value = "生产日期", example = "2022-06-12") + @NotBlank(message = "生产日期不能缺少") + private Date bsProductionDate; + + @ApiModelProperty(value = "出厂编号", example = "123456") + @NotBlank(message = "出厂编号不能缺少") + private String bsIdentifier; + + @ApiModelProperty(value = "纬度", example = "21321") + @NotBlank(message = "纬度不能缺少") + private Double latitude; + + @ApiModelProperty(value = "经度", example = "213") + @NotBlank(message = "经度不能缺少") + private Double longitude; +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index fc261d5..8bb5f66 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -7,6 +7,7 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_dao.dao.TerminalsDao; import com.shxy.xymanager_service.service.TerminalService; import lombok.extern.slf4j.Slf4j; @@ -30,7 +31,7 @@ public class TerminalServiceImpl implements TerminalService { private TerminalsDao terminalsDao; /** - * 提交建议 + * 获取所有设备列表 * * @return */ @@ -48,5 +49,44 @@ public class TerminalServiceImpl implements TerminalService { return Asserts.success(terminalListModel); } + /** + * 添加设备信息 + * + * @param terminalVo + * @return + */ + @Override + public ServiceBody addTerminal(TerminalVo terminalVo) { + + Terminals terminals = new Terminals(); + BeanUtil.copyProperties(terminalVo, terminals, true); + int i = terminalsDao.insertSelective(terminals); + if (i != 0) { + return Asserts.success("录入成功"); + } else { + return Asserts.error("录入失败"); + } + } + + +// /** +// * 查询单个设备信息 +// * +// * @param terminalVo +// * @return +// */ +// @Override +// public ServiceBody add(TerminalVo terminalVo) { +// +// Terminals terminals = new Terminals(); +// BeanUtil.copyProperties(terminalVo, terminals, true); +// int i = terminalsDao.insertSelective(terminals); +// if (i != 0) { +// return Asserts.success("录入成功"); +// } else { +// return Asserts.error("录入失败"); +// } +// } + } 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 new file mode 100644 index 0000000..ab80c77 --- /dev/null +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java @@ -0,0 +1,27 @@ +package com.shxy.xymanager_service.service; + +import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.vo.TerminalVo; + +/** + * 设备接口 + * + * @author 晶晶 + */ +public interface TerminalChannelService { + /** + * 获取所有设备接口 + * + * @return + */ + ServiceBody getTerminalList(); + + /** + * 添加设备信息 + * + * @return + */ + ServiceBody addTerminal(TerminalVo terminalVo); + +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalParamsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalParamsService.java new file mode 100644 index 0000000..6204768 --- /dev/null +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalParamsService.java @@ -0,0 +1,27 @@ +package com.shxy.xymanager_service.service; + +import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.vo.TerminalVo; + +/** + * 设备接口 + * + * @author 晶晶 + */ +public interface TerminalParamsService { + /** + * 获取所有设备接口 + * + * @return + */ + ServiceBody getTerminalList(); + + /** + * 添加设备信息 + * + * @return + */ + ServiceBody addTerminal(TerminalVo terminalVo); + +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java index 3739bb5..b4f43ce 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.vo.TerminalVo; /** * 设备接口 @@ -16,4 +17,11 @@ public interface TerminalService { */ ServiceBody getTerminalList(); + /** + * 添加设备信息 + * + * @return + */ + ServiceBody addTerminal(TerminalVo terminalVo); + }