Merge pull request #194 from Tanc009/master

jdcloud-sdk-java

Author: Tanc009

jdccs/ChangeLog.md

@@ -1,8 +1,10 @@
 # 更新历史 #
-API版本：1.1.0
+API版本：1.1.2
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2021-03-15|1.1.2|新增接口|金山云需求:开放设备数据信息接口|
+|2020-11-03|1.1.1|新增接口|新增机房巡检列表接口<br>新增设备巡检接口<br>新增机房巡检详情接口|
 |2020-08-04|1.1.0|新增接口|新增机房概览接口<br>新增提交通用服务工单接口<br>新增创建、启用、禁用和删除报警规则|
 |2020-06-22|1.0.10|接口变更|带宽（上、下行流量）监控项数据2小时范围查询支持5m粒度|
 |2020-03-20|1.0.9|接口变更|公网IP列表新增IP地址数量、IP类型、线路类型<br>带宽（出口）列表、详情新增计费方式|

jdccs/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jdcloud.sdk</groupId>
   <artifactId>jdccs</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.2</version>
   <packaging>jar</packaging>
   <name>jdccs</name>
   <url>http://www.jdcloud.com</url>

jdccs/src/main/java/com/jdcloud/sdk/service/jdccs/client/DescribeOpenDevicesDataExecutor.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Monitor API
+ * 云托管服务的监控API
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+package com.jdcloud.sdk.service.jdccs.client;
+
+import com.jdcloud.sdk.client.JdcloudExecutor;
+import com.jdcloud.sdk.service.JdcloudResponse;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesDataResponse;
+
+/**
+ * 查询开放设备数据信息接口
+ */
+class DescribeOpenDevicesDataExecutor extends JdcloudExecutor {
+
+    @Override
+    public String method() {
+        return "GET";
+    }
+
+    @Override
+    public String url() {
+        return "/openDevicesData";
+    }
+
+    @Override
+    public Class<? extends JdcloudResponse> returnType() {
+        return DescribeOpenDevicesDataResponse.class;
+    }
+}

jdccs/src/main/java/com/jdcloud/sdk/service/jdccs/client/DescribeOpenDevicesExecutor.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Monitor API
+ * 云托管服务的监控API
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+package com.jdcloud.sdk.service.jdccs.client;
+
+import com.jdcloud.sdk.client.JdcloudExecutor;
+import com.jdcloud.sdk.service.JdcloudResponse;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesResponse;
+
+/**
+ * 查询开放设备列表
+ */
+class DescribeOpenDevicesExecutor extends JdcloudExecutor {
+
+    @Override
+    public String method() {
+        return "GET";
+    }
+
+    @Override
+    public String url() {
+        return "/openDevices";
+    }
+
+    @Override
+    public Class<? extends JdcloudResponse> returnType() {
+        return DescribeOpenDevicesResponse.class;
+    }
+}

jdccs/src/main/java/com/jdcloud/sdk/service/jdccs/client/JdccsClient.java

@@ -46,6 +46,9 @@
 import com.jdcloud.sdk.service.jdccs.model.SwitchAlarmRequest;
 import com.jdcloud.sdk.service.jdccs.model.SwitchAlarmResponse;
 import com.jdcloud.sdk.service.jdccs.client.SwitchAlarmExecutor;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesDataRequest;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesDataResponse;
+import com.jdcloud.sdk.service.jdccs.client.DescribeOpenDevicesDataExecutor;
 import com.jdcloud.sdk.service.jdccs.model.DescribeBandwidthRequest;
 import com.jdcloud.sdk.service.jdccs.model.DescribeBandwidthResponse;
 import com.jdcloud.sdk.service.jdccs.client.DescribeBandwidthExecutor;
@@ -55,6 +58,9 @@
 import com.jdcloud.sdk.service.jdccs.model.DescribeCabinetsRequest;
 import com.jdcloud.sdk.service.jdccs.model.DescribeCabinetsResponse;
 import com.jdcloud.sdk.service.jdccs.client.DescribeCabinetsExecutor;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesRequest;
+import com.jdcloud.sdk.service.jdccs.model.DescribeOpenDevicesResponse;
+import com.jdcloud.sdk.service.jdccs.client.DescribeOpenDevicesExecutor;
 import com.jdcloud.sdk.service.jdccs.model.DescribeMetricDataRequest;
 import com.jdcloud.sdk.service.jdccs.model.DescribeMetricDataResponse;
 import com.jdcloud.sdk.service.jdccs.client.DescribeMetricDataExecutor;
@@ -88,6 +94,9 @@
 import com.jdcloud.sdk.service.jdccs.model.DescribeIpsRequest;
 import com.jdcloud.sdk.service.jdccs.model.DescribeIpsResponse;
 import com.jdcloud.sdk.service.jdccs.client.DescribeIpsExecutor;
+import com.jdcloud.sdk.service.jdccs.model.UpdateAlarmRequest;
+import com.jdcloud.sdk.service.jdccs.model.UpdateAlarmResponse;
+import com.jdcloud.sdk.service.jdccs.client.UpdateAlarmExecutor;
 import com.jdcloud.sdk.service.jdccs.model.DescribeMetricsRequest;
 import com.jdcloud.sdk.service.jdccs.model.DescribeMetricsResponse;
 import com.jdcloud.sdk.service.jdccs.client.DescribeMetricsExecutor;
@@ -211,6 +220,17 @@ public SwitchAlarmResponse switchAlarm(SwitchAlarmRequest request) throws Jdclou
         return new SwitchAlarmExecutor().client(this).execute(request);
     }
 
+    /**
+     * 查询开放设备数据信息接口
+     *
+     * @param request
+     * @return
+     * @throws JdcloudSdkException
+     */
+    public DescribeOpenDevicesDataResponse describeOpenDevicesData(DescribeOpenDevicesDataRequest request) throws JdcloudSdkException {
+        return new DescribeOpenDevicesDataExecutor().client(this).execute(request);
+    }
+
     /**
      * 查询带宽（出口）详情
      *
@@ -244,6 +264,17 @@ public DescribeCabinetsResponse describeCabinets(DescribeCabinetsRequest request
         return new DescribeCabinetsExecutor().client(this).execute(request);
     }
 
+    /**
+     * 查询开放设备列表
+     *
+     * @param request
+     * @return
+     * @throws JdcloudSdkException
+     */
+    public DescribeOpenDevicesResponse describeOpenDevices(DescribeOpenDevicesRequest request) throws JdcloudSdkException {
+        return new DescribeOpenDevicesExecutor().client(this).execute(request);
+    }
+
     /**
      * 查看某资源单个监控项数据
      *
@@ -365,6 +396,17 @@ public DescribeIpsResponse describeIps(DescribeIpsRequest request) throws Jdclou
         return new DescribeIpsExecutor().client(this).execute(request);
     }
 
+    /**
+     * 修改报警规则
+     *
+     * @param request
+     * @return
+     * @throws JdcloudSdkException
+     */
+    public UpdateAlarmResponse updateAlarm(UpdateAlarmRequest request) throws JdcloudSdkException {
+        return new UpdateAlarmExecutor().client(this).execute(request);
+    }
+
     /**
      * 查询可用监控项列表
      *

jdccs/src/main/java/com/jdcloud/sdk/service/jdccs/client/UpdateAlarmExecutor.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Alarm API
+ * 云托管服务的报警API
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+package com.jdcloud.sdk.service.jdccs.client;
+
+import com.jdcloud.sdk.client.JdcloudExecutor;
+import com.jdcloud.sdk.service.JdcloudResponse;
+import com.jdcloud.sdk.service.jdccs.model.UpdateAlarmResponse;
+
+/**
+ * 修改报警规则
+ */
+class UpdateAlarmExecutor extends JdcloudExecutor {
+
+    @Override
+    public String method() {
+        return "PUT";
+    }
+
+    @Override
+    public String url() {
+        return "/alarms/{alarmId}";
+    }
+
+    @Override
+    public Class<? extends JdcloudResponse> returnType() {
+        return UpdateAlarmResponse.class;
+    }
+}

jdccs/src/main/java/com/jdcloud/sdk/service/jdccs/model/Alarm.java

@@ -114,11 +114,26 @@ public class Alarm  implements java.io.Serializable {
      */
     private String status;
 
+    /**
+     * 通知方式 all:全部 sms：短信 email:邮件
+     */
+    private String noticeMethod;
+
     /**
      * 交换机信息
      */
     private List<Switchboard> switchboard;
 
+    /**
+     * 通知对象用户ID,若多个用逗号分隔
+     */
+    private String userId;
+
+    /**
+     * 通知对象组ID
+     */
+    private String groupId;
+
 
     /**
      * get 规则实例ID
@@ -408,6 +423,24 @@ public void setStatus(String status) {
         this.status = status;
     }
 
+    /**
+     * get 通知方式 all:全部 sms：短信 email:邮件
+     *
+     * @return
+     */
+    public String getNoticeMethod() {
+        return noticeMethod;
+    }
+
+    /**
+     * set 通知方式 all:全部 sms：短信 email:邮件
+     *
+     * @param noticeMethod
+     */
+    public void setNoticeMethod(String noticeMethod) {
+        this.noticeMethod = noticeMethod;
+    }
+
     /**
      * get 交换机信息
      *
@@ -426,6 +459,42 @@ public void setSwitchboard(List<Switchboard> switchboard) {
         this.switchboard = switchboard;
     }
 
+    /**
+     * get 通知对象用户ID,若多个用逗号分隔
+     *
+     * @return
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * set 通知对象用户ID,若多个用逗号分隔
+     *
+     * @param userId
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * get 通知对象组ID
+     *
+     * @return
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * set 通知对象组ID
+     *
+     * @param groupId
+     */
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
 
     /**
      * set 规则实例ID
@@ -587,6 +656,16 @@ public Alarm status(String status) {
         return this;
     }
 
+    /**
+     * set 通知方式 all:全部 sms：短信 email:邮件
+     *
+     * @param noticeMethod
+     */
+    public Alarm noticeMethod(String noticeMethod) {
+        this.noticeMethod = noticeMethod;
+        return this;
+    }
+
     /**
      * set 交换机信息
      *
@@ -597,6 +676,26 @@ public Alarm switchboard(List<Switchboard> switchboard) {
         return this;
     }
 
+    /**
+     * set 通知对象用户ID,若多个用逗号分隔
+     *
+     * @param userId
+     */
+    public Alarm userId(String userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * set 通知对象组ID
+     *
+     * @param groupId
+     */
+    public Alarm groupId(String groupId) {
+        this.groupId = groupId;
+        return this;
+    }
+
 
     /**
      * add item to 交换机信息