diff --git a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java index cdb74d29..1139b0a3 100644 --- a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java @@ -45,7 +45,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl { /** * The Dispose service group. */ - private final Hashtable disposeServiceGroup = new Hashtable<>(); + private final Hashtable disposeServiceGroup = new Hashtable<>(); /** * The Obj prefix. @@ -65,6 +65,19 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl { */ private long timerCnt = 0; + /** + * Sync dp tech device info. + */ + private void syncDpTechDeviceInfo() { + disposeServiceGroup.values().forEach(v -> { + + }); + } + + private String getProtectObjectName(String serviceId) { + return null; + } + /** * Init cleanup devices. */ diff --git a/src/main/java/com/dispose/mapper/ServiceGroupMapper.java b/src/main/java/com/dispose/mapper/ServiceGroupMapper.java index a6dad4db..a90d07aa 100644 --- a/src/main/java/com/dispose/mapper/ServiceGroupMapper.java +++ b/src/main/java/com/dispose/mapper/ServiceGroupMapper.java @@ -40,5 +40,5 @@ public interface ServiceGroupMapper { * @param serviceId the service id * @return the int */ - int delServiceGroupByServiceId(@Param("serviceId") Long serviceId); + int delServiceGroupByServiceId(@Param("serviceId") String serviceId); } diff --git a/src/main/java/com/dispose/pojo/entity/ServiceInfo.java b/src/main/java/com/dispose/pojo/entity/ServiceInfo.java index 40fb81ab..73a36588 100644 --- a/src/main/java/com/dispose/pojo/entity/ServiceInfo.java +++ b/src/main/java/com/dispose/pojo/entity/ServiceInfo.java @@ -42,7 +42,7 @@ public class ServiceInfo { /** * The Service id. */ - private Long serviceId; + private String serviceId; /** * The Service type. diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index 9b4f4db1..189825d4 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -135,7 +135,7 @@ DROP TABLE IF EXISTS `service_group`; CREATE TABLE `service_group` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '业务ID唯一标识符', - `serviceId` int(11) UNSIGNED NOT NULL COMMENT '业务ID', + `serviceId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务ID', `serviceType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务类型:SERVER,WEB,DNS,GAME', `serviceBandwidth` int(11) NOT NULL COMMENT '业务带宽,单位M', `serviceIp` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务IP地址,逗号分割', diff --git a/src/main/resources/mappers/ServiceGroup.xml b/src/main/resources/mappers/ServiceGroup.xml index 029a0a6a..1de535f3 100644 --- a/src/main/resources/mappers/ServiceGroup.xml +++ b/src/main/resources/mappers/ServiceGroup.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/test_db/unit_test.sql b/src/main/resources/test_db/unit_test.sql index a8d2f48c..64c7cb14 100644 --- a/src/main/resources/test_db/unit_test.sql +++ b/src/main/resources/test_db/unit_test.sql @@ -211,7 +211,7 @@ DROP TABLE IF EXISTS `service_group`; CREATE TABLE `service_group` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '业务ID唯一标识符', - `serviceId` int(11) UNSIGNED NOT NULL COMMENT '业务ID', + `serviceId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务ID', `serviceType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务类型:SERVER,WEB,DNS,GAME', `serviceBandwidth` int(11) NOT NULL COMMENT '业务带宽,单位M', `serviceIp` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务IP地址,逗号分割',