From 295d491b3f28e2f3d658dde5d9f8ec53674a0772 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Fri, 2 Jun 2023 17:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A3=85=E7=BD=AE=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/TerminalChannelMapper.java | 2 ++ .../shxy/xymanager_common/vo/TerminalVo.java | 21 +++++++++++++++---- .../xymanager_common/vo/UpdateTerminalVo.java | 21 +++++++++++++++---- .../mappers/TerminalChannelMapperDao.xml | 5 +++-- .../impl/TerminalParamsServiceImpl.java | 13 ------------ .../impl/TerminalPresetServiceImpl.java | 13 ------------ .../impl/TerminalScheduleServiceImpl.java | 12 ----------- .../impl/TerminalServiceImpl.java | 19 +++++++++-------- .../impl/TerminalStatusServiceImpl.java | 6 ------ .../service/TerminalParamsService.java | 16 -------------- .../service/TerminalPresetsService.java | 16 -------------- .../service/TerminalScheduleService.java | 16 -------------- .../service/TerminalStatusService.java | 8 ------- 13 files changed, 49 insertions(+), 119 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapper.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapper.java index 941bf04..8ffab7e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapper.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapper.java @@ -13,6 +13,8 @@ public class TerminalChannelMapper implements Serializable { private Integer channelId; + private String alias; + private Date createTime; private Date updateTime; 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 index 28fdb4d..9b571a3 100644 --- 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 @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -13,20 +14,20 @@ import java.util.List; @ApiModel(value = "装置信息对象", description = "设备信息对象描述") public class TerminalVo { @ApiModelProperty(value = "线路编号", example = "123456") - private Integer lineid; + private Integer lineId; @ApiModelProperty(value = "杆塔编号", example = "123456") - private Integer towerid; + private Integer towerId; @ApiModelProperty(value = "通道编号", example = "[{id:int , alias:dskafjl},{id,alias}]") - private List channelid; + private List channelId; @ApiModelProperty(value = "sim卡号", example = "123456") private String sim; @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") @NotBlank(message = "图像监测装置不能缺少") - private String cmdid; + private String cmdId; @ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678") private Short orgId; @@ -61,4 +62,16 @@ public class TerminalVo { @ApiModelProperty(value = "经度", example = "213") private Double longitude; + @Data + public static class Item { + @NotNull(message = "通道编号") + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer id; + + @NotNull(message = "通道编号不能缺少") + @ApiModelProperty(value = "通道编号", example = "123455") + private String channelName; + + + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java index fcaca58..b960d0e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java @@ -19,20 +19,20 @@ public class UpdateTerminalVo { private Integer id; @ApiModelProperty(value = "线路编号", example = "123456") - private Integer lineid; + private Integer lineId; @ApiModelProperty(value = "杆塔编号", example = "123456") - private Integer towerid; + private Integer towerId; @ApiModelProperty(value = "通道编号", example = "123456") - private List channelid; + private List channelId; @ApiModelProperty(value = "sim卡号", example = "123456") private String sim; @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") @NotBlank(message = "图像监测装置不能缺少") - private String cmdid; + private String cmdId; @ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678") private Short orgId; @@ -67,4 +67,17 @@ public class UpdateTerminalVo { @ApiModelProperty(value = "经度", example = "213") private Double longitude; + @Data + public static class Item { + @NotNull(message = "通道编号") + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer id; + + @NotNull(message = "通道编号不能缺少") + @ApiModelProperty(value = "通道编号", example = "123455") + private String channelName; + + + } + } diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml index f90e09f..b72ee31 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml @@ -5,6 +5,7 @@ + @@ -75,11 +76,11 @@ insert into terminal_channel_mapper - (term_id, channel_id, + (term_id, channel_id,alias, create_time, update_time) VALUES - (#{item.termId},#{item.channelId},#{createat},#{updateat}) + (#{item.termId},#{item.channelId},#{item.alias},#{createat},#{updateat}) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java index f28b1c4..a48d27a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java @@ -1,8 +1,5 @@ package com.shxy.xymanager_service.impl; -import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_service.service.TerminalParamsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,14 +12,4 @@ import org.springframework.stereotype.Service; @Slf4j public class TerminalParamsServiceImpl implements TerminalParamsService { - - @Override - public ServiceBody getTerminalList() { - return null; - } - - @Override - public ServiceBody addTerminal(TerminalVo terminalVo) { - return null; - } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java index 4efce83..54158a4 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java @@ -1,8 +1,5 @@ package com.shxy.xymanager_service.impl; -import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_service.service.TerminalPresetsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,14 +12,4 @@ import org.springframework.stereotype.Service; @Slf4j public class TerminalPresetServiceImpl implements TerminalPresetsService { - - @Override - public ServiceBody getTerminalList() { - return null; - } - - @Override - public ServiceBody addTerminal(TerminalVo terminalVo) { - return null; - } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java index 468463f..4820817 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java @@ -1,8 +1,5 @@ package com.shxy.xymanager_service.impl; -import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_service.service.TerminalScheduleService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,13 +12,4 @@ import org.springframework.stereotype.Service; @Slf4j public class TerminalScheduleServiceImpl implements TerminalScheduleService { - @Override - public ServiceBody getScheduleList() { - return null; - } - - @Override - public ServiceBody addTerminal(TerminalVo terminalVo) { - return null; - } } 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 034744f..608d5e7 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 @@ -114,12 +114,13 @@ public class TerminalServiceImpl implements TerminalService { Date time = new Date(); int i = terminalsDao.insertList(terminals, CommonStatus.EFFECTIVE.value(), time, time); Integer termid = terminals.getId(); - List channelid = vo.getChannelid(); - if (!BeanUtil.isEmpty(channelid) && channelid.size() > 0) { + List channelId = vo.getChannelId(); + if (CollectionUtil.isNotEmpty(channelId)) { List list = new ArrayList<>(); - for (Integer id : channelid) { + for (TerminalVo.Item item : channelId) { TerminalChannelMapper record = new TerminalChannelMapper(); - record.setChannelId(id); + record.setChannelId(item.getId()); + record.setAlias(item.getChannelName()); record.setTermId(termid); list.add(record); } @@ -142,17 +143,17 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody updateTerminal(UpdateTerminalVo vo) { Integer termid = vo.getId(); - List channelid = vo.getChannelid(); + List channelId = vo.getChannelId(); Terminals terminals = new Terminals(); BeanUtil.copyProperties(vo, terminals, true); int i = terminalsDao.updateByPrimaryKeySelective(terminals, new Date()); - terminalChannelMapperDao.deleteByTermId(termid); - if (!CollectionUtil.isEmpty(channelid)) { + if (!CollectionUtil.isNotEmpty(channelId)) { List list = new ArrayList<>(); - for (Integer id : channelid) { + for (UpdateTerminalVo.Item item : channelId) { TerminalChannelMapper record = new TerminalChannelMapper(); - record.setChannelId(id); + record.setChannelId(item.getId()); + record.setAlias(item.getChannelName()); record.setTermId(termid); list.add(record); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java index ef84f0f..1af0ca6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java @@ -9,7 +9,6 @@ import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.vo.TerminalIdListVo; -import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_dao.dao.TerminalsDao; import com.shxy.xymanager_service.service.TerminalStatusService; import lombok.extern.slf4j.Slf4j; @@ -52,11 +51,6 @@ public class TerminalStatusServiceImpl implements TerminalStatusService { return Asserts.success(terminalListModel); } - @Override - public ServiceBody addTerminal(TerminalVo terminalVo) { - return null; - } - /** * 删除装置 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 index 6204768..281066e 100644 --- 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 @@ -1,8 +1,5 @@ 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; /** * 设备接口 @@ -10,18 +7,5 @@ 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/TerminalPresetsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java index 1ee75e6..6bd7991 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java @@ -1,8 +1,5 @@ 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; /** * 设备接口 @@ -10,18 +7,5 @@ import com.shxy.xymanager_common.vo.TerminalVo; * @author 晶晶 */ public interface TerminalPresetsService { - /** - * 获取所有设备接口 - * - * @return - */ - ServiceBody getTerminalList(); - - /** - * 添加设备信息 - * - * @return - */ - ServiceBody addTerminal(TerminalVo terminalVo); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleService.java index e1616be..ab38c2d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleService.java @@ -1,8 +1,5 @@ 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; /** * 任务接口 @@ -10,18 +7,5 @@ import com.shxy.xymanager_common.vo.TerminalVo; * @author 晶晶 */ public interface TerminalScheduleService { - /** - * 获取所有设备接口 - * - * @return - */ - ServiceBody getScheduleList(); - - /** - * 添加设备信息 - * - * @return - */ - ServiceBody addTerminal(TerminalVo terminalVo); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalStatusService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalStatusService.java index 2c1c6ef..d083f61 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalStatusService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalStatusService.java @@ -3,7 +3,6 @@ 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.TerminalIdListVo; -import com.shxy.xymanager_common.vo.TerminalVo; /** * 设备接口 @@ -18,13 +17,6 @@ public interface TerminalStatusService { */ ServiceBody getTerminalList(); - /** - * 添加设备信息 - * - * @return - */ - ServiceBody addTerminal(TerminalVo terminalVo); - /** * 删除装置信息 * @param vo