Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java

@@ -31,6 +31,10 @@ public class MdmField extends BaseMdmBean {
     @ApiParam(value ="表名")
     private String tableName;
 
+    @Column(name="TABLE_DESCRIPTION")
+    @ApiParam(value ="表描述")
+    private String tableDescription;
+
     @Column(name="FIELD_NAME")
     @ApiParam(value ="字段名称")
     private String fieldName;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,6 +38,31 @@ public class MdmDataSubscribe extends BaseBean {
     @ApiParam("主数据名称")
     private String mdmName;
 
+
+    @Column(name = "MDM_SUBSCRIBE")
+    @ApiParam("订阅对象")
+    private String mdmSubscribe;
+
+    @Column(name = "MDM_SUBSCRIBE_TYPE")
+    @ApiParam("订阅类型")
+    private Integer mdmSubscribeType;
+
+    @Column(name = "MDM_SUBSCRIBE_PERMISSIONS")
+    @ApiParam("订阅权限")
+    private String mdmSubscribePermissions;
+
+    @Column(name = "MDM_SUBSCRIBE_FIELD")
+    @ApiParam("订阅字段")
+    @Lob
+    private String mdmSubscribeField;
+
+    @Transient
+    @ApiParam("订阅字段保存List")
+    private List<String> mdmSubscribeFields;
+
+
+
+
     @Column(name = "INTERNAL_APP_NUM")
     @ApiParam("内部订阅应用数量")
     private Integer internalAppNum;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java

@@ -31,21 +31,30 @@ public class MdmExternalApp extends BaseBean {
     private static final long serialVersionUID = -5344361274535836969L;
 
     @Column(name = "APP_NAME")
-    @ApiParam("应用名称")
+    @ApiParam("服务名称")
     private String appName;
 
     @Column(name = "APP_CODE")
-    @ApiParam("应用代码")
+    @ApiParam("服务代码")
     private String appCode;
 
     @Column(name = "CALL_TOKEN")
     @ApiParam("调用令牌")
     private String callToken;
 
+    @Column(name = "APP_BRIEF")
+    @ApiParam("服务简介")
+    private String appBrief;
+
     @Column(name = "CALLBACK_URL")
-    @ApiParam("回调地址")
+    @ApiParam("回调接口")
     private String callbackUrl;
 
+
+    @Column(name = "EMAIL")
+    @ApiParam("通知邮箱")
+    private String email;
+
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private String operateType;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java

@@ -1,9 +1,14 @@
 package cn.estsh.i3plus.pojo.mdm.repository.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * @Description :
  * @Reference :
@@ -13,4 +18,5 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface MdmExternalAppRepository extends BaseRepository<MdmExternalApp, Long> {
+
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.base.MdmMail;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-15 16:26
+ * @Modify:
+ **/
+@Repository
+public interface MdmMailRepository extends BaseRepository<MdmMail, Long> {
+}