zhouweidong 发布系统代码 [ibz-dst，应用]

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DABuild.java

@@ -141,6 +141,14 @@ public class DABuild extends EntityMP implements Serializable {
         this.dadimension = dadimension;
         this.modify("dadimension", (dadimension!=null)?dadimension:(new ArrayList()));
     }
+    /**
+     * 指标
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private List<cn.ibizlab.core.analysis.domain.DAMetric> metrics;
+
 
     /**
      * 设置 [名称]

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDAMetricService.java

@@ -41,6 +41,7 @@ public interface IDAMetricService extends IService<DAMetric> {
     Page<DAMetric> searchDefault(DAMetricSearchContext context);
     List<DAMetric> selectByBuildId(String build_id);
     void removeByBuildId(String build_id);
+    void saveByBuildId(String build_id, List<DAMetric> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -67,6 +67,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         if(!this.retBool(this.baseMapper.insert(et))) {
             return false;
         }
+        dametricService.saveByBuildId(et.getBuildId(), et.getMetrics());
         CachedBeanCopier.copy(get(et.getBuildId()), et);
         return true;
     }
@@ -85,6 +86,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("buildid", et.getBuildId()))) {
             return false;
         }
+        dametricService.saveByBuildId(et.getBuildId(), et.getMetrics());
         CachedBeanCopier.copy(get(et.getBuildId()), et);
         return true;
     }
@@ -99,6 +101,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
     @Override
     @Transactional
     public boolean remove(String key) {
+        dametricService.removeByBuildId(key) ;
         boolean result = removeById(key);
         return result ;
     }
@@ -118,6 +121,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
             et.setBuildId(key);
         }
         else {
+            et.setMetrics(dametricService.selectByBuildId(key));
         }
         return et;
     }

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java

@@ -217,6 +217,35 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
         this.remove(new QueryWrapper<DAMetric>().eq("buildid",build_id));
     }
 
+	@Override
+    public void saveByBuildId(String build_id,List<DAMetric> list) {
+        if(list==null)
+            return;
+        Set<String> delIds=new HashSet<String>();
+        List<DAMetric> _update=new ArrayList<DAMetric>();
+        List<DAMetric> _create=new ArrayList<DAMetric>();
+        for(DAMetric before:selectByBuildId(build_id)){
+            delIds.add(before.getMetricId());
+        }
+        for(DAMetric sub:list) {
+            sub.setBuildId(build_id);
+            if(ObjectUtils.isEmpty(sub.getMetricId()))
+                sub.setMetricId((String)sub.getDefaultKey(true));
+            if(delIds.contains(sub.getMetricId())) {
+                delIds.remove(sub.getMetricId());
+                _update.add(sub);
+            }
+            else
+                _create.add(sub);
+        }
+        if(_update.size()>0)
+            proxyService.updateBatch(_update);
+        if(_create.size()>0)
+            proxyService.createBatch(_create);
+        if(delIds.size()>0)
+            proxyService.removeBatch(delIds);
+	}
+
 
     /**
      * 查询集合 数据集

ibzdst-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-65-1">
+    <changeSet author="root" id="tab-da_build-67-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
@@ -54,7 +54,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="root" id="tab-da_metric-60-3">
+    <changeSet author="root" id="tab-da_metric-62-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -469,7 +469,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="root" id="fk-da_metric-60-17">
+    <changeSet author="root" id="fk-da_metric-62-17">
        <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
     </changeSet>
         <!--输出实体[DA_REPORT]外键关系 -->