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

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DABuildMapper.java

@@ -21,14 +21,19 @@ public interface DABuildMapper extends BaseMapper<DABuild> {
 
     Page<DABuild> searchDefault(IPage page, @Param("srf") DABuildSearchContext context, @Param("ew") Wrapper<DABuild> wrapper);
     @Override
+    @Cacheable(value ="dabuild", key = "'row:'+#p0")
     DABuild selectById(Serializable id);
     @Override
+    @CacheEvict(value ="dabuild", key = "'row:'+#p0.build_id")
     int insert(DABuild entity);
     @Override
+    @CacheEvict(value ="dabuild", key = "'row:'+#p0.build_id")
     int updateById(@Param(Constants.ENTITY) DABuild entity);
     @Override
+    @CacheEvict(value ="dabuild", key = "'row:'+#p0.build_id")
     int update(@Param(Constants.ENTITY) DABuild entity, @Param("ew") Wrapper<DABuild> updateWrapper);
     @Override
+    @CacheEvict(value ="dabuild", key = "'row:'+#p0")
     int deleteById(Serializable id);
     /**
     * 自定义查询SQL

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

@@ -26,10 +26,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IDABuildService extends IService<DABuild> {
 
     boolean create(DABuild et);
+    @CacheEvict(value = "dabuild", allEntries = true)
     void createBatch(List<DABuild> list);
     boolean update(DABuild et);
+    @CacheEvict(value = "dabuild", allEntries = true)
     void updateBatch(List<DABuild> list);
     boolean remove(String key);
+    @CacheEvict(value = "dabuild", allEntries = true)
     void removeBatch(Collection<String> idList);
     DABuild get(String key);
     DABuild getDraft(DABuild et);
@@ -41,10 +44,13 @@ public interface IDABuildService extends IService<DABuild> {
     DABuild run(DABuild et);
     boolean runBatch(List<DABuild> etList);
     boolean save(DABuild et);
+    @CacheEvict(value = "dabuild",allEntries = true)
     void saveBatch(List<DABuild> list);
     Page<DABuild> searchDefault(DABuildSearchContext context);
     List<DABuild> selectByModelId(String id);
+    @CacheEvict(value = "dabuild", allEntries = true)
     void removeByModelId(String id);
+    @CacheEvict(value = "dabuild", allEntries = true)
     void saveByModelId(String id, List<DABuild> list) ;
     /**
      *自定义查询SQL

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-76-1">
+    <changeSet author="root" id="tab-da_build-78-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DABuildResource.java

@@ -110,8 +110,9 @@ public class DABuildResource {
 
     @ApiOperation(value = "获取分析草稿", tags = {"分析" },  notes = "获取分析草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dabuilds/getdraft")
-    public ResponseEntity<DABuildDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dabuildMapping.toDto(dabuildService.getDraft(new DABuild())));
+    public ResponseEntity<DABuildDTO> getDraft(DABuildDTO dto) {
+        DABuild domain = dabuildMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dabuildMapping.toDto(dabuildService.getDraft(domain)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-DABuild-Check-all')")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DAChartResource.java

@@ -110,8 +110,9 @@ public class DAChartResource {
 
     @ApiOperation(value = "获取图表草稿", tags = {"图表" },  notes = "获取图表草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dacharts/getdraft")
-    public ResponseEntity<DAChartDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dachartMapping.toDto(dachartService.getDraft(new DAChart())));
+    public ResponseEntity<DAChartDTO> getDraft(DAChartDTO dto) {
+        DAChart domain = dachartMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dachartMapping.toDto(dachartService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查图表", tags = {"图表" },  notes = "检查图表")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DAMetricResource.java

@@ -111,8 +111,9 @@ public class DAMetricResource {
 
     @ApiOperation(value = "获取指标草稿", tags = {"指标" },  notes = "获取指标草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dametrics/getdraft")
-    public ResponseEntity<DAMetricDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dametricMapping.toDto(dametricService.getDraft(new DAMetric())));
+    public ResponseEntity<DAMetricDTO> getDraft(DAMetricDTO dto) {
+        DAMetric domain = dametricMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dametricMapping.toDto(dametricService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查指标", tags = {"指标" },  notes = "检查指标")
@@ -252,8 +253,8 @@ public class DAMetricResource {
 
     @ApiOperation(value = "根据分析获取指标草稿", tags = {"指标" },  notes = "根据分析获取指标草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dabuilds/{dabuild_id}/dametrics/getdraft")
-    public ResponseEntity<DAMetricDTO> getDraftByDABuild(@PathVariable("dabuild_id") String dabuild_id) {
-        DAMetric domain = new DAMetric();
+    public ResponseEntity<DAMetricDTO> getDraftByDABuild(@PathVariable("dabuild_id") String dabuild_id, DAMetricDTO dto) {
+        DAMetric domain = dametricMapping.toDomain(dto);
         domain.setBuildId(dabuild_id);
         return ResponseEntity.status(HttpStatus.OK).body(dametricMapping.toDto(dametricService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DAReportResource.java

@@ -110,8 +110,9 @@ public class DAReportResource {
 
     @ApiOperation(value = "获取报表草稿", tags = {"报表" },  notes = "获取报表草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dareports/getdraft")
-    public ResponseEntity<DAReportDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dareportMapping.toDto(dareportService.getDraft(new DAReport())));
+    public ResponseEntity<DAReportDTO> getDraft(DAReportDTO dto) {
+        DAReport domain = dareportMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dareportMapping.toDto(dareportService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查报表", tags = {"报表" },  notes = "检查报表")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstAppResource.java

@@ -103,8 +103,9 @@ public class DstAppResource {
 
     @ApiOperation(value = "获取应用草稿", tags = {"应用" },  notes = "获取应用草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dstapps/getdraft")
-    public ResponseEntity<DstAppDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dstappMapping.toDto(dstappService.getDraft(new DstApp())));
+    public ResponseEntity<DstAppDTO> getDraft(DstAppDTO dto) {
+        DstApp domain = dstappMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dstappMapping.toDto(dstappService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查应用", tags = {"应用" },  notes = "检查应用")
@@ -213,8 +214,8 @@ public class DstAppResource {
 
     @ApiOperation(value = "根据系统获取应用草稿", tags = {"应用" },  notes = "根据系统获取应用草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/dstapps/getdraft")
-    public ResponseEntity<DstAppDTO> getDraftByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id) {
-        DstApp domain = new DstApp();
+    public ResponseEntity<DstAppDTO> getDraftByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, DstAppDTO dto) {
+        DstApp domain = dstappMapping.toDomain(dto);
         domain.setSystemid(dstsystem_id);
         return ResponseEntity.status(HttpStatus.OK).body(dstappMapping.toDto(dstappService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstDataSourceResource.java

@@ -110,8 +110,9 @@ public class DstDataSourceResource {
 
     @ApiOperation(value = "获取数据源草稿", tags = {"数据源" },  notes = "获取数据源草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dstdatasources/getdraft")
-    public ResponseEntity<DstDataSourceDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dstdatasourceMapping.toDto(dstdatasourceService.getDraft(new DstDataSource())));
+    public ResponseEntity<DstDataSourceDTO> getDraft(DstDataSourceDTO dto) {
+        DstDataSource domain = dstdatasourceMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dstdatasourceMapping.toDto(dstdatasourceService.getDraft(domain)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-DstDataSource-BuildDS-all')")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstSystemResource.java

@@ -110,8 +110,9 @@ public class DstSystemResource {
 
     @ApiOperation(value = "获取系统草稿", tags = {"系统" },  notes = "获取系统草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/dstsystems/getdraft")
-    public ResponseEntity<DstSystemDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(dstsystemMapping.toDto(dstsystemService.getDraft(new DstSystem())));
+    public ResponseEntity<DstSystemDTO> getDraft(DstSystemDTO dto) {
+        DstSystem domain = dstsystemMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dstsystemMapping.toDto(dstsystemService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查系统", tags = {"系统" },  notes = "检查系统")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/ExecLogResource.java

@@ -111,8 +111,9 @@ public class ExecLogResource {
 
     @ApiOperation(value = "获取执行日志草稿", tags = {"执行日志" },  notes = "获取执行日志草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/execlogs/getdraft")
-    public ResponseEntity<ExecLogDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(execlogMapping.toDto(execlogService.getDraft(new ExecLog())));
+    public ResponseEntity<ExecLogDTO> getDraft(ExecLogDTO dto) {
+        ExecLog domain = execlogMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(execlogMapping.toDto(execlogService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查执行日志", tags = {"执行日志" },  notes = "检查执行日志")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/ExecResultResource.java

@@ -111,8 +111,9 @@ public class ExecResultResource {
 
     @ApiOperation(value = "获取执行结果草稿", tags = {"执行结果" },  notes = "获取执行结果草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/execresults/getdraft")
-    public ResponseEntity<ExecResultDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(execresultMapping.toDto(execresultService.getDraft(new ExecResult())));
+    public ResponseEntity<ExecResultDTO> getDraft(ExecResultDTO dto) {
+        ExecResult domain = execresultMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(execresultMapping.toDto(execresultService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查执行结果", tags = {"执行结果" },  notes = "检查执行结果")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaDataSetResource.java

@@ -110,8 +110,9 @@ public class MetaDataSetResource {
 
     @ApiOperation(value = "获取数据集草稿", tags = {"数据集" },  notes = "获取数据集草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metadatasets/getdraft")
-    public ResponseEntity<MetaDataSetDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metadatasetMapping.toDto(metadatasetService.getDraft(new MetaDataSet())));
+    public ResponseEntity<MetaDataSetDTO> getDraft(MetaDataSetDTO dto) {
+        MetaDataSet domain = metadatasetMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metadatasetMapping.toDto(metadatasetService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查数据集", tags = {"数据集" },  notes = "检查数据集")
@@ -231,8 +232,8 @@ public class MetaDataSetResource {
 
     @ApiOperation(value = "根据实体获取数据集草稿", tags = {"数据集" },  notes = "根据实体获取数据集草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/metaentities/{metaentity_id}/metadatasets/getdraft")
-    public ResponseEntity<MetaDataSetDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id) {
-        MetaDataSet domain = new MetaDataSet();
+    public ResponseEntity<MetaDataSetDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id, MetaDataSetDTO dto) {
+        MetaDataSet domain = metadatasetMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metadatasetMapping.toDto(metadatasetService.getDraft(domain)));
     }
@@ -360,8 +361,8 @@ public class MetaDataSetResource {
 
     @ApiOperation(value = "根据系统实体获取数据集草稿", tags = {"数据集" },  notes = "根据系统实体获取数据集草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/metaentities/{metaentity_id}/metadatasets/getdraft")
-    public ResponseEntity<MetaDataSetDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id) {
-        MetaDataSet domain = new MetaDataSet();
+    public ResponseEntity<MetaDataSetDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id, MetaDataSetDTO dto) {
+        MetaDataSet domain = metadatasetMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metadatasetMapping.toDto(metadatasetService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java

@@ -111,8 +111,9 @@ public class MetaEntityResource {
 
     @ApiOperation(value = "获取实体草稿", tags = {"实体" },  notes = "获取实体草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metaentities/getdraft")
-    public ResponseEntity<MetaEntityDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metaentityMapping.toDto(metaentityService.getDraft(new MetaEntity())));
+    public ResponseEntity<MetaEntityDTO> getDraft(MetaEntityDTO dto) {
+        MetaEntity domain = metaentityMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metaentityMapping.toDto(metaentityService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查实体", tags = {"实体" },  notes = "检查实体")
@@ -252,8 +253,8 @@ public class MetaEntityResource {
 
     @ApiOperation(value = "根据系统获取实体草稿", tags = {"实体" },  notes = "根据系统获取实体草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/metaentities/getdraft")
-    public ResponseEntity<MetaEntityDTO> getDraftByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id) {
-        MetaEntity domain = new MetaEntity();
+    public ResponseEntity<MetaEntityDTO> getDraftByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, MetaEntityDTO dto) {
+        MetaEntity domain = metaentityMapping.toDomain(dto);
         domain.setSystemId(dstsystem_id);
         return ResponseEntity.status(HttpStatus.OK).body(metaentityMapping.toDto(metaentityService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaFieldResource.java

@@ -111,8 +111,9 @@ public class MetaFieldResource {
 
     @ApiOperation(value = "获取属性草稿", tags = {"属性" },  notes = "获取属性草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metafields/getdraft")
-    public ResponseEntity<MetaFieldDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metafieldMapping.toDto(metafieldService.getDraft(new MetaField())));
+    public ResponseEntity<MetaFieldDTO> getDraft(MetaFieldDTO dto) {
+        MetaField domain = metafieldMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metafieldMapping.toDto(metafieldService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查属性", tags = {"属性" },  notes = "检查属性")
@@ -233,8 +234,8 @@ public class MetaFieldResource {
 
     @ApiOperation(value = "根据实体获取属性草稿", tags = {"属性" },  notes = "根据实体获取属性草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/metaentities/{metaentity_id}/metafields/getdraft")
-    public ResponseEntity<MetaFieldDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id) {
-        MetaField domain = new MetaField();
+    public ResponseEntity<MetaFieldDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id, MetaFieldDTO dto) {
+        MetaField domain = metafieldMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metafieldMapping.toDto(metafieldService.getDraft(domain)));
     }
@@ -363,8 +364,8 @@ public class MetaFieldResource {
 
     @ApiOperation(value = "根据系统实体获取属性草稿", tags = {"属性" },  notes = "根据系统实体获取属性草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/metaentities/{metaentity_id}/metafields/getdraft")
-    public ResponseEntity<MetaFieldDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id) {
-        MetaField domain = new MetaField();
+    public ResponseEntity<MetaFieldDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id, MetaFieldDTO dto) {
+        MetaField domain = metafieldMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metafieldMapping.toDto(metafieldService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModelResource.java

@@ -130,8 +130,9 @@ public class MetaModelResource {
 
     @ApiOperation(value = "获取模型草稿", tags = {"模型" },  notes = "获取模型草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metamodels/getdraft")
-    public ResponseEntity<MetaModelDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metamodelMapping.toDto(metamodelService.getDraft(new MetaModel())));
+    public ResponseEntity<MetaModelDTO> getDraft(MetaModelDTO dto) {
+        MetaModel domain = metamodelMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metamodelMapping.toDto(metamodelService.getDraft(domain)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-Change-all')")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModuleResource.java

@@ -110,8 +110,9 @@ public class MetaModuleResource {
 
     @ApiOperation(value = "获取模块草稿", tags = {"模块" },  notes = "获取模块草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metamodules/getdraft")
-    public ResponseEntity<MetaModuleDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metamoduleMapping.toDto(metamoduleService.getDraft(new MetaModule())));
+    public ResponseEntity<MetaModuleDTO> getDraft(MetaModuleDTO dto) {
+        MetaModule domain = metamoduleMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metamoduleMapping.toDto(metamoduleService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查模块", tags = {"模块" },  notes = "检查模块")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaRelationshipResource.java

@@ -111,8 +111,9 @@ public class MetaRelationshipResource {
 
     @ApiOperation(value = "获取实体关系草稿", tags = {"实体关系" },  notes = "获取实体关系草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/metarelationships/getdraft")
-    public ResponseEntity<MetaRelationshipDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(metarelationshipMapping.toDto(metarelationshipService.getDraft(new MetaRelationship())));
+    public ResponseEntity<MetaRelationshipDTO> getDraft(MetaRelationshipDTO dto) {
+        MetaRelationship domain = metarelationshipMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(metarelationshipMapping.toDto(metarelationshipService.getDraft(domain)));
     }
 
     @ApiOperation(value = "检查实体关系", tags = {"实体关系" },  notes = "检查实体关系")
@@ -233,8 +234,8 @@ public class MetaRelationshipResource {
 
     @ApiOperation(value = "根据实体获取实体关系草稿", tags = {"实体关系" },  notes = "根据实体获取实体关系草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/metaentities/{metaentity_id}/metarelationships/getdraft")
-    public ResponseEntity<MetaRelationshipDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id) {
-        MetaRelationship domain = new MetaRelationship();
+    public ResponseEntity<MetaRelationshipDTO> getDraftByMetaEntity(@PathVariable("metaentity_id") String metaentity_id, MetaRelationshipDTO dto) {
+        MetaRelationship domain = metarelationshipMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metarelationshipMapping.toDto(metarelationshipService.getDraft(domain)));
     }
@@ -363,8 +364,8 @@ public class MetaRelationshipResource {
 
     @ApiOperation(value = "根据系统实体获取实体关系草稿", tags = {"实体关系" },  notes = "根据系统实体获取实体关系草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/metaentities/{metaentity_id}/metarelationships/getdraft")
-    public ResponseEntity<MetaRelationshipDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id) {
-        MetaRelationship domain = new MetaRelationship();
+    public ResponseEntity<MetaRelationshipDTO> getDraftByDstSystemMetaEntity(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id, MetaRelationshipDTO dto) {
+        MetaRelationship domain = metarelationshipMapping.toDomain(dto);
         domain.setEntityId(metaentity_id);
         return ResponseEntity.status(HttpStatus.OK).body(metarelationshipMapping.toDto(metarelationshipService.getDraft(domain)));
     }

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleEngineResource.java

@@ -110,8 +110,9 @@ public class RuleEngineResource {
 
     @ApiOperation(value = "获取规则引擎草稿", tags = {"规则引擎" },  notes = "获取规则引擎草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/ruleengines/getdraft")
-    public ResponseEntity<RuleEngineDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(ruleengineMapping.toDto(ruleengineService.getDraft(new RuleEngine())));
+    public ResponseEntity<RuleEngineDTO> getDraft(RuleEngineDTO dto) {
+        RuleEngine domain = ruleengineMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(ruleengineMapping.toDto(ruleengineService.getDraft(domain)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-RuleEngine-Check-all')")

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleItemResource.java

@@ -111,8 +111,9 @@ public class RuleItemResource {
 
     @ApiOperation(value = "获取规则草稿", tags = {"规则" },  notes = "获取规则草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/ruleitems/getdraft")
-    public ResponseEntity<RuleItemDTO> getDraft() {
-        return ResponseEntity.status(HttpStatus.OK).body(ruleitemMapping.toDto(ruleitemService.getDraft(new RuleItem())));
+    public ResponseEntity<RuleItemDTO> getDraft(RuleItemDTO dto) {
+        RuleItem domain = ruleitemMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(ruleitemMapping.toDto(ruleitemService.getDraft(domain)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-RuleItem-BuildRuleFile-all')")