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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java

@@ -281,6 +281,83 @@ public class BlockReportEnumUtil {
     }
 
     /**
+     * 模板状态
+     *  1 新建模板
+     *  2 新建模板对象
+     *  3 新建模板查询条件
+     *  4 新建模板分组条件
+     *  5 新建模板聚合条件
+     *  6 新建模板显示条件
+     *  7 新建模板确认
+     *  8 新建模板完成
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEMPLATE_STATUS {
+        SAVE_TEMPLATE(1, "新建模板", "新建模板"),
+        SAVE_TEMPLATE_POJO(2, "新建模板对象", "新建模板对象"),
+        SAVE_TEMPLATE_ATTR_WHERE(3, "新建模板查询条件", "新建模板查询条件"),
+        SAVE_TEMPLATE_ATTR_GROUP(4, "新建模板分组条件", "新建模板分组条件"),
+        SAVE_TEMPLATE_ATTR_AGGREGATION(5, "新建模板聚合条件", "新建模板聚合条件"),
+        SAVE_TEMPLATE_ATTR_SHOW(6, "新建模板显示条件", "新建模板显示条件"),
+        SAVE_TEMPLATE_ATTR_CONFIRM(7, "新建模板确认条件", "新建模板确认条件"),
+        SAVE_TEMPLATE_FULFIL(8, "新建模板确认条件", "新建模板确认条件");
+
+        private int value;
+        private String name;
+        private String description;
+
+        TEMPLATE_STATUS() {
+        }
+
+        TEMPLATE_STATUS(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].getName();
+                }
+            }
+            return tmp;
+        }
+        public static TEMPLATE_STATUS enumOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
      * 数据状态
      *  1 启用
      *  2 禁用
@@ -594,7 +671,6 @@ public class BlockReportEnumUtil {
             return null;
         }
 
-
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java

@@ -44,7 +44,7 @@ public class BrTemplate extends BaseBean {
     private Integer templateStatus;
 
     @Column(name="NUM_POJO")
-    @ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
+    @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numPojo;
 
     @Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT")
@@ -52,7 +52,7 @@ public class BrTemplate extends BaseBean {
     private String templatePojoNamesRdd;
 
     @Column(name="NUM_SERVER")
-    @ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
+    @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numServer;
 
     @Column(name="TEMPLATE_SERVER_ID_LIST",columnDefinition = "TEXT")
@@ -64,7 +64,7 @@ public class BrTemplate extends BaseBean {
     private String templateServerNamesRdd;
 
     @Column(name="NUM_TEMPLATE_ATTR_FILTER")
-    @ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
+    @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrFilter;
 
     @Column(name="template_attr_filter_list",columnDefinition = "TEXT")
@@ -72,7 +72,7 @@ public class BrTemplate extends BaseBean {
     private String templateAttrFilterList;
 
     @Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP")
-    @ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
+    @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrFilterGroup;
 
     @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT")
@@ -80,13 +80,21 @@ public class BrTemplate extends BaseBean {
     private String templateAttrFilterGroupList;
 
     @Column(name="NUM_TEMPLATE_ATTR_SHOW")
-    @ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
+    @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrShow;
 
     @Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT")
     @ApiParam(value ="模板显示属性" , access ="模板显示属性")
     private String templateAttrShowList;
 
+    @Column(name="NUM_TEMPLATE_AGGREGATION_SHOW")
+    @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量")
+    private Integer numTemplateAggregationShow;
+
+    @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT")
+    @ApiParam(value ="模板聚集属性" , access ="模板聚集属性")
+    private String templateAttrAggregationList;
+
     @Column(name="TEMPLATE_DESCRIPTION")
     @ApiParam(value ="模板描述" , access ="模板描述")
     private String templateDescription;
@@ -130,10 +138,14 @@ public class BrTemplate extends BaseBean {
 
     @Transient
     @ApiParam(value ="模板服务对象聚合条件")
-    private List<BrPojoAttr> pojoAttrAggrList = new ArrayList<>();
+    private List<BrPojoAttr> pojoAttrAggregationList = new ArrayList<>();
 
     @Transient
     @ApiParam(value ="模板服务对象显示属性")
     private List<BrPojoAttr> pojoAttrShowList = new ArrayList<>();
 
+    @Transient
+    @ApiParam(value ="模板服务集合")
+    private List<String> serverNameList = new ArrayList<>();
+
 }