merge: merge master to 3.6.x

src/backend/commons/cmdb-sdk-model/src/main/java/com/tencent/bk/job/common/cc/model/BusinessInfoDTO.java

@@ -30,29 +30,45 @@
 import lombok.ToString;
 
 /**
- * @description
- * @date 2019/3/4
+ * 业务DTO
  */
 @Getter
 @Setter
 @ToString
 public class BusinessInfoDTO {
+    /**
+     * 业务ID
+     */
     @JsonProperty("bk_biz_id")
     private Long bizId;
+    /**
+     * 业务名称
+     */
     @JsonProperty("bk_biz_name")
     private String bizName;
+    /**
+     * 业务运维
+     */
     @JsonProperty("bk_biz_maintainer")
     private String maintainers;
+    /**
+     * 开发商账号
+     */
     @JsonProperty("bk_supplier_account")
     private String supplierAccount;
+    /**
+     * 表示业务类型
+     */
     @JsonProperty("default")
     private Integer defaultApp;
+    /**
+     * 业务所在时区
+     */
     @JsonProperty("time_zone")
     private String timezone;
-    @JsonProperty("bk_operate_dept_id")
-    private Long operateDeptId;
-    @JsonProperty("bk_operate_dept_name")
-    private String operateDeptName;
+    /**
+     * 业务语言
+     */
     @JsonProperty("language")
     private String language;
 }

src/backend/commons/cmdb-sdk-model/src/main/java/com/tencent/bk/job/common/cc/model/bizset/BizSetInfo.java

@@ -81,12 +81,6 @@ public class BizSetInfo {
     @JsonProperty("bk_supplier_account")
     private String supplierAccount;
 
-    /**
-     * 运维部门ID
-     */
-    @JsonProperty("bk_operate_dept_id")
-    private Long operateDeptId;
-
     /**
      * 时区
      */

src/backend/commons/cmdb-sdk-model/src/main/java/com/tencent/bk/job/common/cc/model/bizset/SearchBizSetReq.java

@@ -51,7 +51,7 @@ public class SearchBizSetReq extends EsbReq {
      * 查询字段
      */
     private List<String> fields = Arrays.asList("bk_biz_set_id", "bk_biz_set_name", "bk_biz_set_desc",
-        "bk_biz_maintainer", "bk_supplier_account", "bk_operate_dept_id", "create_time", "last_time", "time_zone",
+        "bk_biz_maintainer", "bk_supplier_account", "create_time", "last_time", "time_zone",
         "language", "bk_scope");
 
     /**

src/backend/commons/cmdb-sdk-model/src/main/java/com/tencent/bk/job/common/cc/model/result/BizEventDetail.java

@@ -25,8 +25,6 @@
 package com.tencent.bk.job.common.cc.model.result;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.tencent.bk.job.common.cc.util.VersionCompatUtil;
-import com.tencent.bk.job.common.constant.AppTypeEnum;
 import com.tencent.bk.job.common.constant.ResourceScopeTypeEnum;
 import com.tencent.bk.job.common.model.dto.ApplicationDTO;
 import com.tencent.bk.job.common.model.dto.ResourceScope;
@@ -45,29 +43,20 @@ public class BizEventDetail {
     private Long bizId;
     @JsonProperty("bk_biz_name")
     private String appName;
-    @JsonProperty("bk_biz_maintainer")
-    private String maintainers;
     @JsonProperty("bk_supplier_account")
     private String supplierAccount;
     @JsonProperty("time_zone")
     private String timezone;
-    @JsonProperty("bk_operate_dept_id")
-    private Long operateDeptId;
-    @JsonProperty("bk_operate_dept_name")
-    private String operateDeptName;
     @JsonProperty("language")
     private String language;
 
     public static ApplicationDTO toAppInfoDTO(BizEventDetail bizEventDetail) {
         ApplicationDTO applicationDTO = new ApplicationDTO();
         applicationDTO.setScope(new ResourceScope(ResourceScopeTypeEnum.BIZ,
             String.valueOf(bizEventDetail.getBizId())));
-        applicationDTO.setAppType(AppTypeEnum.NORMAL);
         applicationDTO.setName(bizEventDetail.getAppName());
-        applicationDTO.setMaintainers(VersionCompatUtil.convertMaintainers(bizEventDetail.getMaintainers()));
         applicationDTO.setBkSupplierAccount(bizEventDetail.getSupplierAccount());
         applicationDTO.setTimeZone(bizEventDetail.getTimezone());
-        applicationDTO.setOperateDeptId(bizEventDetail.getOperateDeptId());
         applicationDTO.setLanguage(bizEventDetail.getLanguage());
         return applicationDTO;
     }