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

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

@@ -252,8 +252,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
      */
     @Override
     public Page<DABuild> searchDefault(DABuildSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DABuild> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DABuild>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

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

@@ -184,8 +184,6 @@ public class DAChartServiceImpl extends ServiceImpl<DAChartMapper, DAChart> impl
      */
     @Override
     public Page<DAChart> searchDefault(DAChartSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DAChart> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DAChart>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

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

@@ -219,8 +219,6 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
      */
     @Override
     public Page<DAMetric> searchDefault(DAMetricSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DAMetric> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DAMetric>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

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

@@ -184,8 +184,6 @@ public class DAReportServiceImpl extends ServiceImpl<DAReportMapper, DAReport> i
      */
     @Override
     public Page<DAReport> searchDefault(DAReportSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DAReport> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DAReport>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java

@@ -187,8 +187,6 @@ public class DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
      */
     @Override
     public Page<DictCatalog> searchDefault(DictCatalogSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DictCatalog> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DictCatalog>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java

@@ -203,8 +203,6 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
      */
     @Override
     public Page<DictOption> searchDefault(DictOptionSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DictOption> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DictOption>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java

@@ -219,8 +219,6 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
      */
     @Override
     public Page<DstDataSource> searchDefault(DstDataSourceSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DstDataSource> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DstDataSource>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java

@@ -209,8 +209,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
      */
     @Override
     public Page<DstSystem> searchDefault(DstSystemSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DstSystem> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<DstSystem>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java

@@ -235,8 +235,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
      */
     @Override
     public Page<MetaDataSet> searchDefault(MetaDataSetSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaDataSet> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaDataSet>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java

@@ -271,8 +271,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
      */
     @Override
     public Page<MetaEntity> searchDefault(MetaEntitySearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaEntity> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaEntity>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java

@@ -258,8 +258,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
      */
     @Override
     public Page<MetaField> searchDefault(MetaFieldSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaField> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaField>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java

@@ -253,8 +253,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
      */
     @Override
     public Page<MetaModel> searchDefault(MetaModelSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaModel> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaModel>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModuleServiceImpl.java

@@ -199,8 +199,6 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod
      */
     @Override
     public Page<MetaModule> searchDefault(MetaModuleSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaModule> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaModule>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java

@@ -276,8 +276,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
      */
     @Override
     public Page<MetaRelationship> searchDefault(MetaRelationshipSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaRelationship> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<MetaRelationship>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/TableSyncServiceImpl.java

@@ -226,8 +226,6 @@ public class TableSyncServiceImpl extends ServiceImpl<TableSyncMapper, TableSync
      */
     @Override
     public Page<TableSync> searchDefault(TableSyncSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<TableSync> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<TableSync>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecLogServiceImpl.java

@@ -184,8 +184,6 @@ public class ExecLogServiceImpl extends ServiceImpl<ExecLogMapper, ExecLog> impl
      */
     @Override
     public Page<ExecLog> searchDefault(ExecLogSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ExecLog> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<ExecLog>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecResultServiceImpl.java

@@ -235,8 +235,6 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
      */
     @Override
     public Page<ExecResult> searchDefault(ExecResultSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ExecResult> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<ExecResult>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleEngineServiceImpl.java

@@ -233,8 +233,6 @@ public class RuleEngineServiceImpl extends ServiceImpl<RuleEngineMapper, RuleEng
      */
     @Override
     public Page<RuleEngine> searchDefault(RuleEngineSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<RuleEngine> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<RuleEngine>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java

@@ -238,8 +238,6 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
      */
     @Override
     public Page<RuleItem> searchDefault(RuleItemSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<RuleItem> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<RuleItem>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
 

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

@@ -126,7 +126,7 @@
 
 
     <!--输出实体[DICT_OPTION]数据结构 -->
-    <changeSet author="root" id="tab-dict_option-5-6">
+    <changeSet author="root" id="tab-dict_option-7-6">
         <createTable tableName="IBZDICTOPTION">
                 <column name="VKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
@@ -591,7 +591,7 @@
         <!--输出实体[DA_REPORT]外键关系 -->
         <!--输出实体[DICT_CATALOG]外键关系 -->
         <!--输出实体[DICT_OPTION]外键关系 -->
-    <changeSet author="root" id="fk-dict_option-5-21">
+    <changeSet author="root" id="fk-dict_option-7-21">
        <addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
     </changeSet>
         <!--输出实体[DST_DATASOURCE]外键关系 -->

ibzdst-core/src/main/resources/sysmodel/RuntimeDict.json

@@ -133,6 +133,7 @@
 
 
 
+
 
 
 ]

ibzdst-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

@@ -43,4 +43,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
         return null;
     }
 
+    @Override
+    public Map<String, Map<String, Object>> getMyTask(String system, String appName, String entity) {
+        return null;
+    }
+
 }

ibzdst-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -37,4 +37,8 @@ public interface IBZWFFeignClient
 	@RequestMapping(method = RequestMethod.GET, value = "/{system}/{entity}/{businessKey}/dataaccessmode")
 	Integer getDataAccessMode(@PathVariable("system") String system, @PathVariable("entity") String entity, @PathVariable("businessKey") Serializable businessKey);
 
+
+	@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/mytasks")
+	Map<String,Map<String,Object>> getMyTask(@PathVariable("system") String system,@PathVariable("appname") String appName,
+											 @PathVariable("entity") String entity);
 }

ibzdst-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -270,6 +270,7 @@ public class StaticDict {
     }
 
 
+
     /**
      * 代码表[页面跳转处理_页面类型]
      */

ibzdst-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,11 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+    /**
+     * 工作流标识
+     */
+    @JsonProperty("srfwf")
+    public String srfWF;
 
     /**
      * 获取工作流步骤标识