From d36aa022d1c094a0021441ac7df53e9761325941 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Tue, 4 Aug 2020 16:32:18 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E6=8E=A7=E5=88=B6=E5=99=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=202.=20=E9=87=8D=E5=91=BD=E5=90=8D=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/logback.xml | 2 +- .../java/com/dispose/common/BaseEnum.java | 4 +- .../com/dispose/common/CommonEnumHandler.java | 4 +- .../dispose/common/DisposeCapacityType.java | 4 +- .../com/dispose/common/DisposeDeviceType.java | 4 +- .../com/dispose/common/DisposeObjectType.java | 4 +- .../java/com/dispose/common/HttpType.java | 5 ++- .../java/com/dispose/common/IpAddrType.java | 4 +- .../java/com/dispose/common/ObjectStatus.java | 4 +- .../DisposeDeviceManagerController.java | 40 ++++++++++++++++++- .../pojo/dto/protocol/base/BaseIdResp.java | 30 ++++++++++++++ .../device/manager/AddCapacityInfo.java | 39 ++++++++++++++++++ .../device/manager/AddDeviceInfo.java | 14 +++++++ .../protocol/device/manager/AddDeviceReq.java | 2 + .../protocol/device/manager/AddDeviceRsp.java | 33 +++++++++++++++ .../service/DisposeDeviceManagerService.java | 7 ++++ .../impl/DisposeDeviceManagerServiceImpl.java | 38 +++++++++++++++++- .../mapper/DisposeCapacityMapperTest.java | 2 +- 18 files changed, 220 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/base/BaseIdResp.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceRsp.java diff --git a/config/logback.xml b/config/logback.xml index 29cc3007..d5b6e0ca 100644 --- a/config/logback.xml +++ b/config/logback.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dispose/common/BaseEnum.java b/src/main/java/com/dispose/common/BaseEnum.java index 7cf2daa9..551ba642 100644 --- a/src/main/java/com/dispose/common/BaseEnum.java +++ b/src/main/java/com/dispose/common/BaseEnum.java @@ -11,12 +11,12 @@ public interface BaseEnum { * * @return the value */ - Integer getCode(); + Integer getValue(); /** * Gets description. * * @return the description */ - String getReadme(); + String getDescription(); } diff --git a/src/main/java/com/dispose/common/CommonEnumHandler.java b/src/main/java/com/dispose/common/CommonEnumHandler.java index 526be692..6c4cb475 100644 --- a/src/main/java/com/dispose/common/CommonEnumHandler.java +++ b/src/main/java/com/dispose/common/CommonEnumHandler.java @@ -51,7 +51,7 @@ public final class CommonEnumHandler extends BaseTypeHandler */ @Override public void setNonNullParameter(PreparedStatement preparedStatement, int i, E e, JdbcType jdbcType) throws SQLException { - preparedStatement.setInt(i, e.getCode()); + preparedStatement.setInt(i, e.getValue()); } /** @@ -116,7 +116,7 @@ public final class CommonEnumHandler extends BaseTypeHandler */ private E locateEnumStatus(int index) { for (E e : enums) { - if (e.getCode() == index) { + if (e.getValue() == index) { return e; } } diff --git a/src/main/java/com/dispose/common/DisposeCapacityType.java b/src/main/java/com/dispose/common/DisposeCapacityType.java index 8c44cbc3..b83ccd4c 100644 --- a/src/main/java/com/dispose/common/DisposeCapacityType.java +++ b/src/main/java/com/dispose/common/DisposeCapacityType.java @@ -54,7 +54,7 @@ public enum DisposeCapacityType implements BaseEnum { * @return the code */ @Override - public Integer getCode() { + public Integer getValue() { return this.code; } @@ -64,7 +64,7 @@ public enum DisposeCapacityType implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/common/DisposeDeviceType.java b/src/main/java/com/dispose/common/DisposeDeviceType.java index 0a78dd1a..6015a241 100644 --- a/src/main/java/com/dispose/common/DisposeDeviceType.java +++ b/src/main/java/com/dispose/common/DisposeDeviceType.java @@ -34,7 +34,7 @@ public enum DisposeDeviceType implements BaseEnum { * @return the code */ @Override - public Integer getCode() { + public Integer getValue() { return this.code; } @@ -44,7 +44,7 @@ public enum DisposeDeviceType implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/common/DisposeObjectType.java b/src/main/java/com/dispose/common/DisposeObjectType.java index 3d85ef9e..77ea9829 100644 --- a/src/main/java/com/dispose/common/DisposeObjectType.java +++ b/src/main/java/com/dispose/common/DisposeObjectType.java @@ -61,7 +61,7 @@ public enum DisposeObjectType implements BaseEnum { * @return the code */ @Override - public Integer getCode() { + public Integer getValue() { return this.code; } @@ -71,7 +71,7 @@ public enum DisposeObjectType implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/common/HttpType.java b/src/main/java/com/dispose/common/HttpType.java index e4a08dab..203fd3a0 100644 --- a/src/main/java/com/dispose/common/HttpType.java +++ b/src/main/java/com/dispose/common/HttpType.java @@ -41,7 +41,8 @@ public enum HttpType implements BaseEnum { * * @return the code */ - public Integer getCode() { + @Override + public Integer getValue() { return this.code; } @@ -51,7 +52,7 @@ public enum HttpType implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/common/IpAddrType.java b/src/main/java/com/dispose/common/IpAddrType.java index 7bef0685..01652107 100644 --- a/src/main/java/com/dispose/common/IpAddrType.java +++ b/src/main/java/com/dispose/common/IpAddrType.java @@ -46,7 +46,7 @@ public enum IpAddrType implements BaseEnum { * @return the code */ @Override - public Integer getCode() { + public Integer getValue() { return this.code; } @@ -56,7 +56,7 @@ public enum IpAddrType implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/common/ObjectStatus.java b/src/main/java/com/dispose/common/ObjectStatus.java index 73d47f9a..34e8563f 100644 --- a/src/main/java/com/dispose/common/ObjectStatus.java +++ b/src/main/java/com/dispose/common/ObjectStatus.java @@ -49,7 +49,7 @@ public enum ObjectStatus implements BaseEnum { * @return the code */ @Override - public Integer getCode() { + public Integer getValue() { return this.code; } @@ -59,7 +59,7 @@ public enum ObjectStatus implements BaseEnum { * @return the readme */ @Override - public String getReadme() { + public String getDescription() { return this.readme; } } diff --git a/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java index 5af83ec7..5ca791df 100644 --- a/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java +++ b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java @@ -1,9 +1,13 @@ package com.dispose.controller; +import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.base.BaseRespStatus; import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.pojo.dto.protocol.device.manager.AddDeviceReq; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; +import com.dispose.service.DisposeDeviceManagerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -15,6 +19,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + /** * The type Dispose device manager controller. * @@ -27,6 +35,10 @@ import org.springframework.web.bind.annotation.ResponseBody; @Component @Validated public class DisposeDeviceManagerController { + + @Resource + private DisposeDeviceManagerService disposeDeviceManagerService; + /** * Add dispose device protocol resp dto. * @@ -39,6 +51,32 @@ public class DisposeDeviceManagerController { public ProtocolRespDTO addDisposeDevice( @Validated @RequestBody ProtocolReqDTO mr) { - return null; + + List devs = new ArrayList<>(); + + mr.getMsgContent().getItems().forEach(v -> { + DisposeDevice dev = DisposeDevice.builder() + .ipAddr(v.getIpAddr()) + .ipPort(v.getIpPort()) + .deviceType(v.getDeviceType()) + .areaCode(v.getAreaCode()) + .deviceName(v.getDeviceName()) + .manufacturer(v.getManufacturer()) + .model(v.getModel()) + .version(v.getVersion()) + .userName(v.getUserName()) + .password(v.getPassword()) + .urlPath(v.getUrlPath()) + .urlType(v.getUrlType()) + .readme(v.getReadme()) + .build(); + devs.add(dev); + }); + + List> ret = disposeDeviceManagerService.addDisposeDevice(devs); + + + + return ProtocolRespDTO.result(ErrorCode.ERR_OK); } } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/base/BaseIdResp.java b/src/main/java/com/dispose/pojo/dto/protocol/base/BaseIdResp.java new file mode 100644 index 00000000..10f16914 --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/base/BaseIdResp.java @@ -0,0 +1,30 @@ +package com.dispose.pojo.dto.protocol.base; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * The type Base id resp. + * + * @author + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonPropertyOrder({"id", "devId", "status", "message"}) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BaseIdResp extends BaseRespStatus { + /** + * The Id. + */ + private String id; + /** + * The Dev id. + */ + private String devId; +} diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java new file mode 100644 index 00000000..c03c2974 --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java @@ -0,0 +1,39 @@ +package com.dispose.pojo.dto.protocol.device.manager; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * The type Add capacity info. + * + * @author + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AddCapacityInfo { + /** + * The Capacity type. + */ + private Integer capacityType; + + /** + * The Object type. + */ + private Integer objectType; + + /** + * The Ip type. + */ + private Integer ipType; + + /** + * The Protect ip. + */ + private String protectIp; +} diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java index 83c2ee6b..2324d2b2 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java @@ -8,9 +8,16 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.List; +/** + * The type Add device info. + * + * @author + */ @Data @Builder @NoArgsConstructor @@ -84,4 +91,11 @@ public class AddDeviceInfo { * The Readme. */ private String readme; + + /** + * The Capacity. + */ + @NotNull(message = "capacity 处置设备能力不能为空") + @Valid + private List capacity; } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java index 9a000814..05fa171f 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java @@ -6,6 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; @@ -24,5 +25,6 @@ public class AddDeviceReq { * The Items. */ @NotNull(message = "items 设备列表不能为空") + @Valid private List items; } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceRsp.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceRsp.java new file mode 100644 index 00000000..d6d9680f --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceRsp.java @@ -0,0 +1,33 @@ +package com.dispose.pojo.dto.protocol.device.manager; + +import com.dispose.pojo.dto.protocol.base.BaseIdResp; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +/** + * The type Add device rsp. + * + * @author + */ +@EqualsAndHashCode(callSuper = true) +@Data +@JsonPropertyOrder({"ipAddr", "ipPort", "devId", "status", "message"}) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AddDeviceRsp extends BaseIdResp { + /** + * The Items. + */ + private List items; + + /** + * Instantiates a new Add device rsp. + */ + public AddDeviceRsp() { + this.items = new ArrayList<>(); + } +} diff --git a/src/main/java/com/dispose/service/DisposeDeviceManagerService.java b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java index 802c4e35..ec034ea4 100644 --- a/src/main/java/com/dispose/service/DisposeDeviceManagerService.java +++ b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java @@ -1,9 +1,16 @@ package com.dispose.service; +import com.dispose.common.ErrorCode; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; + +import java.util.List; + /** * The interface Dispose device manager service. * * @author */ public interface DisposeDeviceManagerService { + List> addDisposeDevice(List devs); } diff --git a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java index 06c7128d..0f25d86d 100644 --- a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java @@ -1,15 +1,51 @@ package com.dispose.service.impl; +import com.dispose.common.ErrorCode; +import com.dispose.manager.DisposeDeviceManager; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; import com.dispose.service.DisposeDeviceManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + /** - * The type Dispose device manager. + * The type Dispose device manager service. * * @author */ @Service @Slf4j public class DisposeDeviceManagerServiceImpl implements DisposeDeviceManagerService { + + /** + * The Dispose device manager. + */ + @Resource + private DisposeDeviceManager disposeDeviceManager; + + /** + * Add dispose device list. + * + * @param devs the devs + * @return the list + */ + @Override + public List> addDisposeDevice(List devs) { + List> rspList = new ArrayList<>(); + + devs.forEach(v -> { + MulReturnType ret = disposeDeviceManager.addDisposeDevice(v); + + v.setId(ret.getSecondParam()); + rspList.add(new MulReturnType<>(ret.getFirstParam(), v)); + }); + + //AddDeviceRsp rspInfo = AddDeviceRsp.b + + return rspList; + } } diff --git a/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java index 08424c54..ea19d663 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java @@ -114,7 +114,7 @@ public class DisposeCapacityMapperTest { log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); items = disposeCapacityMapper.delDisposeCapacity(capList.get(0).getDeviceId(), - capList.get(0).getCapacityType().getCode()); + capList.get(0).getCapacityType().getValue()); Assert.assertEquals(items, 2);