From f616a50a5a6c699d3304eeccb2534a7dc4d8ca53 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Thu, 30 Jul 2020 20:11:18 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=BD=AC=E6=8D=A2=202.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86mapper=203.=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86manager=204.=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86service?= =?UTF-8?q?=205.=20=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=206.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E3=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-local.properties | 3 +- .../java/com/dispose/common/BaseEnum.java | 4 +- .../com/dispose/common/CommonEnumHandler.java | 6 +- .../dispose/common/DisposeCapacityType.java | 8 +- .../com/dispose/common/DisposeDeviceType.java | 6 +- .../com/dispose/common/DisposeObjectType.java | 23 ++- .../java/com/dispose/common/ErrorCode.java | 10 ++ .../java/com/dispose/common/HttpType.java | 7 +- .../java/com/dispose/common/IpAddrType.java | 21 ++- .../java/com/dispose/common/ObjectStatus.java | 20 +-- .../DisposeDeviceManagerController.java | 44 ++++++ .../dispose/manager/DisposeDeviceManager.java | 44 ++++++ .../impl/DisposeDeviceManagerImpl.java | 144 ++++++++++++++++++ .../dispose/mapper/DisposeCapacityMapper.java | 13 +- .../dispose/mapper/DisposeDeviceMapper.java | 45 ++++-- .../com/dispose/mapper/UserAccountMapper.java | 17 ++- .../device/manager/AddDeviceInfo.java | 87 +++++++++++ .../protocol/device/manager/AddDeviceReq.java | 28 ++++ .../dispose/pojo/entity/DisposeCapacity.java | 9 +- .../dispose/pojo/entity/DisposeDevice.java | 11 +- .../com/dispose/pojo/entity/UserAccount.java | 3 +- .../service/DisposeDeviceManagerService.java | 9 ++ .../impl/DisposeDeviceManagerServiceImpl.java | 15 ++ .../service/impl/UserAccountServiceImpl.java | 2 +- .../resources/mappers/DisposeCapacity.xml | 13 ++ src/main/resources/mappers/DisposeDevice.xml | 66 ++++++-- src/main/resources/mappers/UserAccount.xml | 27 +++- .../test/controller/AuthControllerTest.java | 4 +- .../manager/DisposeDeviceManagerTest.java | 38 +++++ .../test/manager/UserAccountManagerTest.java | 18 +-- .../mapper/DisposeCapacityMapperTest.java | 58 +++---- .../test/mapper/DisposeDeviceMapperTest.java | 40 ++++- .../test/mapper/UserAccountMapperTest.java | 32 ++-- 33 files changed, 736 insertions(+), 139 deletions(-) create mode 100644 src/main/java/com/dispose/controller/DisposeDeviceManagerController.java create mode 100644 src/main/java/com/dispose/manager/DisposeDeviceManager.java create mode 100644 src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java create mode 100644 src/main/java/com/dispose/service/DisposeDeviceManagerService.java create mode 100644 src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java create mode 100644 src/test/java/com/dispose/test/manager/DisposeDeviceManagerTest.java diff --git a/config/application-local.properties b/config/application-local.properties index 1fc1a3cd..4bc7d67c 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -8,7 +8,7 @@ spring.datasource.url=jdbc:mysql://cloud.xajhuang.com:3306/dispose?serverTimezon =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=xajhuang -spring.datasource.password=eHkGjtTnkFSDHHA7 +spring.datasource.password=skhXSizrhfkhezy5 # 配置连接池 spring.datasource.type=org.apache.commons.dbcp2.BasicDataSource spring.datasource.dbcp2.max-total=128 @@ -24,6 +24,7 @@ spring.datasource.dbcp2.connection-properties=characterEncoding=utf8 #mybatis.configuration.map-underscore-to-camel-case: true mybatis.mapper-locations=classpath*:mappers/*.xml mybatis.type-aliases-package=com.dispose.pojo.entity +mybatis.configuration.default-enum-type-handler=com.dispose.common.CommonEnumHandler #config log logging.config=file:config/logback.xml #config tomcat diff --git a/src/main/java/com/dispose/common/BaseEnum.java b/src/main/java/com/dispose/common/BaseEnum.java index 551ba642..7cf2daa9 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 getValue(); + Integer getCode(); /** * Gets description. * * @return the description */ - String getDescription(); + String getReadme(); } diff --git a/src/main/java/com/dispose/common/CommonEnumHandler.java b/src/main/java/com/dispose/common/CommonEnumHandler.java index 5795f837..526be692 100644 --- a/src/main/java/com/dispose/common/CommonEnumHandler.java +++ b/src/main/java/com/dispose/common/CommonEnumHandler.java @@ -24,7 +24,7 @@ public final class CommonEnumHandler extends BaseTypeHandler /** * The Enums. */ - private List enums; + private final List enums; /** * Instantiates a new Common enum handler. @@ -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.getValue()); + preparedStatement.setInt(i, e.getCode()); } /** @@ -116,7 +116,7 @@ public final class CommonEnumHandler extends BaseTypeHandler */ private E locateEnumStatus(int index) { for (E e : enums) { - if (e.getValue() == index) { + if (e.getCode() == index) { return e; } } diff --git a/src/main/java/com/dispose/common/DisposeCapacityType.java b/src/main/java/com/dispose/common/DisposeCapacityType.java index 62ed664c..8c44cbc3 100644 --- a/src/main/java/com/dispose/common/DisposeCapacityType.java +++ b/src/main/java/com/dispose/common/DisposeCapacityType.java @@ -5,7 +5,7 @@ package com.dispose.common; * * @author */ -public enum DisposeCapacityType { +public enum DisposeCapacityType implements BaseEnum { /** * The Cleanup. */ @@ -31,7 +31,7 @@ public enum DisposeCapacityType { /** * The Code. */ - private final int code; + private final Integer code; /** * The Readme. */ @@ -53,7 +53,8 @@ public enum DisposeCapacityType { * * @return the code */ - public int getCode() { + @Override + public Integer getCode() { return this.code; } @@ -62,6 +63,7 @@ public enum DisposeCapacityType { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/common/DisposeDeviceType.java b/src/main/java/com/dispose/common/DisposeDeviceType.java index bc3f990e..0a78dd1a 100644 --- a/src/main/java/com/dispose/common/DisposeDeviceType.java +++ b/src/main/java/com/dispose/common/DisposeDeviceType.java @@ -5,7 +5,7 @@ package com.dispose.common; * * @author */ -public enum DisposeDeviceType { +public enum DisposeDeviceType implements BaseEnum { /** * Dptech umc dispose device type. */ @@ -33,7 +33,8 @@ public enum DisposeDeviceType { * * @return the code */ - public int getCode() { + @Override + public Integer getCode() { return this.code; } @@ -42,6 +43,7 @@ public enum DisposeDeviceType { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/common/DisposeObjectType.java b/src/main/java/com/dispose/common/DisposeObjectType.java index 8a4172d9..3d85ef9e 100644 --- a/src/main/java/com/dispose/common/DisposeObjectType.java +++ b/src/main/java/com/dispose/common/DisposeObjectType.java @@ -5,7 +5,7 @@ package com.dispose.common; * * @author */ -public enum DisposeObjectType { +public enum DisposeObjectType implements BaseEnum { /** * The Ip. */ @@ -15,15 +15,30 @@ public enum DisposeObjectType { */ DOMAIN(1 << 1, "域名"), + /** + * Ip domain dispose object type. + */ + IP_DOMAIN((1 << 1 | 1), "IP地址和域名"), + + /** + * Ip domain url dispose object type. + */ + IP_DOMAIN_URL((1 << 2 | 1 << 1 | 1), "IP地址,域名,URL"), + + /** + * Domain url dispose object type. + */ + DOMAIN_URL((1 << 2 | 1 << 1), "域名和URL"), /** * The Url. */ URL(1 << 2, "URL"); + /** * The Code. */ - private final int code; + private final Integer code; /** * The Readme. */ @@ -45,7 +60,8 @@ public enum DisposeObjectType { * * @return the code */ - public int getCode() { + @Override + public Integer getCode() { return this.code; } @@ -54,6 +70,7 @@ public enum DisposeObjectType { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/common/ErrorCode.java b/src/main/java/com/dispose/common/ErrorCode.java index 6239519c..da4c1d5b 100644 --- a/src/main/java/com/dispose/common/ErrorCode.java +++ b/src/main/java/com/dispose/common/ErrorCode.java @@ -94,6 +94,11 @@ public enum ErrorCode { * The Err paramexception. */ ERR_PARAMEXCEPTION(21, "参数异常"), + + /** + * The Err devicelocked. + */ + ERR_DEVICELOCKED(22, "设备已锁定"), /** * The Err version. */ @@ -151,6 +156,11 @@ public enum ErrorCode { * The Err haohan error. */ ERR_HAOHAN_ERROR(34, "浩瀚设备返回错误"), + + /** + * Err database error code. + */ + ERR_DATABASE(35, "操作数据库失败"), ; /** diff --git a/src/main/java/com/dispose/common/HttpType.java b/src/main/java/com/dispose/common/HttpType.java index 227941fb..e4a08dab 100644 --- a/src/main/java/com/dispose/common/HttpType.java +++ b/src/main/java/com/dispose/common/HttpType.java @@ -5,7 +5,7 @@ package com.dispose.common; * * @author */ -public enum HttpType { +public enum HttpType implements BaseEnum { /** * Http http type. @@ -19,7 +19,7 @@ public enum HttpType { /** * The Code. */ - private final int code; + private final Integer code; /** * The Readme. */ @@ -41,7 +41,7 @@ public enum HttpType { * * @return the code */ - public int getCode() { + public Integer getCode() { return this.code; } @@ -50,6 +50,7 @@ public enum HttpType { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/common/IpAddrType.java b/src/main/java/com/dispose/common/IpAddrType.java index c6ebb5f2..7bef0685 100644 --- a/src/main/java/com/dispose/common/IpAddrType.java +++ b/src/main/java/com/dispose/common/IpAddrType.java @@ -5,20 +5,25 @@ package com.dispose.common; * * @author */ -public enum IpAddrType { +public enum IpAddrType implements BaseEnum { /** - * Ip v 4 ip addr type. + * The Ipv 4. */ - IPV4(1, "禁用"), + IPV4(1, "IPv4"), /** - * Ip v 6 ip addr type. + * The Ipv 6. */ - IPV6(1 << 1, "禁用"); + IPV6(1 << 1, "IPv6"), + + /** + * Ipv 4 ipv 6 ip addr type. + */ + IPV4_IPV6((1 << 1 | 1), "IPv4与IPv6"); /** * The Code. */ - private final int code; + private final Integer code; /** * The Readme. */ @@ -40,7 +45,8 @@ public enum IpAddrType { * * @return the code */ - public int getCode() { + @Override + public Integer getCode() { return this.code; } @@ -49,6 +55,7 @@ public enum IpAddrType { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/common/ObjectStatus.java b/src/main/java/com/dispose/common/ObjectStatus.java index 4a9dcc1a..73d47f9a 100644 --- a/src/main/java/com/dispose/common/ObjectStatus.java +++ b/src/main/java/com/dispose/common/ObjectStatus.java @@ -1,39 +1,39 @@ package com.dispose.common; /** - * The enum User account status. + * The enum Object status. * * @author */ -public enum ObjectStatus { +public enum ObjectStatus implements BaseEnum { /** - * Normal user account status. + * The Normal. */ NORMAL(0, "正常"), /** - * Locked user account status. + * The Locked. */ LOCKED(1, "锁定"), /** - * Disabled user account status. + * The Disabled. */ DISABLED(2, "禁用"), /** - * Deleted user account status. + * The Deleted. */ DELETED(3, "删除"); /** * The Code. */ - private final int code; + private final Integer code; /** * The Readme. */ private final String readme; /** - * Instantiates a new User account status. + * Instantiates a new Object status. * * @param code the code * @param readme the readme @@ -48,7 +48,8 @@ public enum ObjectStatus { * * @return the code */ - public int getCode() { + @Override + public Integer getCode() { return this.code; } @@ -57,6 +58,7 @@ public enum ObjectStatus { * * @return the readme */ + @Override public String getReadme() { return this.readme; } diff --git a/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java new file mode 100644 index 00000000..5af83ec7 --- /dev/null +++ b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java @@ -0,0 +1,44 @@ +package com.dispose.controller; + +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * The type Dispose device manager controller. + * + * @author + */ +@Controller +@RequestMapping(value = "/manager") +@Slf4j +@Api(value = "处置平台设备管理接口", tags = "处置平台设备管理接口") +@Component +@Validated +public class DisposeDeviceManagerController { + /** + * Add dispose device protocol resp dto. + * + * @param mr the mr + * @return the protocol resp dto + */ + @PutMapping("/device") + @ResponseBody + @ApiOperation("添加处置能力节点") + public ProtocolRespDTO addDisposeDevice( + @Validated + @RequestBody ProtocolReqDTO mr) { + return null; + } +} diff --git a/src/main/java/com/dispose/manager/DisposeDeviceManager.java b/src/main/java/com/dispose/manager/DisposeDeviceManager.java new file mode 100644 index 00000000..6dafd1ed --- /dev/null +++ b/src/main/java/com/dispose/manager/DisposeDeviceManager.java @@ -0,0 +1,44 @@ +package com.dispose.manager; + +import com.dispose.common.ErrorCode; +import com.dispose.common.ObjectStatus; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; + +import java.lang.reflect.InvocationTargetException; + +/** + * The interface Dispose device manager. + * + * @author + */ +public interface DisposeDeviceManager { + /** + * Add dispose device mul return type. + * + * @param dev the dev + * @return the mul return type + */ + MulReturnType addDisposeDevice(DisposeDevice dev); + + /** + * Upgrade dispose device error code. + * + * @param dev the dev + * @return the error code + * @throws IllegalAccessException the illegal access exception + * @throws NoSuchMethodException the no such method exception + * @throws InvocationTargetException the invocation target exception + */ + ErrorCode upgradeDisposeDevice(DisposeDevice dev) throws IllegalAccessException, NoSuchMethodException, + InvocationTargetException; + + /** + * Change dispose device status mul return type. + * + * @param id the id + * @param status the status + * @return the mul return type + */ + MulReturnType changeDisposeDeviceStatus(Long id, ObjectStatus status); +} diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java new file mode 100644 index 00000000..0380c050 --- /dev/null +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -0,0 +1,144 @@ +package com.dispose.manager.impl; + +import com.dispose.common.ErrorCode; +import com.dispose.common.ObjectStatus; +import com.dispose.manager.DisposeDeviceManager; +import com.dispose.mapper.DisposeCapacityMapper; +import com.dispose.mapper.DisposeDeviceMapper; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.PropertyUtils; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.lang.reflect.InvocationTargetException; +import java.util.concurrent.ConcurrentHashMap; + +/** + * The type Dispose device manager. + * + * @author + */ +@Component +@Slf4j +public class DisposeDeviceManagerImpl implements DisposeDeviceManager { + + /** + * The Dispose device. + */ + private final ConcurrentHashMap disposeDevice = new ConcurrentHashMap<>(); + /** + * The Dispose capacity mapper. + */ + @Resource + DisposeCapacityMapper disposeCapacityMapper; + /** + * The Dispose device mapper. + */ + @Resource + private DisposeDeviceMapper disposeDeviceMapper; + + /** + * Add dispose device mul return type. + * + * @param dev the dev + * @return the mul return type + */ + @Override + public MulReturnType addDisposeDevice(DisposeDevice dev) { + // 看看系统中有没有存在相同IP+端口地址的设备，有的话返回失败 + DisposeDevice tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), dev.getIpPort()); + + if (tDev != null) { + return new MulReturnType<>(ErrorCode.ERR_DEVICEEXISTS, tDev.getId()); + } + + // 添加设备到数据库 + if (disposeDeviceMapper.addNewDisposeDevice(dev) != 1 || dev.getId() == null) { + return new MulReturnType<>(ErrorCode.ERR_DATABASE, -1L); + } else { + // 添加设备到缓存中，方便调用时查找 + String devKey = dev.getDeviceName() + ":" + dev.getIpPort(); + disposeDevice.put(devKey, dev); + // 添加设备能力信息 + disposeCapacityMapper.addNewDisposeCapacity(dev.getDevCapacity()); + return new MulReturnType<>(ErrorCode.ERR_OK, dev.getId()); + } + } + + /** + * Upgrade dispose device error code. + * + * @param dev the dev + * @return the error code + */ + @Override + public ErrorCode upgradeDisposeDevice(DisposeDevice dev) throws IllegalAccessException, NoSuchMethodException, + InvocationTargetException { + DisposeDevice tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), dev.getIpPort()); + + if (tDev == null) { + return ErrorCode.ERR_NOSUCHDEVICE; + } + + // 保存设备ID + Long devId = tDev.getId(); + + // 更新值 + PropertyUtils.copyProperties(tDev, dev); + tDev.setId(devId); + + // 更新设备数据库 + disposeDeviceMapper.upgradeDisposeDevice(tDev); + + // 清楚能力数据库中旧的能力信息 + disposeCapacityMapper.delDeviceDisposeCapacity(devId); + // 新增能力信息完成更新 + disposeCapacityMapper.addNewDisposeCapacity(tDev.getDevCapacity()); + + return ErrorCode.ERR_OK; + } + + /** + * Change dispose device status mul return type. + * + * @param id the id + * @param status the status + * @return the mul return type + */ + @Override + public MulReturnType changeDisposeDeviceStatus(Long id, ObjectStatus status) { + int ret; + // 通过设备ID获取设备 + DisposeDevice dev = disposeDeviceMapper.getDeviceById(id); + + if (dev == null) { + return new MulReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, ObjectStatus.NORMAL); + } else { + switch (status) { + // 恢复设备到可用状态 + case NORMAL: + ret = disposeDeviceMapper.availableDisposeDevice(id); + break; + // 删除设备 + case DELETED: + ret = disposeDeviceMapper.delDisposeDevice(id); + break; + // 禁用设备 + case DISABLED: + ret = disposeDeviceMapper.disableDisposeDevice(id); + break; + default: + return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, ObjectStatus.NORMAL); + } + + // 数据库操作失败 + if (ret != 1) { + return new MulReturnType<>(ErrorCode.ERR_DATABASE, dev.getStatus()); + } else { + return new MulReturnType<>(ErrorCode.ERR_OK, dev.getStatus()); + } + } + } +} diff --git a/src/main/java/com/dispose/mapper/DisposeCapacityMapper.java b/src/main/java/com/dispose/mapper/DisposeCapacityMapper.java index cd190cac..b5146ac4 100644 --- a/src/main/java/com/dispose/mapper/DisposeCapacityMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeCapacityMapper.java @@ -2,9 +2,6 @@ package com.dispose.mapper; import com.dispose.pojo.entity.DisposeCapacity; import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.IdsMapper; -import tk.mybatis.mapper.common.Mapper; -import tk.mybatis.mapper.common.MySqlMapper; import java.util.List; @@ -13,8 +10,14 @@ import java.util.List; * * @author */ -public interface DisposeCapacityMapper extends Mapper, - IdsMapper, MySqlMapper { +public interface DisposeCapacityMapper { + + /** + * Select all list. + * + * @return the list + */ + List selectAll(); /** * Add new dispose capacity int. diff --git a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java index 62e53efb..d33ea4af 100644 --- a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java @@ -2,17 +2,22 @@ package com.dispose.mapper; import com.dispose.pojo.entity.DisposeDevice; import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.IdsMapper; -import tk.mybatis.mapper.common.Mapper; -import tk.mybatis.mapper.common.MySqlMapper; + +import java.util.List; /** * The interface Dispose device mapper. * * @author */ -public interface DisposeDeviceMapper extends Mapper, - IdsMapper, MySqlMapper { +public interface DisposeDeviceMapper { + + /** + * Select all list. + * + * @return the list + */ + List selectAll(); /** * Add new dispose device int. @@ -22,6 +27,14 @@ public interface DisposeDeviceMapper extends Mapper, */ int addNewDisposeDevice(DisposeDevice dev); + /** + * Upgrade dispose device int. + * + * @param dev the dev + * @return the int + */ + int upgradeDisposeDevice(DisposeDevice dev); + /** * Del dispose device int. @@ -40,18 +53,30 @@ public interface DisposeDeviceMapper extends Mapper, int disableDisposeDevice(@Param("id") Long id); /** - * Lock dispose device int. + * Available dispose device int. * * @param id the id * @return the int */ - int lockDisposeDevice(@Param("id") Long id); + int availableDisposeDevice(@Param("id") Long id); /** - * Unlock dispose device int. + * Gets device by address. + * + * @param ipAddr the ip addr + * @param ipPort the ip port + * @return the device by address + */ + DisposeDevice getDeviceByAddress(@Param("ipAddr") String ipAddr, + @Param("ipPort") String ipPort); + + + /** + * Gets device by id. * * @param id the id - * @return the int + * @return the device by id */ - int unlockDisposeDevice(@Param("id") Long id); + DisposeDevice getDeviceById(@Param("id") Long id); + } diff --git a/src/main/java/com/dispose/mapper/UserAccountMapper.java b/src/main/java/com/dispose/mapper/UserAccountMapper.java index d1615fb8..de6ceabf 100644 --- a/src/main/java/com/dispose/mapper/UserAccountMapper.java +++ b/src/main/java/com/dispose/mapper/UserAccountMapper.java @@ -2,17 +2,22 @@ package com.dispose.mapper; import com.dispose.pojo.entity.UserAccount; import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.IdsMapper; -import tk.mybatis.mapper.common.Mapper; -import tk.mybatis.mapper.common.MySqlMapper; + +import java.util.List; /** * The interface User account mapper. * * @author */ -public interface UserAccountMapper extends Mapper, - IdsMapper, MySqlMapper { +public interface UserAccountMapper { + + /** + * Select all list. + * + * @return the list + */ + List selectAll(); /** * Add user account user account. @@ -75,7 +80,7 @@ public interface UserAccountMapper extends Mapper, void unlockUserAccount(@Param("username") String username); /** - * Upgrade login time string. + * Upgrade login time. * * @param username the username */ 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 new file mode 100644 index 00000000..83c2ee6b --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java @@ -0,0 +1,87 @@ +package com.dispose.pojo.dto.protocol.device.manager; + +import com.dispose.common.DisposeDeviceType; +import com.dispose.common.HttpType; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AddDeviceInfo { + /** + * The Ip addr. + */ + @NotBlank(message = "ipAddr IP地址不能为空") + private String ipAddr; + + /** + * The Ip port. + */ + @NotNull(message = "ipPort 端口不能为null, 默认端口用空字符串表示") + private String ipPort; + + /** + * The Device type. + */ + private DisposeDeviceType deviceType; + + /** + * The Area code. + */ + private Integer areaCode; + + /** + * The Device name. + */ + private String deviceName; + + /** + * The Manufacturer. + */ + private String manufacturer; + + /** + * The Model. + */ + private String model; + + /** + * The Version. + */ + private String version; + + /** + * The User name. + */ + private String userName; + + /** + * The Password. + */ + private String password; + + /** + * The Url path. + */ + @NotBlank(message = "urlPath URL接口路径不能为空") + private String urlPath; + + /** + * The Url type. + */ + private HttpType urlType; + + /** + * The Readme. + */ + private String readme; +} 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 new file mode 100644 index 00000000..9a000814 --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java @@ -0,0 +1,28 @@ +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; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * The type Add device req. + * + * @author + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AddDeviceReq { + /** + * The Items. + */ + @NotNull(message = "items 设备列表不能为空") + private List items; +} diff --git a/src/main/java/com/dispose/pojo/entity/DisposeCapacity.java b/src/main/java/com/dispose/pojo/entity/DisposeCapacity.java index 607d1c17..7b544504 100644 --- a/src/main/java/com/dispose/pojo/entity/DisposeCapacity.java +++ b/src/main/java/com/dispose/pojo/entity/DisposeCapacity.java @@ -1,5 +1,8 @@ package com.dispose.pojo.entity; +import com.dispose.common.DisposeCapacityType; +import com.dispose.common.DisposeObjectType; +import com.dispose.common.IpAddrType; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Builder; @@ -50,17 +53,17 @@ public class DisposeCapacity { /** * The Capacity type. */ - private Integer capacityType; + private DisposeCapacityType capacityType; /** * The Object type. */ - private Integer objectType; + private DisposeObjectType objectType; /** * The Ip type. */ - private Integer ipType; + private IpAddrType ipType; /** * The Protect ip. diff --git a/src/main/java/com/dispose/pojo/entity/DisposeDevice.java b/src/main/java/com/dispose/pojo/entity/DisposeDevice.java index b3145587..804a24fa 100644 --- a/src/main/java/com/dispose/pojo/entity/DisposeDevice.java +++ b/src/main/java/com/dispose/pojo/entity/DisposeDevice.java @@ -1,6 +1,10 @@ package com.dispose.pojo.entity; +import com.dispose.common.DisposeDeviceType; +import com.dispose.common.HttpType; +import com.dispose.common.ObjectStatus; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -29,6 +33,7 @@ import java.util.List; @AllArgsConstructor @Builder @JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder(alphabetic=true) @Table(name = "dispose_device") @NameStyle(Style.normal) public class DisposeDevice implements Serializable { @@ -57,7 +62,7 @@ public class DisposeDevice implements Serializable { /** * The Device type. */ - private Integer deviceType; + private DisposeDeviceType deviceType; /** * The Area code. @@ -102,7 +107,7 @@ public class DisposeDevice implements Serializable { /** * The Url type. */ - private Integer urlType; + private HttpType urlType; /** * The Readme. @@ -112,7 +117,7 @@ public class DisposeDevice implements Serializable { /** * The Status. */ - private Integer status; + private ObjectStatus status; /** * The Dev capacity. diff --git a/src/main/java/com/dispose/pojo/entity/UserAccount.java b/src/main/java/com/dispose/pojo/entity/UserAccount.java index 5f8a225e..4470986b 100644 --- a/src/main/java/com/dispose/pojo/entity/UserAccount.java +++ b/src/main/java/com/dispose/pojo/entity/UserAccount.java @@ -1,5 +1,6 @@ package com.dispose.pojo.entity; +import com.dispose.common.ObjectStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -89,5 +90,5 @@ public class UserAccount implements Serializable { /** * The Status. */ - private Integer status; + private ObjectStatus status; } diff --git a/src/main/java/com/dispose/service/DisposeDeviceManagerService.java b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java new file mode 100644 index 00000000..802c4e35 --- /dev/null +++ b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java @@ -0,0 +1,9 @@ +package com.dispose.service; + +/** + * The interface Dispose device manager service. + * + * @author + */ +public interface DisposeDeviceManagerService { +} diff --git a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java new file mode 100644 index 00000000..06c7128d --- /dev/null +++ b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java @@ -0,0 +1,15 @@ +package com.dispose.service.impl; + +import com.dispose.service.DisposeDeviceManagerService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * The type Dispose device manager. + * + * @author + */ +@Service +@Slf4j +public class DisposeDeviceManagerServiceImpl implements DisposeDeviceManagerService { +} diff --git a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java index 64b07ebc..5be9c750 100644 --- a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java @@ -71,7 +71,7 @@ public class UserAccountServiceImpl implements UserAccountService { } // 用户是否被锁定 - if (loginUser.getStatus() == ObjectStatus.LOCKED.getCode()) { + if (loginUser.getStatus() == ObjectStatus.LOCKED) { log.error("User {} is locked", username); return MulReturnType.builder().firstParam(ErrorCode.ERR_USERLOCK).build(); } diff --git a/src/main/resources/mappers/DisposeCapacity.xml b/src/main/resources/mappers/DisposeCapacity.xml index 22e3f87b..864a7042 100644 --- a/src/main/resources/mappers/DisposeCapacity.xml +++ b/src/main/resources/mappers/DisposeCapacity.xml @@ -1,6 +1,19 @@ + + + + + + + + + + INSERT IGNORE INTO dispose_capacity(deviceId, capacityType, objectType, ipType, protectIp) diff --git a/src/main/resources/mappers/DisposeDevice.xml b/src/main/resources/mappers/DisposeDevice.xml index 17c75666..857a658a 100644 --- a/src/main/resources/mappers/DisposeDevice.xml +++ b/src/main/resources/mappers/DisposeDevice.xml @@ -5,7 +5,7 @@ - + @@ -14,19 +14,43 @@ - + - + - - - + + + + + + + + + INSERT IGNORE INTO dispose_device(ipAddr, ipPort, deviceType, @@ -44,6 +68,25 @@ WHERE id = #{id} + + UPDATE dispose_device + SET ipAddr = #{ipAddr}, + ipPort = #{ipPort}, + deviceType = #{deviceType}, + areaCode = #{areaCode}, + deviceName = #{deviceName}, + manufacturer = #{manufacturer}, + model = #{model}, + version = #{version}, + userName = #{userName}, + password = #{password}, + urlPath = #{urlPath}, + urlType = #{urlType}, + readme = #{readme}, + status = #{status} + WHERE id = #{id} + + UPDATE dispose_device @@ -51,14 +94,9 @@ WHERE id = #{id} - - UPDATE dispose_device - SET status = ${@com.dispose.common.ObjectStatus@LOCKED.getCode()} - WHERE id = #{id} - - - - UPDATE dispose_device + + UPDATE + dispose_device SET status = ${@com.dispose.common.ObjectStatus@NORMAL.getCode()} WHERE id = #{id} diff --git a/src/main/resources/mappers/UserAccount.xml b/src/main/resources/mappers/UserAccount.xml index e84526ac..9e65c49e 100644 --- a/src/main/resources/mappers/UserAccount.xml +++ b/src/main/resources/mappers/UserAccount.xml @@ -1,8 +1,27 @@ - - + SELECT * + FROM user_account + + + - SELECT * FROM user_account WHERE username = #{username, jdbcType=VARCHAR} - SELECT * FROM user_account WHERE token = #{token} diff --git a/src/test/java/com/dispose/test/controller/AuthControllerTest.java b/src/test/java/com/dispose/test/controller/AuthControllerTest.java index b02d5385..e89955d4 100644 --- a/src/test/java/com/dispose/test/controller/AuthControllerTest.java +++ b/src/test/java/com/dispose/test/controller/AuthControllerTest.java @@ -90,7 +90,7 @@ public class AuthControllerTest extends InitTestEnvironment { verifyRespProtocol(rspInfo); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo)); Assert.assertEquals(getLoginToken(), rspInfo.getMsgContent().getToken()); Assert.assertEquals(getUSER_NAME(), rspInfo.getMsgContent().getUserName()); @@ -131,7 +131,7 @@ public class AuthControllerTest extends InitTestEnvironment { verifyRespProtocol(rspInfo); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo)); Assert.assertEquals(getUSER_NAME(), rspInfo.getMsgContent().getUserName()); Assert.assertEquals(ErrorCode.ERR_OK.getCode(), (long)rspInfo.getMsgContent().getStatus()); } diff --git a/src/test/java/com/dispose/test/manager/DisposeDeviceManagerTest.java b/src/test/java/com/dispose/test/manager/DisposeDeviceManagerTest.java new file mode 100644 index 00000000..702a79c4 --- /dev/null +++ b/src/test/java/com/dispose/test/manager/DisposeDeviceManagerTest.java @@ -0,0 +1,38 @@ +package com.dispose.test.manager; + +import com.dispose.common.DisposeDeviceType; +import com.dispose.common.HttpType; +import com.dispose.common.ObjectStatus; +import com.dispose.pojo.entity.DisposeDevice; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Test; + +import javax.annotation.Resource; + +public class DisposeDeviceManagerTest { + /** + * The Object mapper. + */ + @Resource + private ObjectMapper objectMapper; + + @Test + public void a1_addDisposeDevice() { + DisposeDevice dev = DisposeDevice.builder() + .ipAddr("10.88.77.15") + .ipPort("") + .deviceType(DisposeDeviceType.DPTECH_UMC) + .areaCode(0) + .deviceName("中移杭研实验室迪普清洗设备") + .manufacturer("DPTech") + .model("UMC") + .version("5.7.13") + .userName("admin") + .password("UMCAdministrator") + .urlPath("UMC/service/AbnormalFlowCleaningService") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) + .build(); + } +} diff --git a/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java b/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java index cfd3040f..6e5c8e4a 100644 --- a/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java +++ b/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java @@ -60,7 +60,7 @@ public class UserAccountManagerTest extends InitTestEnvironment { UserAccount user = userAccountManager.getUserByToken(token); Assert.assertEquals(user.getUsername(), v.getUsername()); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } catch (NoSuchAlgorithmException | JsonProcessingException e) { log.error(e.getMessage()); Assert.fail(); @@ -78,7 +78,7 @@ public class UserAccountManagerTest extends InitTestEnvironment { Assert.assertEquals(user.getStatus(), v.getStatus()); try { - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } catch (JsonProcessingException e) { e.printStackTrace(); Assert.fail(); @@ -93,7 +93,7 @@ public class UserAccountManagerTest extends InitTestEnvironment { String userToken = userAccountManager.getUserToken(v.getUsername()); String userToken2 = userAccountManager.getUserToken(v.getUsername()); Assert.assertEquals(userToken, userToken2); - log.info("{} token : [{}]", v.getUsername(), userToken); + log.debug("{} token : [{}]", v.getUsername(), userToken); } catch (NoSuchAlgorithmException e) { log.error(e.getMessage()); Assert.fail(); @@ -116,7 +116,7 @@ public class UserAccountManagerTest extends InitTestEnvironment { Assert.assertEquals(i, times); try { - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } catch (JsonProcessingException e) { e.printStackTrace(); Assert.fail(); @@ -139,7 +139,7 @@ public class UserAccountManagerTest extends InitTestEnvironment { Assert.assertEquals(ErrorCode.ERR_LOGOUT, userAccountManager.verifyToken(userToken)); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(v)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(v)); } catch (JsonProcessingException | NoSuchAlgorithmException e) { e.printStackTrace(); Assert.fail(); @@ -164,25 +164,25 @@ public class UserAccountManagerTest extends InitTestEnvironment { UserAccount user = userAccountMapper.getUserByName(v.getUsername()); Assert.assertNotNull(user); - Assert.assertEquals((long) user.getStatus(), ObjectStatus.LOCKED.getCode()); + Assert.assertEquals(user.getStatus(), ObjectStatus.LOCKED); userAccountManager.unlockUserAccount(v.getUsername()); user = userAccountMapper.getUserByName(v.getUsername()); Assert.assertNotNull(user); - Assert.assertEquals((long) user.getStatus(), ObjectStatus.NORMAL.getCode()); + Assert.assertEquals(user.getStatus(), ObjectStatus.NORMAL); userAccountManager.disableUserAccount(v.getUsername(), "admin"); user = userAccountMapper.getUserByName(v.getUsername()); Assert.assertNotNull(user); - Assert.assertEquals((long) user.getStatus(), ObjectStatus.DISABLED.getCode()); + Assert.assertEquals(user.getStatus(), ObjectStatus.DISABLED); userAccountManager.deleteUserAccount(v.getUsername(), "admin"); user = userAccountMapper.getUserByName(v.getUsername()); Assert.assertNotNull(user); - Assert.assertEquals((long) user.getStatus(), ObjectStatus.DELETED.getCode()); + Assert.assertEquals(user.getStatus(), ObjectStatus.DELETED); }); } diff --git a/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java index 0e475980..3d82cee4 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeCapacityMapperTest.java @@ -57,17 +57,17 @@ public class DisposeCapacityMapperTest { newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.CLEANUP.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.CLEANUP) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.BLOCKING.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.BLOCKING) + .objectType(DisposeObjectType.URL) .protectIp("") .build()); @@ -77,7 +77,7 @@ public class DisposeCapacityMapperTest { List capList = disposeCapacityMapper.selectAll(); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); } /** @@ -91,17 +91,17 @@ public class DisposeCapacityMapperTest { newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.CLEANUP.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.CLEANUP) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.BLOCKING.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.BLOCKING) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); @@ -111,10 +111,10 @@ public class DisposeCapacityMapperTest { List capList = disposeCapacityMapper.selectAll(); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); items = disposeCapacityMapper.delDisposeCapacity(capList.get(0).getDeviceId(), - capList.get(0).getCapacityType()); + capList.get(0).getCapacityType().getCode()); Assert.assertEquals(items, 1); @@ -122,7 +122,7 @@ public class DisposeCapacityMapperTest { Assert.assertEquals(capList.size(), 1); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); } @Test @@ -131,17 +131,17 @@ public class DisposeCapacityMapperTest { newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.CLEANUP.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.CLEANUP) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.BLOCKING.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.BLOCKING) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); @@ -159,17 +159,17 @@ public class DisposeCapacityMapperTest { newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.CLEANUP.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.CLEANUP) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); newCapList.add(DisposeCapacity.builder() .deviceId(1L) - .ipType(IpAddrType.IPV4.getCode() | IpAddrType.IPV6.getCode()) - .capacityType(DisposeCapacityType.BLOCKING.getCode()) - .objectType(DisposeObjectType.IP.getCode()) + .ipType(IpAddrType.IPV4_IPV6) + .capacityType(DisposeCapacityType.BLOCKING) + .objectType(DisposeObjectType.IP) .protectIp("") .build()); @@ -179,6 +179,6 @@ public class DisposeCapacityMapperTest { Assert.assertEquals(capList.size(), newCapList.size()); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(capList)); } } diff --git a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java index b48ae4b5..b87a7950 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java @@ -53,7 +53,7 @@ public class DisposeDeviceMapperTest { DisposeDevice dev = DisposeDevice.builder() .ipAddr("10.88.77.15") .ipPort("") - .deviceType(DisposeDeviceType.DPTECH_UMC.getCode()) + .deviceType(DisposeDeviceType.DPTECH_UMC) .areaCode(0) .deviceName("中移杭研实验室迪普清洗设备") .manufacturer("DPTech") @@ -62,9 +62,30 @@ public class DisposeDeviceMapperTest { .userName("admin") .password("UMCAdministrator") .urlPath("UMC/service/AbnormalFlowCleaningService") - .urlType(HttpType.HTTP.getCode()) + .urlType(HttpType.HTTP) .readme("实验室测试设备") - .status(ObjectStatus.NORMAL.getCode()) + .status(ObjectStatus.NORMAL) + .build(); + + Assert.assertEquals(1, disposeDeviceMapper.addNewDisposeDevice(dev)); + Assert.assertNotNull(dev.getId()); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(dev)); + + dev = DisposeDevice.builder() + .ipAddr("10.88.77.88") + .ipPort("18080") + .deviceType(DisposeDeviceType.HAOHAN_PLATFORM) + .areaCode(0) + .deviceName("中移杭研实验室浩瀚清洗设备") + .manufacturer("Haohan") + .model("Unknown") + .version("Unknown") + .userName("") + .password("") + .urlPath("DDoSClean/clean") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) .build(); Assert.assertEquals(1, disposeDeviceMapper.addNewDisposeDevice(dev)); @@ -75,4 +96,17 @@ public class DisposeDeviceMapperTest { List devList = disposeDeviceMapper.selectAll(); log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(devList)); } + + + @Test + public void d1_getDeviceByAddress() throws JsonProcessingException { + DisposeDevice dev = disposeDeviceMapper.getDeviceByAddress("10.88.77.15", ""); + Assert.assertNotNull(dev); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(dev)); + + dev = disposeDeviceMapper.getDeviceByAddress("10.88.77.15", "80"); + Assert.assertNull(dev); + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(dev)); + } + } diff --git a/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java b/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java index d063fa49..b26a1ccf 100644 --- a/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java @@ -54,7 +54,7 @@ public class UserAccountMapperTest { public void a1_getUserByName() throws JsonProcessingException { UserAccount user = userAccountMapper.getUserByName("admin"); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); Assert.assertNotNull(user); Assert.assertEquals(user.getUsername(), "admin"); @@ -70,13 +70,13 @@ public class UserAccountMapperTest { userAccountMapper.lockUserAccount("admin"); UserAccount user = userAccountMapper.getUserByName("admin"); - Assert.assertEquals(new Long(user.getStatus()), new Long(ObjectStatus.LOCKED.getCode())); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + Assert.assertEquals(user.getStatus(), ObjectStatus.LOCKED); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); userAccountMapper.unlockUserAccount("admin"); user = userAccountMapper.getUserByName("admin"); - Assert.assertEquals(new Long(user.getStatus()), new Long(ObjectStatus.NORMAL.getCode())); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + Assert.assertEquals(user.getStatus(), ObjectStatus.NORMAL); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } @@ -91,7 +91,7 @@ public class UserAccountMapperTest { UserAccount user = userAccountMapper.getUserByName("admin"); Assert.assertNotNull(user); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } /** @@ -106,7 +106,7 @@ public class UserAccountMapperTest { .forEach(v -> { UserAccount user = userAccountMapper.getUserByToken(v.getToken()); try { - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(v)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(v)); } catch (JsonProcessingException e) { e.printStackTrace(); } @@ -119,7 +119,7 @@ public class UserAccountMapperTest { public void a5_upgradeUserAccess() { String dt = userAccountMapper.upgradeLastAccessTime("admin"); - log.info("Upgrade datetime: {}", dt); + log.debug("Upgrade datetime: {}", dt); Assert.assertTrue(Helper.getTimestampDiffNow(dt) < 2); } @@ -130,8 +130,8 @@ public class UserAccountMapperTest { Assert.assertNotNull(add); UserAccount user = userAccountMapper.getUserByName("xajhuang2"); Assert.assertNotNull(user); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); add = userAccountMapper.addUserAccount("xajhuang", "test123", "admin"); Assert.assertNotNull(add); @@ -142,12 +142,12 @@ public class UserAccountMapperTest { String username = "xajhuang2"; UserAccount add = userAccountMapper.addUserAccount(username, "test123", "admin"); Assert.assertNotNull(add); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); userAccountMapper.delUserAccount(username, "admin"); UserAccount user = userAccountMapper.getUserByName(username); Assert.assertNotNull(user); - Assert.assertEquals((long)user.getStatus(), ObjectStatus.DELETED.getCode()); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + Assert.assertEquals(user.getStatus(), ObjectStatus.DELETED); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } @Test @@ -155,11 +155,11 @@ public class UserAccountMapperTest { String username = "xajhuang2"; UserAccount add = userAccountMapper.addUserAccount(username, "test123", "admin"); Assert.assertNotNull(add); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(add)); userAccountMapper.disableUserAccount(username, "admin"); UserAccount user = userAccountMapper.getUserByName(username); Assert.assertNotNull(user); - Assert.assertEquals((long)user.getStatus(), ObjectStatus.DISABLED.getCode()); - log.info(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); + Assert.assertEquals(user.getStatus(), ObjectStatus.DISABLED); + log.debug(objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(user)); } }