From df9976435b8e18bf482c3b858b853e5aae7a1562 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 10 May 2023 18:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A3=85=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/TerminalChannelsAndScheduleDto.java | 17 +++++++ .../dto/TerminalChannelsDto.java | 3 +- .../dto/TerminalsAndChannelDto.java | 2 +- .../dto/TerminalsAndLineAndChannelDto.java | 49 +++++++++++++++++++ .../model/TerminalListModel.java | 22 +++++++-- .../shxy/xymanager_dao/dao/TerminalsDao.java | 3 ++ .../src/main/resources/mappers/DyLevelDao.xml | 2 +- .../resources/mappers/TerminalChannelsDao.xml | 2 +- .../main/resources/mappers/TerminalsDao.xml | 39 ++++++++++++--- .../impl/TerminalGpsServiceImpl.java | 12 ----- .../impl/TerminalServiceImpl.java | 3 +- .../service/TerminalGpsService.java | 1 - 12 files changed, 124 insertions(+), 31 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsAndScheduleDto.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsAndScheduleDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsAndScheduleDto.java new file mode 100644 index 0000000..5679e65 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsAndScheduleDto.java @@ -0,0 +1,17 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class TerminalChannelsAndScheduleDto implements Serializable { + private Integer id; + + private String name; + + private Integer scheduleid; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java index ae0ab83..6c01d2b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java @@ -6,12 +6,11 @@ import java.io.Serializable; @Data public class TerminalChannelsDto implements Serializable { + private Integer id; private String name; - private Integer scheduleid; - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndChannelDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndChannelDto.java index 5bd4fd2..195e148 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndChannelDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndChannelDto.java @@ -15,7 +15,7 @@ public class TerminalsAndChannelDto implements Serializable { private String name; - private List list; + private List list; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java new file mode 100644 index 0000000..598ccf3 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java @@ -0,0 +1,49 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class TerminalsAndLineAndChannelDto implements Serializable { + private Integer id; + + private Integer lineid; + + private String linename; + + private Integer towerid; + + private String towername; + + private String cmdid; + + private Short orgId; + + private String equipName; + + private String displayName; + + private String model; + + private String essentialInfoVersion; + + private Byte hasPan; + + private String bsManufacturer; + + private Date bsProductionDate; + + private String bsIdentifier; + + private Double latitude; + + private Double longitude; + + private List list; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index 8fc0656..a7bcc75 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -1,5 +1,7 @@ package com.shxy.xymanager_common.model; +import com.shxy.xymanager_common.dto.TerminalChannelsAndScheduleDto; +import com.shxy.xymanager_common.dto.TerminalChannelsDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import jdk.nashorn.internal.ir.Terminal; @@ -35,9 +37,15 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "线路编号", example = "123456") private Integer lineid; + @ApiModelProperty(value = "线路名称", example = "123456") + private String linename; + @ApiModelProperty(value = "杆塔编号", example = "123456") private Integer towerid; + @ApiModelProperty(value = "杆塔名称", example = "123456") + private String towername; + @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") private String cmdid; @@ -74,12 +82,16 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "经度", example = "213") private Double longitude; - @ApiModelProperty(value = "创建时间", example = "2022-06-08") - private Date createTime; - - @ApiModelProperty(value = "修改时间", example = "2022-06-08") - private Date updateTime; + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; + } + @Data + public static class ChannelBeans { + @ApiModelProperty(value = "通道编号", example = "213") + private Integer id; + @ApiModelProperty(value = "通道名称", example = "213") + private String name; } } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index bdb40d6..748c56c 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.TerminalInfoDto; +import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; import com.shxy.xymanager_common.entity.Terminals; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,8 @@ public interface TerminalsDao { List selectAll(@Param("status") Integer status); + List selectTermAndLineList(@Param("status") Integer status); + Terminals selectByCmdid(@Param("cmdid") String cmdid, @Param("status") Integer status); Terminals selectByToweridAndLineid(@Param("lineid") Integer lineid,@Param("towerid") Integer towerid, @Param("status") Integer status); diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 5c2e7d1..e64e785 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -69,7 +69,6 @@ left join terminal_status f on f.term_id = y.id) - insert into dy_level (id, name, dy_value, status, create_time, update_time @@ -78,6 +77,7 @@ #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} ) + insert into dy_level diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml index d72d7cf..e2c7b13 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml @@ -35,7 +35,7 @@ - + diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index e67b42a..7fe7c10 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -22,10 +22,12 @@ - + + + @@ -38,9 +40,10 @@ - - - + + + + @@ -55,11 +58,33 @@ from terminals where status = #{status} +