Merge pull request #101 from gh-ca/wangxy_dme_git

Wangxy dme git
gh-ca · Sep 13, 2021 · 39115da · 39115da
2 parents 3f92a9f + 40762db
commit 39115da
Show file tree

Hide file tree

Showing 24 changed files with 1,621 additions and 109 deletions.
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/constant/DpSqlFileConstants.java b/dmestore-service/src/main/java/com/huawei/dmestore/constant/DpSqlFileConstants.java
@@ -230,6 +230,38 @@ public final class DpSqlFileConstants {
         + "\"PUSH_EVENT_LEVEL\"  integer, " + "\"HOST_PORT\"  integer default 443, "
         + "CONSTRAINT UNIQUE_DP_HOST_IP UNIQUE (HOST_IP) " + ");";
 
+
+    /**
+     * DP_DME_BEST_PRACTICE_RECOMMAND.
+     */
+    public static final String DP_DME_BEST_PRACTICE_RECOMMAND = "DP_DME_BEST_PRACTICE_RECOMMAND";
+
+    /**
+     * DP_DME_BEST_PRACTICE_RECOMMAND_SQL.
+     */
+    public static final String DP_DME_BEST_PRACTICE_RECOMMAND_SQL = "DROP TABLE IF EXISTS \"DP_DME_BEST_PRACTICE_RECOMMAND\"; "
+        + "CREATE TABLE \"DP_DME_BEST_PRACTICE_RECOMMAND\" ( " + "\"ID\"  integer PRIMARY KEY AUTO_INCREMENT NOT NULL, "
+        + "\"HOST_SETTING\"  nvarchar(255) NOT NULL, " + "\"RECOMMEND_VALUE\"  nvarchar(255) NOT NULL, "
+        + "\"REPAIR_ACTION\" nvarchar(10) NOT NULL, " + "\"CREATE_TIME\"  datetime, "
+        + "\"UPDATE_RECOMMEND_TIME\"  datetime, " + "\"UPDATE_REPAIR_TIME\"  datetime " + ");";
+
+    /**
+     * DP_DME_BEST_PRACTICE_LOG.
+     */
+    public static final String DP_DME_BEST_PRACTICE_LOG = "DP_DME_BEST_PRACTICE_LOG";
+
+    /**
+     * DP_DME_BEST_PRACTICE_LOG_SQL.
+     */
+    public static final String DP_DME_BEST_PRACTICE_LOG_SQL = "DROP TABLE IF EXISTS \"DP_DME_BEST_PRACTICE_LOG\"; "
+        + "CREATE TABLE \"DP_DME_BEST_PRACTICE_LOG\" ( " + "\"ID\"  integer PRIMARY KEY AUTO_INCREMENT NOT NULL, "
+        + "\"OBJECT_NAME\"  nvarchar(512) NOT NULL, " + "\"OBJECT_ID\"  nvarchar(255) NOT NULL, "
+        + "\"HOST_SETTING\"  nvarchar(255) NOT NULL, " + "\"RECOMMEND_VALUE\"  nvarchar(255) NOT NULL, "
+        + "\"VIOLATION_VALUE\"  nvarchar(255) NOT NULL, " + "\"REPAIR_TYPE\"  nvarchar(10) NOT NULL, "
+        + "\"REPAIR_RESULT\" BOOLEAN NOT NULL, " + "\"REPAIR_TIME\"  DATETIME , "
+        + "\"MESSAGE\"  clob " + ");";
+
+
     /**
      * DPSqlFileConstant .
      */

diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/dao/BestPracticeCheckDao.java b/dmestore-service/src/main/java/com/huawei/dmestore/dao/BestPracticeCheckDao.java
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeCheckRecordBean.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeCheckRecordBean.java
@@ -29,6 +29,8 @@ public class BestPracticeCheckRecordBean {
      */
     private int count;
 
+    private String repairAction;
+
     /**
      * hostList .
      */
@@ -123,4 +125,12 @@ public List<BestPracticeBean> getHostList() {
     public void setHostList(final List<BestPracticeBean> param) {
         this.hostList = param;
     }
+
+    public String getRepairAction() {
+        return repairAction;
+    }
+
+    public void setRepairAction(String repairAction) {
+        this.repairAction = repairAction;
+    }
 }
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeLog.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeLog.java
@@ -0,0 +1,115 @@
+package com.huawei.dmestore.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * BestPracticeLog .
+ *
+ * @author wangxiangyong .
+ * @since 2021-07-23
+ **/
+public class BestPracticeLog implements Serializable {
+    private String id;
+
+    private String objectName;
+
+    private String objectId;
+
+    private String hostsetting;
+
+    private String violationValue;
+
+    private String recommandValue;
+
+    private String repairType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date repairTime;
+
+    private boolean repairResult;
+
+    private String message;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public void setObjectName(String objectName) {
+        this.objectName = objectName;
+    }
+
+    public String getObjectId() {
+        return objectId;
+    }
+
+    public void setObjectId(String objectId) {
+        this.objectId = objectId;
+    }
+
+    public String getViolationValue() {
+        return violationValue;
+    }
+
+    public void setViolationValue(String violationValue) {
+        this.violationValue = violationValue;
+    }
+
+    public String getRecommandValue() {
+        return recommandValue;
+    }
+
+    public void setRecommandValue(String recommandValue) {
+        this.recommandValue = recommandValue;
+    }
+
+    public String getRepairType() {
+        return repairType;
+    }
+
+    public void setRepairType(String repairType) {
+        this.repairType = repairType;
+    }
+
+    public Date getRepairTime() {
+        return repairTime;
+    }
+
+    public void setRepairTime(Date repairTime) {
+        this.repairTime = repairTime;
+    }
+
+    public boolean getRepairResult() {
+        return repairResult;
+    }
+
+    public void setRepairResult(boolean repairResult) {
+        this.repairResult = repairResult;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getHostsetting() {
+        return hostsetting;
+    }
+
+    public void setHostsetting(String hostsetting) {
+        this.hostsetting = hostsetting;
+    }
+}
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeRecommand.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeRecommand.java
@@ -0,0 +1,87 @@
+package com.huawei.dmestore.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * BestPracticeUpResultResponse .
+ *
+ * @author wangxiangyong .
+ * @since 2020-12-01
+ **/
+public class BestPracticeRecommand implements Serializable {
+    private String id;
+
+    private String hostsetting;
+
+    private String recommandValue;
+
+    private String repairAction;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateRecommendTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateRepairTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getHostsetting() {
+        return hostsetting;
+    }
+
+    public void setHostsetting(String hostsetting) {
+        this.hostsetting = hostsetting;
+    }
+
+    public String getRecommandValue() {
+        return recommandValue;
+    }
+
+    public void setRecommandValue(String recommandValue) {
+        this.recommandValue = recommandValue;
+    }
+
+    public String getRepairAction() {
+        return repairAction;
+    }
+
+    public void setRepairAction(String repairAction) {
+        this.repairAction = repairAction;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateRecommendTime() {
+        return updateRecommendTime;
+    }
+
+    public void setUpdateRecommendTime(Date updateRecommendTime) {
+        this.updateRecommendTime = updateRecommendTime;
+    }
+
+    public Date getUpdateRepairTime() {
+        return updateRepairTime;
+    }
+
+    public void setUpdateRepairTime(Date updateRepairTime) {
+        this.updateRepairTime = updateRepairTime;
+    }
+}
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeRecommandUpReq.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeRecommandUpReq.java
@@ -0,0 +1,23 @@
+package com.huawei.dmestore.model;
+
+public class BestPracticeRecommandUpReq {
+    private String recommandValue;
+
+    private String repairAction;
+
+    public String getRecommandValue() {
+        return recommandValue;
+    }
+
+    public void setRecommandValue(String recommandValue) {
+        this.recommandValue = recommandValue;
+    }
+
+    public String getRepairAction() {
+        return repairAction;
+    }
+
+    public void setRepairAction(String repairAction) {
+        this.repairAction = repairAction;
+    }
+}
diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeUpResultBase.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/BestPracticeUpResultBase.java
@@ -27,6 +27,8 @@ public class BestPracticeUpResultBase {
      */
     private boolean updateResult;
 
+    private String message;
+
     /**
      * getHostSetting .
      *
@@ -99,6 +101,14 @@ public void setUpdateResult(final boolean param) {
         this.updateResult = param;
     }
 
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
     @Override
     public final String toString() {
         return "BestPracticeUpResultBase{" + "hostSetting='" + hostSetting + '\'' + ", needReboot=" + needReboot

diff --git a/dmestore-service/src/main/java/com/huawei/dmestore/model/DelVmRdmsRequest.java b/dmestore-service/src/main/java/com/huawei/dmestore/model/DelVmRdmsRequest.java
@@ -0,0 +1,28 @@
+package com.huawei.dmestore.model;
+
+/**
+ * @author wangxiangyong
+ * @Description: TODO
+ * @date 2021/8/13 11:15
+ */
+public class DelVmRdmsRequest {
+    private String diskObjectId;
+    private String lunWwn;
+
+    public String getDiskObjectId() {
+        return diskObjectId;
+    }
+
+    public void setDiskObjectId(String diskObjectId) {
+        this.diskObjectId = diskObjectId;
+    }
+
+    public String getLunWwn() {
+        return lunWwn;
+    }
+
+    public void setLunWwn(String lunWwn) {
+        this.lunWwn = lunWwn;
+    }
+
+}