diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index 9569d64..7687e7c 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -88,6 +88,18 @@ public class SysDept extends BaseEntity { * 子部门 */ private List children = new ArrayList(); + /** + * 是否授权 + */ + private Boolean IsAuth=false; + + public Boolean getAuth() { + return IsAuth; + } + + public void setAuth(Boolean auth) { + IsAuth = auth; + } public Long getDeptId () { return deptId; diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 6be7436..10d82dd 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -108,6 +108,16 @@ public class SysUser extends BaseEntity { @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; + private Boolean isAuth = false; + + public Boolean getAuth() { + return isAuth; + } + + public void setAuth(Boolean auth) { + isAuth = auth; + } + /** * 部门对象 */ diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/MuYuEtlApplication.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/MuYuEtlApplication.java deleted file mode 100644 index 69d0805..0000000 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/MuYuEtlApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.etl; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuEtlApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuEtlApplication.class, args); - } -} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/TableAssets.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/TableAssets.java deleted file mode 100644 index 0b65619..0000000 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/TableAssets.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.muyu.etl.domain.custom; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TableAssets { - - /** - * 字段名 - */ - private String name; - - /** - * 字段注释 - */ - private String comment; - - /** - * 是否主键 - */ - private String isPrimaryKey; - - /** - * 类型 - */ - private String type; - - /** - * 映射类型 - */ - private String mappingType; - - /** - * 长度 - */ - private String length; - - /** - * 小数位 - */ - private String decimalPlaces; - - /** - * 是否可为空 - */ - private String isNull; - - /** - * 默认值 - */ - private String defaultValue; - - /** - * 是否字典 - */ - private String isDict; - - /** - * 字段key - */ - private String dictKey; - -} diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/VTClass.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/VTClass.java deleted file mode 100644 index e257fe6..0000000 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/custom/VTClass.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.etl.domain.custom; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VTClass { - - private String value; - private String type; - -} diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetModelMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetModelMapper.xml deleted file mode 100644 index 94642ea..0000000 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/system/AssetModelMapper.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, data_asset_id, name, comment, is_primary_key, type, mapping_type, length, decimal_places, is_null, is_dict,default_value, dict_key, create_by, create_time, update_by, update_time, remark from asset_model - - - - - - - - insert into asset_model - - data_asset_id, - name, - comment, - is_primary_key, - type, - mapping_type, - length, - decimal_places, - is_null, - is_dict, - default_value, - dict_key, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{dataAssetId}, - #{name}, - #{comment}, - #{isPrimaryKey}, - #{type}, - #{mappingType}, - #{length}, - #{decimalPlaces}, - #{isNull}, - #{isDict}, - #{defaultValue}, - #{dictKey}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - insert into `asset_model` ( - `data_asset_id`, - `name`, - comment, - is_primary_key, - `type`, - mapping_type, - `length`, - decimal_places, - is_null, - is_dict, - default_value, - dict_key, - create_by, - create_time - ) values - - ( - #{item.dataAssetId}, - #{item.name}, - #{item.comment}, - #{item.isPrimaryKey}, - #{item.type}, - #{item.mappingType}, - #{item.length}, - #{item.decimalPlaces}, - #{item.isNull}, - #{item.isDict}, - #{item.defaultValue}, - #{item.dictKey}, - #{item.createBy}, - #{item.createTime} - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update asset_model - - data_asset_id = #{dataAssetId}, - name = #{name}, - comment = #{comment}, - is_primary_key = #{isPrimaryKey}, - type = #{type}, - mapping_type = #{mappingType}, - length = #{length}, - decimal_places = #{decimalPlaces}, - is_null = #{isNull}, - is_dict = #{isDict}, - default_value = #{defaultValue}, - dict_key = #{dictKey}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from asset_model where id = #{id} - - - - delete from asset_model where id in - - #{id} - - - diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/system/DataAssetMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/system/DataAssetMapper.xml deleted file mode 100644 index 203ec50..0000000 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/system/DataAssetMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, data_source_id, table_name, table_comment, table_count, fields, create_by, create_time, update_by, update_time, remark from data_asset - - - - - - - - insert into data_asset - - data_source_id, - table_name, - table_comment, - table_count, - fields, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{dataSourceId}, - #{tableName}, - #{tableComment}, - #{tableCount}, - #{fields}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - insert into data_asset - - data_source_id, - `table_name`, - table_comment, - table_count, - fields, - create_by, - create_time, - - values - - - #{item.dataSourceId}, - #{item.tableName}, - #{item.tableComment}, - #{item.tableCount}, - #{item.fields}, - #{item.createBy}, - #{item.createTime}, - - - - - - update data_asset - - data_source_id = #{dataSourceId}, - table_name = #{tableName}, - table_comment = #{tableComment}, - table_count = #{tableCount}, - fields = #{fields}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from data_asset where id = #{id} - - - - delete from data_asset where id in - - #{id} - - - \ No newline at end of file