Browse Source

修复包错误

zhou-hao 5 years ago
parent
commit
a60d0e2236

+ 0 - 20
hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutorAutoConfiguration.java

@@ -1,20 +0,0 @@
-package org.hswebframework.web.datasource.jta;
-
-import org.hswebframework.ezorm.rdb.executor.SqlExecutor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author zhouhao
- * @see JtaJdbcSqlExecutor
- * @since 3.0
- */
-@ConditionalOnClass(SqlExecutor.class)
-@Configuration
-public class JtaJdbcSqlExecutorAutoConfiguration {
-    @Bean
-    public JtaJdbcSqlExecutor jtaJdbcSqlExecutor() {
-        return new JtaJdbcSqlExecutor();
-    }
-}

+ 1 - 6
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java

@@ -12,14 +12,10 @@ import org.hswebframework.ezorm.rdb.mapping.SyncRepository;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.metadata.RDBSchemaMetadata;
 import org.hswebframework.ezorm.rdb.metadata.RDBTableMetadata;
-import org.hswebframework.ezorm.rdb.metadata.dialect.Dialect;
 import org.hswebframework.ezorm.rdb.operator.DatabaseOperator;
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.NativeSql;
-import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;
 import org.hswebframework.web.NotFoundException;
 import org.hswebframework.web.commons.entity.DataStatus;
-import org.hswebframework.web.dao.form.DynamicFormColumnDao;
-import org.hswebframework.web.dao.form.DynamicFormDao;
 import org.hswebframework.web.dict.EnumDict;
 import org.hswebframework.web.entity.form.*;
 import org.hswebframework.web.id.IDGenerator;
@@ -52,8 +48,7 @@ import java.sql.SQLType;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.hswebframework.ezorm.core.meta.DefaultObjectType.database;
-import static org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder.*;
+import static org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder.asc;
 
 /**
  * 默认的服务实现

+ 1 - 1
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/src/main/java/org/hswebframework/web/controller/form/DynamicFormDeployLogController.java

@@ -27,7 +27,7 @@ import java.util.List;
 @RequestMapping("${hsweb.web.mappings.dynamic-form-log:dynamic/form-deploy-log}")
 @Authorize(permission = "form-deploy-log",description = "表单发布日志")
 @Api(value = "表单发布日志",tags = "动态表单-发布日志")
-public class DynamicFormDeployLogController implements QueryController<DynamicFormDeployLogEntity, String, QueryParamEntity> {
+public class DynamicFormDeployLogController implements QueryController<DynamicFormDeployLogEntity, String> {
 
     private DynamicFormDeployLogService dynamicFormDeployLogService;