diff --git a/template/common/pom.xml b/template/common/pom.xml index 139f41b..e6e3a27 100644 --- a/template/common/pom.xml +++ b/template/common/pom.xml @@ -10,7 +10,6 @@ {{ .groupId }} {{ .artifactId }}-common - ${revision} diff --git a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java index 67ba7b0..f97713e 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java +++ b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java @@ -1,9 +1,5 @@ package {{ .package }}.common.config; -import io.micrometer.core.instrument.Clock; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.MockClock; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; diff --git a/template/common/src/main/java/{{.packagePath}}/common/utils/JsonUtils.java b/template/common/src/main/java/{{.packagePath}}/common/utils/JsonUtils.java deleted file mode 100644 index 137bd3c..0000000 --- a/template/common/src/main/java/{{.packagePath}}/common/utils/JsonUtils.java +++ /dev/null @@ -1,113 +0,0 @@ -package {{ .package }}.common.utils; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.MissingNode; -import com.vs.ox.common.utils.ObjectMapperFactory; - -import java.io.IOException; -import java.util.Optional; - -public class JsonUtils { - - private static final ObjectMapper objectMapper = ObjectMapperFactory.getDefaultObjectMapper(); - - static { - objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); - } - - public static ObjectMapper getObjectMapper() { - return objectMapper; - } - - public static String toJson(Object value) { - try { - return objectMapper.writeValueAsString(value); - } catch (JsonProcessingException e) { - throw new IllegalStateException("to Json error", e); - } - } - - public static T readObject(String json, TypeReference typeReference) { - return readObject(json, objectMapper.getTypeFactory().constructType(typeReference)); - } - - public static T readObject(String json, Class clazz) { - return readObject(json, objectMapper.getTypeFactory().constructType(clazz)); - } - - public static T readObject(byte[] json, Class clazz) { - try { - return objectMapper.readValue(json, clazz); - } catch (IOException e) { - throw new IllegalStateException("read Json error", e); - } - } - - public static T readObject(String json, JavaType javaType) { - if (isBlank(json)) { - return null; - } - try { - return objectMapper.readValue(json, javaType); - } catch (IOException e) { - throw new IllegalStateException("read Json error", e); - } - } - - public static JsonNode path(String json, String path) { - if (isBlank(json)) { - return MissingNode.getInstance(); - } - try { - String atPath = path; - if (!path.startsWith("/")) { - atPath = "/" + path; - } - return objectMapper.readTree(json).at(atPath); - } catch (IOException e) { - throw new IllegalStateException("read Json error", e); - } - } - - private static boolean isBlank(String str) { - int strLen; - if (str == null || (strLen = str.length()) == 0) { - return true; - } - for (int i = 0; i < strLen; i++) { - if ((!Character.isWhitespace(str.charAt(i)))) { - return false; - } - } - return true; - } - - public static Optional readPath(String json, String path, TypeReference typeReference) { - return readPath(json, path, objectMapper.getTypeFactory().constructType(typeReference)); - } - - public static Optional readPath(String json, String path, Class clazz) { - JsonNode jsonNode = path(json, path); - if (jsonNode.isMissingNode()) { - return Optional.empty(); - } - try { - return Optional.of(objectMapper.treeToValue(jsonNode, clazz)); - } catch (JsonProcessingException e) { - throw new IllegalStateException(e); - } - } - - public static Optional readPath(String json, String path, JavaType javaType) { - JsonNode jsonNode = path(json, path); - if (jsonNode.isMissingNode()) { - return Optional.empty(); - } - return Optional.of(objectMapper.convertValue(jsonNode, javaType)); - } -} diff --git a/template/entrance/README.md b/template/entrance/README.md new file mode 100644 index 0000000..57f8ae9 --- /dev/null +++ b/template/entrance/README.md @@ -0,0 +1 @@ +> 应用入口 \ No newline at end of file diff --git a/template/entrance/pom.xml b/template/entrance/pom.xml new file mode 100644 index 0000000..c3a0c00 --- /dev/null +++ b/template/entrance/pom.xml @@ -0,0 +1,24 @@ + + + + 4.0.0 + + {{ .groupId }} + {{ .artifactId }} + {{ .version }} + + {{ .artifactId }}-entrance + {{ .version }} + pom + + + {{ .groupId }} + {{ .artifactId }}-common + {{ .version }} + + + + mq + web + + \ No newline at end of file diff --git a/template/entrance/web/pom.xml b/template/entrance/web/pom.xml new file mode 100644 index 0000000..5cceb5c --- /dev/null +++ b/template/entrance/web/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + {{ .groupId }} + {{ .artifactId }}-entrance + {{ .version }} + + + {{ .artifactId }}-entrance-web + + + + com.toco + vs-sqlmapper-spring + + + {{ .groupId }} + {{ .artifactId }}-entrance-mq + {{ .version }} + + + diff --git a/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java b/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java new file mode 100644 index 0000000..144d9b9 --- /dev/null +++ b/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java @@ -0,0 +1,24 @@ +package {{ .package }}.entrance.web; + +import com.vs.sqlmapper.spring.DataSourceConfig; +import com.vs.sqlmapper.spring.scan.VSDaoBeanScan; +import com.vs.agent.TocoAgentInitializer; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; + +@SpringBootApplication(scanBasePackages = {"{{.groupId}}", "com.vs"}) +@VSDaoBeanScan(basePackages = {"com.vs","{{.groupId}}"}) +@Import(DataSourceConfig.class) +@MapperScan("{{.groupId}}.**.persist.mapper.mybatis") +public class AppApplication{ + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(AppApplication.class); + application.addInitializers(new TocoAgentInitializer()); + application.run(args); + } +} diff --git a/template/entrance/web/src/main/resources/application-local.properties b/template/entrance/web/src/main/resources/application-local.properties new file mode 100644 index 0000000..777b292 --- /dev/null +++ b/template/entrance/web/src/main/resources/application-local.properties @@ -0,0 +1,130 @@ +server.port=8082 +endpoints.enabled=false +server.forward-headers-strategy=framework +#custom corss-domain headers, split by ',' +cross.domain.headers= +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration + +base.package={{.groupId}} +mock.enabled=true +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- else if eq .dbType "dm"}} +spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} +spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +vs.sqlmapper.dialect=oracle +{{- else if eq .dbType "dm" }} +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver +hibernate.dialect=org.hibernate.dialect.DmDialect +vs.sqlmapper.dialect=dm +{{- end }} +hibernate.show_sql=true +vs.sqlmapper.showSql=true +spring.datasource.tomcat.max-age=3600000 +spring.jpa.open-in-view=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} + + +# flyway +spring.flyway.enabled=false +spring.flyway.outOfOrder=true +spring.flyway.baselineOnMigrate=true +spring.upload.file.path=/data/upload +spring.exception.isHtmlRequired=false +#spring.main.lazy-initialization=true +application.name=libawall +mybatis.configuration.map-underscore-to-camel-case=true +spring.url.aaa=http://localhost:8080 +spring.websocket.enabled=false +spring.application.name=libawall +spring.security.enabled=false +spring.login.security.enableRoleRequired=false +spring.login.security.login=false +spring.security.authignored=/api/**,/rpc/** + +#rocketmq +rocketmq.name-server=${ROCKETMQ_HOST:10.0.2.221:9876;10.0.2.222:9876;10.0.2.223:9876} +rocketmq.topic=${DB_DATABASE:hande_test} +rocketmq.consumerGroup=CID_handeTest +rocketmq.tag=* +rocketmq.producer.group=PID_handeTest +spring.main.allow-circular-references=true +spring.login.security.csrf=false + +spring.main.allow-bean-definition-overriding=true +spring.mvc.pathmatch.matching-strategy=ant_path_matcher + + +#elasticsearch +#essql.hosts=${OPENSEARCH_HOST:10.0.2.221,10.0.2.222,10.0.2.223} +#essql.port=9200 +#essql.username=${OPENSEARCH_USER:admin} +#essql.password=${OPENSEARCH_PASSWORD:dnZkaNVK} +#essql.scheme=${OPENSEARCH_SCHEME:https} + +#get user config +get_user_uri={} + +#request header +out.request.headers= +#response header +out.response.headers=Content-Type +#eg:https://vsstudio.teitui.com +out.host= + +#xxljob +xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:https://xxljob.teitui.com/xxl-job-admin} +xxl.job.executor.port=9999 +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token +xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} +xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} + +#redis +redis-config.pool.hostAndPort=${REDIS_HOST:redis.byteawake.com:6379} +redis-config.pool.password=${REDIS_PASSWORD:} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 +redis-config.pool.maxWaitMillis=10000 +redis-config.pool.softMinEvictableIdleTimeMillis=10000 +redis-config.pool.testOnBorrow=true +redis-config.pool.testOnReturn=true +redis-config.pool.testWhileIdle=true +redis-config.pool.timeBetweenEvictionRunsMillis=30000 +redis-config.pool.minEvictableIdleTimeMillis=1800000 +redis-config.pool.numTestsPerEvictionRun=3 +redis-config.pool.blockWhenExhausted=true +redis-config.pool.jmxEnabled=true +redis-config.pool.lifo=true + +#flow config +liteflow.rule-source=el_json:com.vs.flow.FlowRuleSource +liteflow.print-banner=false +liteflow.monitor.enable-log=true + +#create default table auto +vs.db.basetable.create=true + diff --git a/template/entrance/web/src/main/resources/application-online.properties b/template/entrance/web/src/main/resources/application-online.properties new file mode 100644 index 0000000..f05bbdb --- /dev/null +++ b/template/entrance/web/src/main/resources/application-online.properties @@ -0,0 +1,116 @@ +server.port=8080 +endpoints.enabled=false +server.forward-headers-strategy=framework +#custom corss-domain headers, split by ',' +cross.domain.headers= +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration + +base.package={{.groupId}} +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- else if eq .dbType "dm"}} +spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} +spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +vs.sqlmapper.dialect=oracle +{{- else if eq .dbType "dm" }} +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver +hibernate.dialect=org.hibernate.dialect.DmDialect +vs.sqlmapper.dialect=dm +{{- end }} +hibernate.show_sql=true +vs.sqlmapper.showSql=true +spring.datasource.tomcat.max-age=3600000 +spring.jpa.open-in-view=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} + +# flyway +spring.flyway.enabled=false +spring.flyway.outOfOrder=true +spring.flyway.baselineOnMigrate=true + +mybatis.configuration.map-underscore-to-camel-case=true + +#rocketmq +rocketmq.name-server=${ROCKETMQ_HOST} +rocketmq.topic=hande_test +rocketmq.consumerGroup=CID_handeTest +rocketmq.tag=* +rocketmq.producer.group=PID_handeTest + +spring.main.allow-circular-references=true +spring.login.security.csrf=false + +spring.main.allow-bean-definition-overriding=true +spring.mvc.pathmatch.matching-strategy=ant_path_matcher + +#elasticsearch +#essql.hosts=${OPENSEARCH_HOST} +#essql.port=9200 +#essql.username=${OPENSEARCH_USER:admin} +#essql.password=${OPENSEARCH_PASSWORD:admin} +#essql.scheme=${OPENSEARCH_SCHEME:https} + +#get user config +get_user_uri={} + +#request header +out.request.headers= +#response header +out.response.headers=Content-Type +out.host= + +#xxljob +xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS} +xxl.job.executor.port=9999 +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token +xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} +xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} + +#redis +redis-config.pool.hostAndPort=${REDIS_HOST} +redis-config.pool.password=${REDIS_PASSWORD} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 +redis-config.pool.maxWaitMillis=10000 +redis-config.pool.softMinEvictableIdleTimeMillis=10000 +redis-config.pool.testOnBorrow=true +redis-config.pool.testOnReturn=true +redis-config.pool.testWhileIdle=true +redis-config.pool.timeBetweenEvictionRunsMillis=30000 +redis-config.pool.minEvictableIdleTimeMillis=1800000 +redis-config.pool.numTestsPerEvictionRun=3 +redis-config.pool.blockWhenExhausted=true +redis-config.pool.jmxEnabled=true +redis-config.pool.lifo=true + +#flow config +liteflow.rule-source=el_json:com.vs.flow.FlowRuleSource +liteflow.print-banner=false +liteflow.monitor.enable-log=true + +#create default table auto +vs.db.basetable.create=true diff --git a/template/entrance/web/src/main/resources/application-remote.properties b/template/entrance/web/src/main/resources/application-remote.properties new file mode 100644 index 0000000..c24b7da --- /dev/null +++ b/template/entrance/web/src/main/resources/application-remote.properties @@ -0,0 +1,118 @@ +server.port=8080 +endpoints.enabled=false +server.forward-headers-strategy=framework +#custom corss-domain headers, split by ',' +cross.domain.headers= +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration + +base.package={{.groupId}} +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- else if eq .dbType "dm"}} +spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} +spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +vs.sqlmapper.dialect=oracle +{{- else if eq .dbType "dm" }} +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver +hibernate.dialect=org.hibernate.dialect.DmDialect +vs.sqlmapper.dialect=dm +{{- end }} +vs.sqlmapper.showSql=true +hibernate.show_sql=true + +spring.datasource.tomcat.max-age=3600000 +spring.jpa.open-in-view=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} + +# flyway +spring.flyway.enabled=false +spring.flyway.outOfOrder=true +spring.flyway.baselineOnMigrate=true + +mybatis.configuration.map-underscore-to-camel-case=true + +#rocketmq +rocketmq.name-server=${ROCKETMQ_HOST:10.0.2.221:9876;10.0.2.222:9876;10.0.2.223:9876} +rocketmq.topic=${MYSQL_DATABASE:hande_test} +rocketmq.consumerGroup=CID_handeTest +rocketmq.tag=* +rocketmq.producer.group=PID_handeTest + +spring.main.allow-circular-references=true +spring.login.security.csrf=false + +spring.main.allow-bean-definition-overriding=true +spring.mvc.pathmatch.matching-strategy=ant_path_matcher + +#elasticsearch +#essql.hosts=${OPENSEARCH_HOST:10.0.2.221,10.0.2.222,10.0.2.223} +#essql.port=9200 +#essql.username=${OPENSEARCH_USER:admin} +#essql.password=${OPENSEARCH_PASSWORD:dnZkaNVK} +#essql.scheme=${OPENSEARCH_SCHEME:https} + +#get user config +get_user_uri={} + +#request header +out.request.headers= +#response header +out.response.headers=Content-Type +#eg:https://vsstudio.teitui.com +out.host= + +#xxljob +xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:https://xxljob.teitui.com/xxl-job-admin} +xxl.job.executor.port=9999 +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token +xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} +xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} + +#redis +redis-config.pool.hostAndPort=${REDIS_HOST:redis.byteawake.com:6379} +redis-config.pool.password=${REDIS_PASSWORD:} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 +redis-config.pool.maxWaitMillis=10000 +redis-config.pool.softMinEvictableIdleTimeMillis=10000 +redis-config.pool.testOnBorrow=true +redis-config.pool.testOnReturn=true +redis-config.pool.testWhileIdle=true +redis-config.pool.timeBetweenEvictionRunsMillis=30000 +redis-config.pool.minEvictableIdleTimeMillis=1800000 +redis-config.pool.numTestsPerEvictionRun=3 +redis-config.pool.blockWhenExhausted=true +redis-config.pool.jmxEnabled=true +redis-config.pool.lifo=true + +#flow config +liteflow.rule-source=el_json:com.vs.flow.FlowRuleSource +liteflow.print-banner=false +liteflow.monitor.enable-log=true + +#create default table auto +vs.db.basetable.create=true \ No newline at end of file diff --git a/template/entrance/web/src/main/resources/application.properties b/template/entrance/web/src/main/resources/application.properties new file mode 100644 index 0000000..11b4c7d --- /dev/null +++ b/template/entrance/web/src/main/resources/application.properties @@ -0,0 +1,10 @@ +spring.profiles.active=local +envs=local,remote,online,custom +spring.main.allow-bean-definition-overriding=true +project_id=${projectId} +project_name=handeTest +check=true +spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER +#注销掉es的自动装配 +spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration +com.toco.agent.attach=true \ No newline at end of file diff --git a/template/entrance/web/src/main/resources/visitor_agents.conf b/template/entrance/web/src/main/resources/visitor_agents.conf new file mode 100644 index 0000000..ae84c2a --- /dev/null +++ b/template/entrance/web/src/main/resources/visitor_agents.conf @@ -0,0 +1,26 @@ +[debug.server.host] +// 这块，目前基本是写死这样的配置，不要修改 +vs.debug.host = http://vsstudio.teitui.com + +[debug.proxy.custom] +// 定义需要增强的classs，没有增加的class不记录堆栈 +// 一般明显不需要记录的class，配置成： class.name=false +// 正则表述式支持，请注意书写 +// class.pattern = true 表示要增强记录堆栈的 + +// 自定义的增加的类 + +com.vs.entrance.controller.env.register.DebugEnvRegisterTask=false +com.vs.common.util.rpc.pub.PublicInterfaceExecutor = true +[execute] +com.vs.common.util.rpc.pub.PublicInterfaceFilter = true +[doFilter] +org.springframework.http.converter.json.MappingJackson2HttpMessageConverter=true + +com.vs.sqlmapper.core.SqlManagerImpl = true +[sqlWatcher] +com.vs.common.util.rpc.RpcMethodExecutor = true + +[debug.proxy.service] +// 默认支持serivce下面的所有类，放到最后一行 + +.*?\.service[\.\w_]+ = true -[set*, get*] +.*?\.controller[\.\w_]+ = true -[set*, get*] +.*?\.hibernate[\.\w_]+ = false \ No newline at end of file diff --git a/template/pom.xml b/template/pom.xml index 734cfb7..356cb9d 100644 --- a/template/pom.xml +++ b/template/pom.xml @@ -3,495 +3,408 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.dromara - ruoyi-vue-plus - ${revision} - - RuoYi-Vue-Plus - https://gitee.com/dromara/RuoYi-Vue-Plus - RuoYi-Vue-Plus多租户管理系统 - + + org.springframework.boot + spring-boot-starter-parent + 3.2.11 + + {{ .groupId }} + {{ .artifactId }} + {{ .version }} + pom - 5.2.3 - 3.2.11 UTF-8 - UTF-8 - 17 - 3.5.16 - 2.6.0 - 0.15.0 - 4.0.3 - 2.3 - 1.39.0 - 3.5.8 - 3.9.1 - 5.8.31 - 3.2.3 - 3.37.0 - 2.2.7 - 4.3.1 - 1.1.2 - 1.4.5 - 0.2.0 - 1.18.34 - 1.76 - 1.16.6 - - 2.7.0 - - - 2.28.22 - 0.31.3 - - 3.3.3 - - 1.2.83 - - 8.7.2-20241022 - - 7.0.1 - - - 3.2.2 - 3.2.2 - 3.11.0 - 3.1.2 - 1.3.0 + 17 + 17 + UTF-8 + 1.4.8 + 5.2.4 + 5.7.4 + 2.2 + 7.3.1 + 3.2.1 + 1.2 + 4.0.63 + 4.1.48.Final + 2.8.6 + 3.2.1 + 8.0.11 + 2.0.7 + 4.13 + 6.6.4.Final + 1.18.20 + 4.7.1 + 2.3.1 + 5.7.4 + 1.3 + 3.2.1 + 1.0.0-SNAPSHOT + 3.3.0 + 3.2.1 + 1.9.6 + 2.2.0 + 3.3.0 + 2.9.2 + 2.9.2 + 1.5.22 + 4.0.1 + 2.15.2 + 4.5.13 + 32.0.0-jre + 2.5.0 + 3.12.0 + 2.12.3 + 4.1.5 + 4.7.1 + 20170516 + 2.23.1 + 2.1.1 - - - - local - - - local - info - ruoyi - 123456 - - - - dev - - - dev - info - ruoyi - 123456 - - - - true - - - - prod - - prod - warn - ruoyi - 123456 - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - cn.hutool - hutool-bom - ${hutool.version} - pom - import + hutool-all + ${cn.hutool.all} - - org.flowable - flowable-bom - ${flowable.version} - pom - import + junit + junit + ${junit.version} + test - - - me.zhyd.oauth - JustAuth - ${justauth.version} + ch.qos.logback + logback-classic + ${logback.classic.version} - - - org.dromara - ruoyi-common-bom - ${revision} - pom - import + org.flywaydb + flyway-core + ${flyway.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc.version} - - - - com.github.therapi - therapi-runtime-javadoc - ${therapi-javadoc.version} - - - - org.projectlombok - lombok - ${lombok.version} - - com.alibaba - easyexcel - ${easyexcel.version} + transmittable-thread-local + ${transmittable-thread-local.version} - - - org.apache.velocity - velocity-engine-core - ${velocity.version} + org.json + json + ${org.json.version} - - - cn.dev33 - sa-token-spring-boot3-starter - ${satoken.version} + org.apache.httpcomponents + httpasyncclient + ${httpasyncclient.version} - - cn.dev33 - sa-token-jwt - ${satoken.version} + org.slf4j + slf4j-api + ${slf4j-api.version} + + + com.google.guava + guava + ${guava.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpmime + ${httpclient.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + io.swagger + swagger-models + 1.5.21 + + + io.springfox + springfox-swagger-ui + ${springfox-swagger-ui.version} + + + io.springfox + springfox-swagger2 + ${springfox-swagger2.version} - cn.hutool - hutool-all + io.swagger + swagger-annotations + + + io.swagger + swagger-models - cn.dev33 - sa-token-core - ${satoken.version} - - - - - com.baomidou - dynamic-datasource-spring-boot3-starter - ${dynamic-ds.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - - com.baomidou - mybatis-plus-spring-boot3-starter - ${mybatis-plus.version} - - - - com.baomidou - mybatis-plus-annotation - ${mybatis-plus.version} - - - - - p6spy - p6spy - ${p6spy.version} - - - - - software.amazon.awssdk - s3 - ${aws.sdk.version} - - - - software.amazon.awssdk.crt - aws-crt - ${aws.crt.version} - - - - software.amazon.awssdk - s3-transfer-manager - ${aws.sdk.version} - - - - org.dromara.sms4j - sms4j-spring-boot-starter - ${sms4j.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} + cglib + cglib-nodep + ${cglib-nodep.version} - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - - - com.aizuda - snail-job-client-starter - ${snailjob.version} + com.xuxueli + xxl-job-core + ${xxl-job-core.version} - com.aizuda - snail-job-client-job-core - ${snailjob.version} + org.apache.commons + commons-lang3 + ${commons-lang3.version} - - - org.bouncycastle - bcprov-jdk15to18 - ${bouncycastle.version} + org.aspectj + aspectjrt + ${org.aspectj.version} - - io.github.linpeilie - mapstruct-plus-spring-boot-starter - ${mapstruct-plus.version} + redis.clients + jedis + ${jedis.version} - - - org.lionsoul - ip2region - ${ip2region.version} + org.springframework.boot + spring-boot-starter-data-jpa + ${spring-boot-starter-data-jpa.version} - - commons-io - commons-io - 2.15.0 + cn.hutool + hutool-all + ${hutool-all.version} - - com.alibaba - fastjson - ${fastjson.version} + org.apache.rocketmq + rocketmq-spring-boot + ${rocketmq-spring-boot.version} - - org.dromara - ruoyi-system - ${revision} + org.apache.rocketmq + rocketmq-tools + ${rocketmq-tools.version} + + + com.alibaba + fastjson + + + ch.qos.logback + ogback-classic + + - - org.dromara - ruoyi-job - ${revision} + org.apache.rocketmq + rocketmq-client + ${rocketmq-client.version} - - org.dromara - ruoyi-generator - ${revision} + org.projectlombok + lombok + ${lobmook.version} - - org.dromara - ruoyi-demo - ${revision} + org.springframework.boot + spring-boot-dependencies + ${spring-boot-dependencies.version} + pom + import - - - org.dromara - ruoyi-workflow - ${revision} + commons-logging + commons-logging + ${commons-logging.version} + + + com.caucho + hessian + ${hession.version} + + + org.hibernate + hibernate-core + ${hibernate.version} - - - - ruoyi-admin - ruoyi-common - ruoyi-extend - ruoyi-modules - common - - pom - + + + org.aspectj + aspectjrt + ${org.aspectj.version} + + + org.aspectj + aspectjweaver + ${org.aspectj.version} + + + org.springframework.boot + spring-boot-starter-test + + + org.glassfish + javax.el + 3.0.0 + + + org.apache.logging.log4j + log4j-core + 2.17.0 + + + com.baomidou + mybatis-plus-boot-starter + 3.5.7 + provided + + + org.mybatis + mybatis-spring + 3.0.4 + + + mysql + mysql-connector-java + 8.0.26 + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + + + jakarta.transaction + jakarta.transaction-api + 2.0.1 + + + jakarta.validation + jakarta.validation-api + + + org.springframework + spring-orm + + + com.alibaba + transmittable-thread-local + + + org.springframework + spring-webmvc + + + org.apache.httpcomponents + httpasyncclient + + + org.springframework + spring-web + + + org.hibernate.orm + hibernate-core + + + io.springfox + springfox-spring-web + 3.0.0 + + + org.apache.rocketmq + rocketmq-spring-boot + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.apache.rocketmq + rocketmq-tools + + + org.apache.rocketmq + rocketmq-client + + + org.apache.tomcat + tomcat-jdbc + 9.0.83 + + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.rocketmq + rocketmq-remoting + ${rocketmq-client.version} + + + cn.hutool + hutool-all + + + com.toco + toco-all-spring6-springboot3 + 1.0-SNAPSHOT + + + com.xuxueli + xxl-job-core + ${xxl-job-core.version} + + org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.verison} - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - com.github.therapi - therapi-runtime-javadoc-scribe - ${therapi-javadoc.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.springframework.boot - spring-boot-configuration-processor - ${spring-boot.version} - - - io.github.linpeilie - mapstruct-plus-processor - ${mapstruct-plus.version} - - - org.projectlombok - lombok-mapstruct-binding - ${mapstruct-plus.lombok.version} - - - - -parameters - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} + maven-resources-plugin + 3.3.1 - -Dfile.encoding=UTF-8 - - ${profiles.active} - - exclude + UTF-8 - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} + org.springframework.boot + spring-boot-maven-plugin - true - resolveCiFriendliesOnly + true - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - src/main/resources - - false - - - src/main/resources - - - application* - bootstrap* - banner* - - - true - - - - - - public - huawei nexus - https://mirrors.huaweicloud.com/repository/maven/ - - true - - - - - - - public - huawei nexus - https://mirrors.huaweicloud.com/repository/maven/ - - true - - - false - - - - + + entrance + common + diff --git a/template/ruoyi-admin/Dockerfile b/template/ruoyi-admin/Dockerfile deleted file mode 100644 index 737cbfc..0000000 --- a/template/ruoyi-admin/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-debian:17.0.11-cds -#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds -#FROM findepi/graalvm:java17-native - -LABEL maintainer="Lion Li" - -RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp \ - /ruoyi/skywalking/agent - -WORKDIR /ruoyi/server - -ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" - -EXPOSE ${SERVER_PORT} - -ADD ./target/ruoyi-admin.jar ./app.jar - -ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ - # 应用名称 如果想区分集群节点监控 改成不同的名称即可 - #-Dskywalking.agent.service_name=ruoyi-server \ - #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ - -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \ - -jar app.jar - diff --git a/template/ruoyi-admin/pom.xml b/template/ruoyi-admin/pom.xml deleted file mode 100644 index 4d1a702..0000000 --- a/template/ruoyi-admin/pom.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - jar - ruoyi-admin - - - web服务入口 - - - - - - - com.mysql - mysql-connector-j - - - - - - - - - - - - - - - - - - - - - - - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-social - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-system - - - - org.dromara - ruoyi-job - - - - - org.dromara - ruoyi-generator - - - - - org.dromara - ruoyi-demo - - - - - org.dromara - ruoyi-workflow - - - - de.codecentric - spring-boot-admin-starter-client - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - com.spring3_test - spring3_test-common - 1.0-SNAPSHOT - - - com.spring3_test - account-entrance-web - 3.0-SNAPSHOT - - - com.spring3_test - account-entrance-rpc - 3.0-SNAPSHOT - - - - - - - - - - - - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - ${project.artifactId} - - - - - - diff --git a/template/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/template/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java deleted file mode 100644 index 4e128bf..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara; - -import com.vs.sqlmapper.spring.DataSourceConfig; -import com.vs.sqlmapper.spring.scan.VSDaoBeanScan; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; -import org.springframework.context.annotation.Import; - -/** - * 启动程序 - * - * @author Lion Li - */ -// -@SpringBootApplication(scanBasePackages = {"com.spring3_test","org.dromara", "com.vs"}) -@VSDaoBeanScan(basePackages = {"com.vs","com.spring3_test"}) -@Import(DataSourceConfig.class) -@MapperScan(basePackages = {"com.spring3_test.**.persist.mapper.mybatis","org.dromara.system.mapper"}) -public class DromaraApplication { - - - public static void main(String[] args) { - SpringApplication application = new SpringApplication(DromaraApplication.class); - application.setApplicationStartup(new BufferingApplicationStartup(2048)); - application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/template/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java deleted file mode 100644 index 066a683..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * web容器中进行部署 - * - * @author Lion Li - */ -public class DromaraServletInitializer extends SpringBootServletInitializer { - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(DromaraApplication.class); - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/template/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java deleted file mode 100644 index b561693..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ /dev/null @@ -1,234 +0,0 @@ -package org.dromara.web.controller; - -import cn.dev33.satoken.annotation.SaIgnore; -import cn.dev33.satoken.exception.NotLoginException; -import cn.hutool.core.codec.Base64; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import jakarta.servlet.http.HttpServletRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import me.zhyd.oauth.model.AuthResponse; -import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.request.AuthRequest; -import me.zhyd.oauth.utils.AuthStateUtils; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginBody; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.utils.*; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.sse.dto.SseMessageDto; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysSocialService; -import org.dromara.system.service.ISysTenantService; -import org.dromara.web.domain.vo.LoginTenantVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.domain.vo.TenantListVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * 认证 - * - * @author Lion Li - */ -@Slf4j -@SaIgnore -@RequiredArgsConstructor -@RestController -@RequestMapping("/auth") -public class AuthController { - - private final SocialProperties socialProperties; - private final SysLoginService loginService; - private final SysRegisterService registerService; - private final ISysConfigService configService; - private final ISysTenantService tenantService; - private final ISysSocialService socialUserService; - private final ISysClientService clientService; - private final ScheduledExecutorService scheduledExecutorService; - - - /** - * 登录方法 - * - * @param body 登录信息 - * @return 结果 - */ - @ApiEncrypt - @PostMapping("/login") - public R login(@RequestBody String body) { - LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class); - ValidatorUtils.validate(loginBody); - // 授权类型和客户端id - String clientId = loginBody.getClientId(); - String grantType = loginBody.getGrantType(); - SysClientVo client = clientService.queryByClientId(clientId); - // 查询不到 client 或 client 内不包含 grantType - if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) { - log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType); - return R.fail(MessageUtils.message("auth.grant.type.error")); - } else if (!UserConstants.NORMAL.equals(client.getStatus())) { - return R.fail(MessageUtils.message("auth.grant.type.blocked")); - } - // 校验租户 - loginService.checkTenant(loginBody.getTenantId()); - // 登录 - LoginVo loginVo = IAuthStrategy.login(body, client, grantType); - - Long userId = LoginHelper.getUserId(); - scheduledExecutorService.schedule(() -> { - SseMessageDto dto = new SseMessageDto(); - dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); - dto.setUserIds(List.of(userId)); - SseMessageUtils.publishMessage(dto); - }, 5, TimeUnit.SECONDS); - return R.ok(loginVo); - } - - /** - * 第三方登录请求 - * - * @param source 登录来源 - * @return 结果 - */ - @GetMapping("/binding/{source}") - public R authBinding(@PathVariable("source") String source, - @RequestParam String tenantId, @RequestParam String domain) { - SocialLoginConfigProperties obj = socialProperties.getType().get(source); - if (ObjectUtil.isNull(obj)) { - return R.fail(source + "平台账号暂不支持"); - } - AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); - Map map = new HashMap<>(); - map.put("tenantId", tenantId); - map.put("domain", domain); - map.put("state", AuthStateUtils.createState()); - String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8)); - return R.ok("操作成功", authorizeUrl); - } - - /** - * 第三方登录回调业务处理 绑定授权 - * - * @param loginBody 请求体 - * @return 结果 - */ - @PostMapping("/social/callback") - public R socialCallback(@RequestBody SocialLoginBody loginBody) { - // 获取第三方登录信息 - AuthResponse response = SocialUtils.loginAuth( - loginBody.getSource(), loginBody.getSocialCode(), - loginBody.getSocialState(), socialProperties); - AuthUser authUserData = response.getData(); - // 判断授权响应是否成功 - if (!response.ok()) { - return R.fail(response.getMsg()); - } - loginService.socialRegister(authUserData); - return R.ok(); - } - - - /** - * 取消授权 - * - * @param socialId socialId - */ - @DeleteMapping(value = "/unlock/{socialId}") - public R unlockSocial(@PathVariable Long socialId) { - Boolean rows = socialUserService.deleteWithValidById(socialId); - return rows ? R.ok() : R.fail("取消授权失败"); - } - - - /** - * 退出登录 - */ - @PostMapping("/logout") - public R logout() { - loginService.logout(); - return R.ok("退出成功"); - } - - /** - * 用户注册 - */ - @ApiEncrypt - @PostMapping("/register") - public R register(@Validated @RequestBody RegisterBody user) { - if (!configService.selectRegisterEnabled(user.getTenantId())) { - return R.fail("当前系统没有开启注册功能！"); - } - registerService.register(user); - return R.ok(); - } - - /** - * 登录页面租户下拉框 - * - * @return 租户列表 - */ - @GetMapping("/tenant/list") - public R tenantList(HttpServletRequest request) throws Exception { - // 返回对象 - LoginTenantVo result = new LoginTenantVo(); - boolean enable = TenantHelper.isEnable(); - result.setTenantEnabled(enable); - // 如果未开启租户这直接返回 - if (!enable) { - return R.ok(result); - } - - List tenantList = tenantService.queryList(new SysTenantBo()); - List voList = MapstructUtils.convert(tenantList, TenantListVo.class); - try { - // 如果只超管返回所有租户 - if (LoginHelper.isSuperAdmin()) { - result.setVoList(voList); - return R.ok(result); - } - } catch (NotLoginException ignored) { - } - - // 获取域名 - String host; - String referer = request.getHeader("referer"); - if (StringUtils.isNotBlank(referer)) { - // 这里从referer中取值是为了本地使用hosts添加虚拟域名，方便本地环境调试 - host = referer.split("//")[1].split("/")[0]; - } else { - host = new URL(request.getRequestURL().toString()).getHost(); - } - // 根据域名进行筛选 - List list = StreamUtils.filter(voList, vo -> - StringUtils.equals(vo.getDomain(), host)); - result.setVoList(CollUtil.isNotEmpty(list) ? list : voList); - return R.ok(result); - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/template/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java deleted file mode 100644 index 1a476a9..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.dromara.web.controller; - -import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.captcha.AbstractCaptcha; -import cn.hutool.captcha.generator.CodeGenerator; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.RandomUtil; -import jakarta.validation.constraints.NotBlank; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mail.config.properties.MailProperties; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.common.web.enums.CaptchaType; -import org.dromara.sms4j.api.SmsBlend; -import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.core.factory.SmsFactory; -import org.dromara.web.domain.vo.CaptchaVo; -import org.springframework.expression.Expression; -import org.springframework.expression.ExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.Duration; -import java.util.LinkedHashMap; - -/** - * 验证码操作处理 - * - * @author Lion Li - */ -@SaIgnore -@Slf4j -@Validated -@RequiredArgsConstructor -@RestController -public class CaptchaController { - - private final CaptchaProperties captchaProperties; - private final MailProperties mailProperties; - - /** - * 短信验证码 - * - * @param phonenumber 用户手机号 - */ - @RateLimiter(key = "#phonenumber", time = 60, count = 1) - @GetMapping("/resource/sms/code") - public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { - String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber; - String code = RandomUtil.randomNumbers(4); - RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - // 验证码模板id 自行处理 (查数据库或写死均可) - String templateId = ""; - LinkedHashMap map = new LinkedHashMap<>(1); - map.put("code", code); - SmsBlend smsBlend = SmsFactory.getSmsBlend("config1"); - SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map); - if (!smsResponse.isSuccess()) { - log.error("验证码短信发送异常 => {}", smsResponse); - return R.fail(smsResponse.getData().toString()); - } - return R.ok(); - } - - /** - * 邮箱验证码 - * - * @param email 邮箱 - */ - @RateLimiter(key = "#email", time = 60, count = 1) - @GetMapping("/resource/email/code") - public R emailCode(@NotBlank(message = "{user.email.not.blank}") String email) { - if (!mailProperties.getEnabled()) { - return R.fail("当前系统没有开启邮箱功能！"); - } - String key = GlobalConstants.CAPTCHA_CODE_KEY + email; - String code = RandomUtil.randomNumbers(4); - RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - try { - MailUtils.sendText(email, "登录验证码", "您本次验证码为：" + code + "，有效性为" + Constants.CAPTCHA_EXPIRATION + "分钟，请尽快填写。"); - } catch (Exception e) { - log.error("验证码短信发送异常 => {}", e.getMessage()); - return R.fail(e.getMessage()); - } - return R.ok(); - } - - /** - * 生成验证码 - */ - @RateLimiter(time = 60, count = 10, limitType = LimitType.IP) - @GetMapping("/auth/code") - public R getCode() { - CaptchaVo captchaVo = new CaptchaVo(); - boolean captchaEnabled = captchaProperties.getEnable(); - if (!captchaEnabled) { - captchaVo.setCaptchaEnabled(false); - return R.ok(captchaVo); - } - // 保存验证码信息 - String uuid = IdUtil.simpleUUID(); - String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid; - // 生成验证码 - CaptchaType captchaType = captchaProperties.getType(); - boolean isMath = CaptchaType.MATH == captchaType; - Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength(); - CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length); - AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz()); - captcha.setGenerator(codeGenerator); - captcha.createCode(); - // 如果是数学验证码，使用SpEL表达式处理验证码结果 - String code = captcha.getCode(); - if (isMath) { - ExpressionParser parser = new SpelExpressionParser(); - Expression exp = parser.parseExpression(StringUtils.remove(code, "=")); - code = exp.getValue(String.class); - } - RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - captchaVo.setUuid(uuid); - captchaVo.setImg(captcha.getImageBase64()); - return R.ok(captchaVo); - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/template/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java deleted file mode 100644 index c444f28..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dromara.web.controller; - -import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.config.RuoYiConfig; -import org.dromara.common.core.utils.StringUtils; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 首页 - * - * @author Lion Li - */ -@SaIgnore -@RequiredArgsConstructor -@RestController -public class IndexController { - - /** - * 系统基础配置 - */ - private final RuoYiConfig ruoyiConfig; - - /** - * 访问首页，提示语 - */ - @GetMapping("/") - public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); - } -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java deleted file mode 100644 index 664df1e..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.dromara.web.domain.vo; - -import lombok.Data; - -/** - * 验证码信息 - * - * @author Michelle.Chung - */ -@Data -public class CaptchaVo { - - /** - * 是否开启验证码 - */ - private Boolean captchaEnabled = true; - - private String uuid; - - /** - * 验证码图片 - */ - private String img; - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java deleted file mode 100644 index 0a83ace..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.dromara.web.domain.vo; - -import lombok.Data; - -import java.util.List; - -/** - * 登录租户对象 - * - * @author Michelle.Chung - */ -@Data -public class LoginTenantVo { - - /** - * 租户开关 - */ - private Boolean tenantEnabled; - - /** - * 租户对象列表 - */ - private List voList; - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java deleted file mode 100644 index 834afe5..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.web.domain.vo; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -/** - * 登录验证信息 - * - * @author Michelle.Chung - */ -@Data -public class LoginVo { - - /** - * 授权令牌 - */ - @JsonProperty("access_token") - private String accessToken; - - /** - * 刷新令牌 - */ - @JsonProperty("refresh_token") - private String refreshToken; - - /** - * 授权令牌 access_token 的有效期 - */ - @JsonProperty("expire_in") - private Long expireIn; - - /** - * 刷新令牌 refresh_token 的有效期 - */ - @JsonProperty("refresh_expire_in") - private Long refreshExpireIn; - - /** - * 应用id - */ - @JsonProperty("client_id") - private String clientId; - - /** - * 令牌权限 - */ - private String scope; - - /** - * 用户 openid - */ - private String openid; - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java deleted file mode 100644 index db9c271..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.web.domain.vo; - -import org.dromara.system.domain.vo.SysTenantVo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -/** - * 租户列表 - * - * @author Lion Li - */ -@Data -@AutoMapper(target = SysTenantVo.class) -public class TenantListVo { - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 企业名称 - */ - private String companyName; - - /** - * 域名 - */ - private String domain; - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/template/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java deleted file mode 100644 index 07595e0..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.dromara.web.listener; - -import cn.dev33.satoken.config.SaTokenConfig; -import cn.dev33.satoken.listener.SaTokenListener; -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.http.useragent.UserAgent; -import cn.hutool.http.useragent.UserAgentUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Component; - -import java.time.Duration; - -/** - * 用户行为 侦听器的实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Component -@Slf4j -public class UserActionListener implements SaTokenListener { - - private final SaTokenConfig tokenConfig; - private final SysLoginService loginService; - - /** - * 每次登录时触发 - */ - @Override - public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) { - UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); - String ip = ServletUtils.getClientIP(); - UserOnlineDTO dto = new UserOnlineDTO(); - dto.setIpaddr(ip); - dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); - dto.setBrowser(userAgent.getBrowser().getName()); - dto.setOs(userAgent.getOs().getName()); - dto.setLoginTime(System.currentTimeMillis()); - dto.setTokenId(tokenValue); - String username = (String) loginModel.getExtra(LoginHelper.USER_NAME_KEY); - String tenantId = (String) loginModel.getExtra(LoginHelper.TENANT_KEY); - dto.setUserName(username); - dto.setClientKey((String) loginModel.getExtra(LoginHelper.CLIENT_KEY)); - dto.setDeviceType(loginModel.getDevice()); - dto.setDeptName((String) loginModel.getExtra(LoginHelper.DEPT_NAME_KEY)); - TenantHelper.dynamic(tenantId, () -> { - if(tokenConfig.getTimeout() == -1) { - RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto); - } else { - RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout())); - } - }); - // 记录登录日志 - LogininforEvent logininforEvent = new LogininforEvent(); - logininforEvent.setTenantId(tenantId); - logininforEvent.setUsername(username); - logininforEvent.setStatus(Constants.LOGIN_SUCCESS); - logininforEvent.setMessage(MessageUtils.message("user.login.success")); - logininforEvent.setRequest(ServletUtils.getRequest()); - SpringUtils.context().publishEvent(logininforEvent); - // 更新登录信息 - loginService.recordLoginInfo((Long) loginModel.getExtra(LoginHelper.USER_KEY), ip); - log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue); - } - - /** - * 每次注销时触发 - */ - @Override - public void doLogout(String loginType, Object loginId, String tokenValue) { - String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); - TenantHelper.dynamic(tenantId, () -> { - RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); - }); - log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue); - } - - /** - * 每次被踢下线时触发 - */ - @Override - public void doKickout(String loginType, Object loginId, String tokenValue) { - String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); - TenantHelper.dynamic(tenantId, () -> { - RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); - }); - log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue); - } - - /** - * 每次被顶下线时触发 - */ - @Override - public void doReplaced(String loginType, Object loginId, String tokenValue) { - String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); - TenantHelper.dynamic(tenantId, () -> { - RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); - }); - log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue); - } - - /** - * 每次被封禁时触发 - */ - @Override - public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) { - } - - /** - * 每次被解封时触发 - */ - @Override - public void doUntieDisable(String loginType, Object loginId, String service) { - } - - /** - * 每次打开二级认证时触发 - */ - @Override - public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) { - } - - /** - * 每次创建Session时触发 - */ - @Override - public void doCloseSafe(String loginType, String tokenValue, String service) { - } - - /** - * 每次创建Session时触发 - */ - @Override - public void doCreateSession(String id) { - } - - /** - * 每次注销Session时触发 - */ - @Override - public void doLogoutSession(String id) { - } - - /** - * 每次Token续期时触发 - */ - @Override - public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { - } -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java deleted file mode 100644 index a75b913..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.web.service; - - -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.web.domain.vo.LoginVo; - -/** - * 授权策略 - * - * @author Michelle.Chung - */ -public interface IAuthStrategy { - - String BASE_NAME = "AuthStrategy"; - - /** - * 登录 - * - * @param body 登录对象 - * @param client 授权管理视图对象 - * @param grantType 授权类型 - * @return 登录验证信息 - */ - static LoginVo login(String body, SysClientVo client, String grantType) { - // 授权类型和客户端id - String beanName = grantType + BASE_NAME; - if (!SpringUtils.containsBean(beanName)) { - throw new ServiceException("授权类型不正确!"); - } - IAuthStrategy instance = SpringUtils.getBean(beanName); - return instance.login(body, client); - } - - /** - * 登录 - * - * @param body 登录对象 - * @param client 授权管理视图对象 - * @return 登录验证信息 - */ - LoginVo login(String body, SysClientVo client); - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java deleted file mode 100644 index c7ad917..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ /dev/null @@ -1,246 +0,0 @@ -package org.dromara.web.service; - -import cn.dev33.satoken.exception.NotLoginException; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.lock.annotation.Lock4j; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.TenantStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.*; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.exception.TenantException; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.*; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.time.Duration; -import java.util.Date; -import java.util.List; -import java.util.function.Supplier; - -/** - * 登录校验方法 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Slf4j -@Service -public class SysLoginService { - - @Value("${user.password.maxRetryCount}") - private Integer maxRetryCount; - - @Value("${user.password.lockTime}") - private Integer lockTime; - - private final ISysTenantService tenantService; - private final ISysPermissionService permissionService; - private final ISysSocialService sysSocialService; - private final ISysRoleService roleService; - private final ISysDeptService deptService; - private final SysUserMapper userMapper; - - - /** - * 绑定第三方用户 - * - * @param authUserData 授权响应实体 - */ - @Lock4j - public void socialRegister(AuthUser authUserData) { - String authId = authUserData.getSource() + authUserData.getUuid(); - // 第三方用户信息 - SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class); - BeanUtil.copyProperties(authUserData.getToken(), bo); - Long userId = LoginHelper.getUserId(); - bo.setUserId(userId); - bo.setAuthId(authId); - bo.setOpenId(authUserData.getUuid()); - bo.setUserName(authUserData.getUsername()); - bo.setNickName(authUserData.getNickname()); - List checkList = sysSocialService.selectByAuthId(authId); - if (CollUtil.isNotEmpty(checkList)) { - throw new ServiceException("此三方账号已经被绑定!"); - } - // 查询是否已经绑定用户 - SysSocialBo params = new SysSocialBo(); - params.setUserId(userId); - params.setSource(bo.getSource()); - List list = sysSocialService.queryList(params); - if (CollUtil.isEmpty(list)) { - // 没有绑定用户, 新增用户信息 - sysSocialService.insertByBo(bo); - } else { - // 更新用户信息 - bo.setId(list.get(0).getId()); - sysSocialService.updateByBo(bo); - // 如果要绑定的平台账号已经被绑定过了 是否抛异常自行决断 - // throw new ServiceException("此平台账号已经被绑定!"); - } - } - - - /** - * 退出登录 - */ - public void logout() { - try { - LoginUser loginUser = LoginHelper.getLoginUser(); - if (ObjectUtil.isNull(loginUser)) { - return; - } - if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { - // 超级管理员 登出清除动态租户 - TenantHelper.clearDynamic(); - } - recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success")); - } catch (NotLoginException ignored) { - } finally { - try { - StpUtil.logout(); - } catch (NotLoginException ignored) { - } - } - } - - /** - * 记录登录信息 - * - * @param tenantId 租户ID - * @param username 用户名 - * @param status 状态 - * @param message 消息内容 - */ - public void recordLogininfor(String tenantId, String username, String status, String message) { - LogininforEvent logininforEvent = new LogininforEvent(); - logininforEvent.setTenantId(tenantId); - logininforEvent.setUsername(username); - logininforEvent.setStatus(status); - logininforEvent.setMessage(message); - logininforEvent.setRequest(ServletUtils.getRequest()); - SpringUtils.context().publishEvent(logininforEvent); - } - - /** - * 构建登录用户 - */ - public LoginUser buildLoginUser(SysUserVo user) { - LoginUser loginUser = new LoginUser(); - loginUser.setTenantId(user.getTenantId()); - loginUser.setUserId(user.getUserId()); - loginUser.setDeptId(user.getDeptId()); - loginUser.setUsername(user.getUserName()); - loginUser.setNickname(user.getNickName()); - loginUser.setUserType(user.getUserType()); - loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId())); - loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId())); - if (ObjectUtil.isNotNull(user.getDeptId())) { - Opt deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById); - loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY)); - loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY)); - } - List roles = roleService.selectRolesByUserId(user.getUserId()); - loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); - return loginUser; - } - - /** - * 记录登录信息 - * - * @param userId 用户ID - */ - public void recordLoginInfo(Long userId, String ip) { - SysUser sysUser = new SysUser(); - sysUser.setUserId(userId); - sysUser.setLoginIp(ip); - sysUser.setLoginDate(DateUtils.getNowDate()); - sysUser.setUpdateBy(userId); - DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser)); - } - - /** - * 登录校验 - */ - public void checkLogin(LoginType loginType, String tenantId, String username, Supplier supplier) { - String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username; - String loginFail = Constants.LOGIN_FAIL; - - // 获取用户登录错误次数，默认为0 (可自定义限制策略 例如: key + username + ip) - int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0); - // 锁定时间内登录 则踢出 - if (errorNumber >= maxRetryCount) { - recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime)); - throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime); - } - - if (supplier.get()) { - // 错误次数递增 - errorNumber++; - RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime)); - // 达到规定错误次数 则锁定登录 - if (errorNumber >= maxRetryCount) { - recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime)); - throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime); - } else { - // 未达到规定错误次数 - recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber)); - throw new UserException(loginType.getRetryLimitCount(), errorNumber); - } - } - - // 登录成功 清空错误次数 - RedisUtils.deleteObject(errorKey); - } - - /** - * 校验租户 - * - * @param tenantId 租户ID - */ - public void checkTenant(String tenantId) { - if (!TenantHelper.isEnable()) { - return; - } - if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { - return; - } - if (StringUtils.isBlank(tenantId)) { - throw new TenantException("tenant.number.not.blank"); - } - SysTenantVo tenant = tenantService.queryByTenantId(tenantId); - if (ObjectUtil.isNull(tenant)) { - log.info("登录租户：{} 不存在.", tenantId); - throw new TenantException("tenant.not.exists"); - } else if (TenantStatus.DISABLE.getCode().equals(tenant.getStatus())) { - log.info("登录租户：{} 已被停用.", tenantId); - throw new TenantException("tenant.blocked"); - } else if (ObjectUtil.isNotNull(tenant.getExpireTime()) - && new Date().after(tenant.getExpireTime())) { - log.info("登录租户：{} 已超过有效期.", tenantId); - throw new TenantException("tenant.expired"); - } - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java deleted file mode 100644 index ddab279..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.web.service; - -import cn.dev33.satoken.secure.BCrypt; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysUserService; -import org.springframework.stereotype.Service; - -/** - * 注册校验方法 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysRegisterService { - - private final ISysUserService userService; - private final SysUserMapper userMapper; - private final CaptchaProperties captchaProperties; - - /** - * 注册 - */ - public void register(RegisterBody registerBody) { - String tenantId = registerBody.getTenantId(); - String username = registerBody.getUsername(); - String password = registerBody.getPassword(); - // 校验用户类型是否存在 - String userType = UserType.getUserType(registerBody.getUserType()).getUserType(); - - boolean captchaEnabled = captchaProperties.getEnable(); - // 验证码开关 - if (captchaEnabled) { - validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid()); - } - SysUserBo sysUser = new SysUserBo(); - sysUser.setUserName(username); - sysUser.setNickName(username); - sysUser.setPassword(BCrypt.hashpw(password)); - sysUser.setUserType(userType); - - boolean exist = TenantHelper.dynamic(tenantId, () -> { - return userMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getUserName, sysUser.getUserName())); - }); - if (exist) { - throw new UserException("user.register.save.error", username); - } - boolean regFlag = userService.registerUser(sysUser, tenantId); - if (!regFlag) { - throw new UserException("user.register.error"); - } - recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success")); - } - - /** - * 校验验证码 - * - * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 - */ - public void validateCaptcha(String tenantId, String username, String code, String uuid) { - String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, ""); - String captcha = RedisUtils.getCacheObject(verifyKey); - RedisUtils.deleteObject(verifyKey); - if (captcha == null) { - recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.jcaptcha.expire")); - throw new CaptchaExpireException(); - } - if (!code.equalsIgnoreCase(captcha)) { - recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.jcaptcha.error")); - throw new CaptchaException(); - } - } - - /** - * 记录登录信息 - * - * @param tenantId 租户ID - * @param username 用户名 - * @param status 状态 - * @param message 消息内容 - * @return - */ - private void recordLogininfor(String tenantId, String username, String status, String message) { - LogininforEvent logininforEvent = new LogininforEvent(); - logininforEvent.setTenantId(tenantId); - logininforEvent.setUsername(username); - logininforEvent.setStatus(status); - logininforEvent.setMessage(message); - logininforEvent.setRequest(ServletUtils.getRequest()); - SpringUtils.context().publishEvent(logininforEvent); - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java deleted file mode 100644 index b5a2497..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.dromara.web.service.impl; - -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.EmailLoginBody; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Service; - -/** - * 邮件认证策略 - * - * @author Michelle.Chung - */ -@Slf4j -@Service("email" + IAuthStrategy.BASE_NAME) -@RequiredArgsConstructor -public class EmailAuthStrategy implements IAuthStrategy { - - private final SysLoginService loginService; - private final SysUserMapper userMapper; - - @Override - public LoginVo login(String body, SysClientVo client) { - EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class); - ValidatorUtils.validate(loginBody); - String tenantId = loginBody.getTenantId(); - String email = loginBody.getEmail(); - String emailCode = loginBody.getEmailCode(); - LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { - SysUserVo user = loadUserByEmail(email); - loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode)); - // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 - return loginService.buildLoginUser(user); - }); - loginUser.setClientKey(client.getClientKey()); - loginUser.setDeviceType(client.getDeviceType()); - SaLoginModel model = new SaLoginModel(); - model.setDevice(client.getDeviceType()); - // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 - // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); - model.setActiveTimeout(client.getActiveTimeout()); - model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); - // 生成token - LoginHelper.login(loginUser, model); - - LoginVo loginVo = new LoginVo(); - loginVo.setAccessToken(StpUtil.getTokenValue()); - loginVo.setExpireIn(StpUtil.getTokenTimeout()); - loginVo.setClientId(client.getClientId()); - return loginVo; - } - - /** - * 校验邮箱验证码 - */ - private boolean validateEmailCode(String tenantId, String email, String emailCode) { - String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email); - if (StringUtils.isBlank(code)) { - loginService.recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); - throw new CaptchaExpireException(); - } - return code.equals(emailCode); - } - - private SysUserVo loadUserByEmail(String email) { - SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getEmail, email)); - if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", email); - throw new UserException("user.not.exists", email); - } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", email); - throw new UserException("user.blocked", email); - } - return user; - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java deleted file mode 100644 index f28024f..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.dromara.web.service.impl; - -import cn.dev33.satoken.secure.BCrypt; -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.PasswordLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Service; - -/** - * 密码认证策略 - * - * @author Michelle.Chung - */ -@Slf4j -@Service("password" + IAuthStrategy.BASE_NAME) -@RequiredArgsConstructor -public class PasswordAuthStrategy implements IAuthStrategy { - - private final CaptchaProperties captchaProperties; - private final SysLoginService loginService; - private final SysUserMapper userMapper; - - @Override - public LoginVo login(String body, SysClientVo client) { - PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class); - ValidatorUtils.validate(loginBody); - String tenantId = loginBody.getTenantId(); - String username = loginBody.getUsername(); - String password = loginBody.getPassword(); - String code = loginBody.getCode(); - String uuid = loginBody.getUuid(); - - boolean captchaEnabled = captchaProperties.getEnable(); - // 验证码开关 - if (captchaEnabled) { - validateCaptcha(tenantId, username, code, uuid); - } - LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { - SysUserVo user = loadUserByUsername(username); - loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword())); - // 此处可根据登录用户的数据不同 自行创建 loginUser - return loginService.buildLoginUser(user); - }); - loginUser.setClientKey(client.getClientKey()); - loginUser.setDeviceType(client.getDeviceType()); - SaLoginModel model = new SaLoginModel(); - model.setDevice(client.getDeviceType()); - // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 - // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); - model.setActiveTimeout(client.getActiveTimeout()); - model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); - // 生成token - LoginHelper.login(loginUser, model); - - LoginVo loginVo = new LoginVo(); - loginVo.setAccessToken(StpUtil.getTokenValue()); - loginVo.setExpireIn(StpUtil.getTokenTimeout()); - loginVo.setClientId(client.getClientId()); - return loginVo; - } - - /** - * 校验验证码 - * - * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 - */ - private void validateCaptcha(String tenantId, String username, String code, String uuid) { - String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, ""); - String captcha = RedisUtils.getCacheObject(verifyKey); - RedisUtils.deleteObject(verifyKey); - if (captcha == null) { - loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); - throw new CaptchaExpireException(); - } - if (!code.equalsIgnoreCase(captcha)) { - loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")); - throw new CaptchaException(); - } - } - - private SysUserVo loadUserByUsername(String username) { - SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, username)); - if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", username); - throw new UserException("user.not.exists", username); - } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", username); - throw new UserException("user.blocked", username); - } - return user; - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java deleted file mode 100644 index 89f8462..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.dromara.web.service.impl; - -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SmsLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Service; - -/** - * 短信认证策略 - * - * @author Michelle.Chung - */ -@Slf4j -@Service("sms" + IAuthStrategy.BASE_NAME) -@RequiredArgsConstructor -public class SmsAuthStrategy implements IAuthStrategy { - - private final SysLoginService loginService; - private final SysUserMapper userMapper; - - @Override - public LoginVo login(String body, SysClientVo client) { - SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class); - ValidatorUtils.validate(loginBody); - String tenantId = loginBody.getTenantId(); - String phonenumber = loginBody.getPhonenumber(); - String smsCode = loginBody.getSmsCode(); - LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { - SysUserVo user = loadUserByPhonenumber(phonenumber); - loginService.checkLogin(LoginType.SMS, tenantId, user.getUserName(), () -> !validateSmsCode(tenantId, phonenumber, smsCode)); - // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 - return loginService.buildLoginUser(user); - }); - loginUser.setClientKey(client.getClientKey()); - loginUser.setDeviceType(client.getDeviceType()); - SaLoginModel model = new SaLoginModel(); - model.setDevice(client.getDeviceType()); - // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 - // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); - model.setActiveTimeout(client.getActiveTimeout()); - model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); - // 生成token - LoginHelper.login(loginUser, model); - - LoginVo loginVo = new LoginVo(); - loginVo.setAccessToken(StpUtil.getTokenValue()); - loginVo.setExpireIn(StpUtil.getTokenTimeout()); - loginVo.setClientId(client.getClientId()); - return loginVo; - } - - /** - * 校验短信验证码 - */ - private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) { - String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber); - if (StringUtils.isBlank(code)) { - loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); - throw new CaptchaExpireException(); - } - return code.equals(smsCode); - } - - private SysUserVo loadUserByPhonenumber(String phonenumber) { - SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhonenumber, phonenumber)); - if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", phonenumber); - throw new UserException("user.not.exists", phonenumber); - } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", phonenumber); - throw new UserException("user.blocked", phonenumber); - } - return user; - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java deleted file mode 100644 index 8463026..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.dromara.web.service.impl; - -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.http.Method; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import me.zhyd.oauth.model.AuthResponse; -import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysSocialService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * 第三方授权策略 - * - * @author thiszhc is 三三 - */ -@Slf4j -@Service("social" + IAuthStrategy.BASE_NAME) -@RequiredArgsConstructor -public class SocialAuthStrategy implements IAuthStrategy { - - private final SocialProperties socialProperties; - private final ISysSocialService sysSocialService; - private final SysUserMapper userMapper; - private final SysLoginService loginService; - - /** - * 登录-第三方授权登录 - * - * @param body 登录信息 - * @param client 客户端信息 - */ - @Override - public LoginVo login(String body, SysClientVo client) { - SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class); - ValidatorUtils.validate(loginBody); - AuthResponse response = SocialUtils.loginAuth( - loginBody.getSource(), loginBody.getSocialCode(), - loginBody.getSocialState(), socialProperties); - if (!response.ok()) { - throw new ServiceException(response.getMsg()); - } - AuthUser authUserData = response.getData(); - if ("GITEE".equals(authUserData.getSource())) { - // 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖 - HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus") - .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) - .executeAsync(); - HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus") - .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) - .executeAsync(); - } - - List list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid()); - if (CollUtil.isEmpty(list)) { - throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！"); - } - SysSocialVo social; - if (TenantHelper.isEnable()) { - Optional opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(loginBody.getTenantId())); - if (opt.isEmpty()) { - throw new ServiceException("对不起，你没有权限登录当前租户！"); - } - social = opt.get(); - } else { - social = list.get(0); - } - LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> { - SysUserVo user = loadUser(social.getUserId()); - // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 - return loginService.buildLoginUser(user); - }); - loginUser.setClientKey(client.getClientKey()); - loginUser.setDeviceType(client.getDeviceType()); - SaLoginModel model = new SaLoginModel(); - model.setDevice(client.getDeviceType()); - // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 - // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); - model.setActiveTimeout(client.getActiveTimeout()); - model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); - // 生成token - LoginHelper.login(loginUser, model); - - LoginVo loginVo = new LoginVo(); - loginVo.setAccessToken(StpUtil.getTokenValue()); - loginVo.setExpireIn(StpUtil.getTokenTimeout()); - loginVo.setClientId(client.getClientId()); - return loginVo; - } - - private SysUserVo loadUser(Long userId) { - SysUserVo user = userMapper.selectVoById(userId); - if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", ""); - throw new UserException("user.not.exists", ""); - } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", ""); - throw new UserException("user.blocked", ""); - } - return user; - } - -} diff --git a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java deleted file mode 100644 index aa8be73..0000000 --- a/template/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.dromara.web.service.impl; - -import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.XcxLoginBody; -import org.dromara.common.core.domain.model.XcxLoginUser; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.springframework.stereotype.Service; - -/** - * 小程序认证策略 - * - * @author Michelle.Chung - */ -@Slf4j -@Service("xcx" + IAuthStrategy.BASE_NAME) -@RequiredArgsConstructor -public class XcxAuthStrategy implements IAuthStrategy { - - private final SysLoginService loginService; - - @Override - public LoginVo login(String body, SysClientVo client) { - XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class); - ValidatorUtils.validate(loginBody); - // xcxCode 为 小程序调用 wx.login 授权后获取 - String xcxCode = loginBody.getXcxCode(); - // 多个小程序识别使用 - String appid = loginBody.getAppid(); - - // todo 以下自行实现 - // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid - String openid = ""; - // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可 - SysUserVo user = loadUserByOpenid(openid); - - // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 - XcxLoginUser loginUser = new XcxLoginUser(); - loginUser.setTenantId(user.getTenantId()); - loginUser.setUserId(user.getUserId()); - loginUser.setUsername(user.getUserName()); - loginUser.setNickname(user.getNickName()); - loginUser.setUserType(user.getUserType()); - loginUser.setClientKey(client.getClientKey()); - loginUser.setDeviceType(client.getDeviceType()); - loginUser.setOpenid(openid); - - SaLoginModel model = new SaLoginModel(); - model.setDevice(client.getDeviceType()); - // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 - // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); - model.setActiveTimeout(client.getActiveTimeout()); - model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); - // 生成token - LoginHelper.login(loginUser, model); - - LoginVo loginVo = new LoginVo(); - loginVo.setAccessToken(StpUtil.getTokenValue()); - loginVo.setExpireIn(StpUtil.getTokenTimeout()); - loginVo.setClientId(client.getClientId()); - loginVo.setOpenid(openid); - return loginVo; - } - - private SysUserVo loadUserByOpenid(String openid) { - // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户 - // todo 自行实现 userService.selectUserByOpenid(openid); - SysUserVo user = new SysUserVo(); - if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", openid); - // todo 用户不存在 业务逻辑自行实现 - } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", openid); - // todo 用户已被停用 业务逻辑自行实现 - } - return user; - } - -} diff --git a/template/ruoyi-admin/src/main/resources/application-dev.yml b/template/ruoyi-admin/src/main/resources/application-dev.yml deleted file mode 100644 index c996f5b..0000000 --- a/template/ruoyi-admin/src/main/resources/application-dev.yml +++ /dev/null @@ -1,279 +0,0 @@ ---- # 监控中心配置 -spring.boot.admin.client: - # 增加客户端开关 - enabled: true - url: http://localhost:9090/admin - instance: - service-host-type: IP - metadata: - username: ${spring.boot.admin.client.username} - userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ - ---- # snail-job 配置 -snail-job: - enabled: true - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 17888 - # 详见 script/sql/snail_job.sql `sj_namespace` 表 - namespace: ${spring.profiles.active} - # 随主应用端口飘逸 - port: 2${server.port} - # 客户端ip指定 - host: - ---- # 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content - dynamic: - # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false - # 设置默认的数据源或者数据源组,默认值即为 master - primary: master - # 严格模式 匹配不到数据源则报错 - strict: true - datasource: - # 主库数据源 - master: - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: hande_test_user - password: Yu0FvhjUQDGdnmm5 - # 从库数据源 - slave: - lazy: true - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: hande_test_user - password: Yu0FvhjUQDGdnmm5 -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root - hikari: - # 最大连接池数量 - maxPoolSize: 20 - # 最小空闲线程数量 - minIdle: 10 - # 配置获取连接等待超时的时间 - connectionTimeout: 30000 - # 校验超时时间 - validationTimeout: 5000 - # 空闲连接存活最大时间，默认10分钟 - idleTimeout: 600000 - # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 - maxLifetime: 1800000 - # 多久检查一次连接的活性 - keepaliveTime: 30000 - ---- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) -spring.data: - redis: - # 地址 - host: redis.byteawake.com - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # redis 密码必须配置 - #password: ruoyi123 - # 连接超时时间 - timeout: 10s - # 是否开启ssl - ssl.enabled: false - -# redisson 配置 -redisson: - # redis key前缀 - keyPrefix: - # 线程池数量 - threads: 4 - # Netty线程池数量 - nettyThreads: 8 - # 单节点配置 - singleServerConfig: - # 客户端名称 - clientName: ${ruoyi.name} - # 最小空闲连接数 - connectionMinimumIdleSize: 8 - # 连接池大小 - connectionPoolSize: 32 - # 连接空闲超时，单位：毫秒 - idleConnectionTimeout: 10000 - # 命令等待超时，单位：毫秒 - timeout: 3000 - # 发布和订阅连接池大小 - subscriptionConnectionPoolSize: 50 - ---- # mail 邮件发送 -mail: - enabled: false - host: smtp.163.com - port: 465 - # 是否需要用户名密码验证 - auth: true - # 发送方，遵循RFC-822标准 - from: xxx@163.com - # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） - user: xxx@163.com - # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） - pass: xxxxxxxxxx - # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 - starttlsEnable: true - # 使用SSL安全连接 - sslEnable: true - # SMTP超时时长，单位毫秒，缺省值不超时 - timeout: 0 - # Socket连接超时值，单位毫秒，缺省值不超时 - connectionTimeout: 0 - ---- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 -# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 -sms: - # 配置源类型用于标定配置来源(interface,yaml) - config-type: yaml - # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 - restricted: true - # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 - minute-max: 1 - # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 - account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 - blends: - # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 - # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 - config1: - # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: alibaba - # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 - access-key-id: 您的accessKey - # 称为accessSecret有些称之为apiSecret - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - config2: - # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: tencent - access-key-id: 您的accessKey - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - - ---- # 三方授权 -justauth: - # 前端外网访问地址 - address: http://localhost:80 - type: - maxkey: - # maxkey 服务器地址 - # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 - server-url: http://sso.maxkey.top - client-id: 876892492581044224 - client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 - redirect-uri: ${justauth.address}/social-callback?source=maxkey - topiam: - # topiam 服务器地址 - server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol - client-id: 449c4*********937************759 - client-secret: ac7***********1e0************28d - redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [openid, email, phone, profile] - qq: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=qq - union-id: false - weibo: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=weibo - gitee: - client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 - client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac - redirect-uri: ${justauth.address}/social-callback?source=gitee - dingtalk: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=dingtalk - baidu: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=baidu - csdn: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=csdn - coding: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=coding - coding-group-name: xx - oschina: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=oschina - alipay_wallet: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet - alipay-public-key: MIIB**************DAQAB - wechat_open: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_open - wechat_mp: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_mp - wechat_enterprise: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise - agent-id: 1000002 - gitlab: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitlab - -xxl: - job: - admin: - address: https://xxljob.teitui.com/xxl-job-admin - username: admin - password: 123456 - executor: - port: 9999 - appname: handeTest - title: handeTest - accessToken: default_token -base: - package: com.spring3_test - - diff --git a/template/ruoyi-admin/src/main/resources/application-prod.yml b/template/ruoyi-admin/src/main/resources/application-prod.yml deleted file mode 100644 index d261118..0000000 --- a/template/ruoyi-admin/src/main/resources/application-prod.yml +++ /dev/null @@ -1,265 +0,0 @@ ---- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp - ---- # 监控中心配置 -spring.boot.admin.client: - # 增加客户端开关 - enabled: true - url: http://localhost:9090/admin - instance: - service-host-type: IP - metadata: - username: ${spring.boot.admin.client.username} - userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ - ---- # snail-job 配置 -snail-job: - enabled: true - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 17888 - # 详见 script/sql/snail_job.sql `sj_namespace` 表 - namespace: ${spring.profiles.active} - # 随主应用端口飘逸 - port: 2${server.port} - # 客户端ip指定 - host: - ---- # 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content - dynamic: - # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false - # 设置默认的数据源或者数据源组,默认值即为 master - primary: master - # 严格模式 匹配不到数据源则报错 - strict: true - datasource: - # 主库数据源 - master: - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root - # 从库数据源 - slave: - lazy: true - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: - password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root - hikari: - # 最大连接池数量 - maxPoolSize: 20 - # 最小空闲线程数量 - minIdle: 10 - # 配置获取连接等待超时的时间 - connectionTimeout: 30000 - # 校验超时时间 - validationTimeout: 5000 - # 空闲连接存活最大时间，默认10分钟 - idleTimeout: 600000 - # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 - maxLifetime: 1800000 - # 多久检查一次连接的活性 - keepaliveTime: 30000 - ---- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) -spring.data: - redis: - # 地址 - host: localhost - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # redis 密码必须配置 - password: ruoyi123 - # 连接超时时间 - timeout: 10s - # 是否开启ssl - ssl.enabled: false - -# redisson 配置 -redisson: - # redis key前缀 - keyPrefix: - # 线程池数量 - threads: 16 - # Netty线程池数量 - nettyThreads: 32 - # 单节点配置 - singleServerConfig: - # 客户端名称 - clientName: ${ruoyi.name} - # 最小空闲连接数 - connectionMinimumIdleSize: 32 - # 连接池大小 - connectionPoolSize: 64 - # 连接空闲超时，单位：毫秒 - idleConnectionTimeout: 10000 - # 命令等待超时，单位：毫秒 - timeout: 3000 - # 发布和订阅连接池大小 - subscriptionConnectionPoolSize: 50 - ---- # mail 邮件发送 -mail: - enabled: false - host: smtp.163.com - port: 465 - # 是否需要用户名密码验证 - auth: true - # 发送方，遵循RFC-822标准 - from: xxx@163.com - # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） - user: xxx@163.com - # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） - pass: xxxxxxxxxx - # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 - starttlsEnable: true - # 使用SSL安全连接 - sslEnable: true - # SMTP超时时长，单位毫秒，缺省值不超时 - timeout: 0 - # Socket连接超时值，单位毫秒，缺省值不超时 - connectionTimeout: 0 - ---- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 -# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 -sms: - # 配置源类型用于标定配置来源(interface,yaml) - config-type: yaml - # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 - restricted: true - # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 - minute-max: 1 - # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 - account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 - blends: - # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 - # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 - config1: - # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: alibaba - # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 - access-key-id: 您的accessKey - # 称为accessSecret有些称之为apiSecret - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - config2: - # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: tencent - access-key-id: 您的accessKey - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - ---- # 三方授权 -justauth: - # 前端外网访问地址 - address: http://localhost:80 - type: - maxkey: - # maxkey 服务器地址 - # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 - server-url: http://sso.maxkey.top - client-id: 876892492581044224 - client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 - redirect-uri: ${justauth.address}/social-callback?source=maxkey - topiam: - # topiam 服务器地址 - server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol - client-id: 449c4*********937************759 - client-secret: ac7***********1e0************28d - redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [ openid, email, phone, profile ] - qq: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=qq - union-id: false - weibo: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=weibo - gitee: - client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 - client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac - redirect-uri: ${justauth.address}/social-callback?source=gitee - dingtalk: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=dingtalk - baidu: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=baidu - csdn: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=csdn - coding: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=coding - coding-group-name: xx - oschina: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=oschina - alipay_wallet: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet - alipay-public-key: MIIB**************DAQAB - wechat_open: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_open - wechat_mp: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_mp - wechat_enterprise: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise - agent-id: 1000002 - gitlab: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitlab diff --git a/template/ruoyi-admin/src/main/resources/application.yml b/template/ruoyi-admin/src/main/resources/application.yml deleted file mode 100644 index 9e1afe4..0000000 --- a/template/ruoyi-admin/src/main/resources/application.yml +++ /dev/null @@ -1,376 +0,0 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: RuoYi-Vue-Plus - # 版本 - version: ${revision} - # 版权年份 - copyrightYear: 2024 - -captcha: - enable: true - # 页面 <参数设置> 可开启关闭 验证码校验 - # 验证码类型 math 数组计算 char 字符验证 - type: MATH - # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰 - category: CIRCLE - # 数字验证码位数 - numberLength: 1 - # 字符验证码长度 - charLength: 4 - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 8082 - servlet: - # 应用的访问路径 - context-path: / - # undertow 配置 - undertow: - # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的 - max-http-post-size: -1 - # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 - # 每块buffer的空间大小,越小的空间被利用越充分 - buffer-size: 512 - # 是否分配的直接内存 - direct-buffers: true - threads: - # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 - io: 8 - # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 - worker: 256 - -# 日志配置 -logging: - level: - org.dromara: @logging.level@ - org.springframework: warn - org.mybatis.spring.mapper: error - config: classpath:logback-plus.xml - -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - -# Spring配置 -spring: - application: - name: ${ruoyi.name} - threads: - # 开启虚拟线程 仅jdk21可用 - virtual: - enabled: false - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: @profiles.active@ - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB - mvc: - # 设置静态资源路径 防止所有请求都去查静态资源 - static-path-pattern: /static/** - format: - date-time: yyyy-MM-dd HH:mm:ss - jackson: - # 日期格式化 - date-format: yyyy-MM-dd HH:mm:ss - serialization: - # 格式化输出 - indent_output: false - # 忽略无法转换的对象 - fail_on_empty_beans: false - deserialization: - # 允许对象忽略json中不存在的属性 - fail_on_unknown_properties: false - -# Sa-Token配置 -sa-token: - # token名称 (同时也是cookie名称) - token-name: Authorization - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # jwt秘钥 - jwt-secret-key: abcdefghijklmnopqrstuvwxyz - -# security配置 -security: - # 排除路径 - excludes: - # 静态资源 - - /*.html - - /**/*.html - - /**/*.css - - /**/*.js - # 公共路径 - - /favicon.ico - - /error - # swagger 文档配置 - - /*/api-docs - - /*/api-docs/** - -# 多租户配置 -tenant: - # 是否开启 - enable: true - # 排除表 - excludes: - - sys_menu - - sys_tenant - - sys_tenant_package - - sys_role_dept - - sys_role_menu - - sys_user_post - - sys_user_role - - sys_client - - sys_oss_config - -# MyBatisPlus配置 -# https://baomidou.com/config/ -mybatis-plus: - # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: org.dromara.**.mapper - # 对应的 XML 文件位置 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain - global-config: - dbConfig: - # 主键类型 - # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID - # 如需改为自增 需要将数据库表全部设置为自增 - idType: ASSIGN_ID - -# 数据加密 -mybatis-encryptor: - # 是否开启加密 - enable: false - # 默认加密算法 - algorithm: BASE64 - # 编码方式 BASE64/HEX。默认BASE64 - encode: BASE64 - # 安全秘钥 对称算法的秘钥 如：AES，SM4 - password: - # 公私钥 非对称算法的公私钥 如：SM2，RSA - publicKey: - privateKey: - -# api接口加密 -api-decrypt: - # 是否开启全局接口加密 - enabled: true - # AES 加密头标识 - headerFlag: encrypt-key - # 响应加密公钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换 - # 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE= - publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ== - # 请求解密私钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换 - # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ== - privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= - -springdoc: - api-docs: - # 是否开启接口文档 - enabled: true -# swagger-ui: -# # 持久化认证数据 -# persistAuthorization: true - info: - # 标题 - title: '标题：${ruoyi.name}多租户管理系统_接口文档' - # 描述 - description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' - # 版本 - version: '版本号: ${ruoyi.version}' - # 作者信息 - contact: - name: Lion Li - email: crazylionli@163.com - url: https://gitee.com/dromara/RuoYi-Vue-Plus - components: - # 鉴权方式配置 - security-schemes: - apiKey: - type: APIKEY - in: HEADER - name: ${sa-token.token-name} - #这里定义了两个分组，可定义多个，也可以不定义 - group-configs: - - group: 1.演示模块 - packages-to-scan: org.dromara.demo - - group: 2.通用模块 - packages-to-scan: org.dromara.web - - group: 3.系统模块 - packages-to-scan: org.dromara.system - - group: 4.代码生成模块 - packages-to-scan: org.dromara.generator - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludeUrls: - - /system/notice - - /workflow/model/save - - /workflow/model/editModelXml - -# 全局线程池相关配置 -# 如使用JDK21请直接使用虚拟线程 不要开启此配置 -thread-pool: - # 是否开启线程池 - enabled: false - # 队列最大长度 - queueCapacity: 128 - # 线程池维护线程所允许的空闲时间 - keepAliveSeconds: 300 - ---- # 分布式锁 lock4j 全局配置 -lock4j: - # 获取分布式锁超时时间，默认为 3000 毫秒 - acquire-timeout: 3000 - # 分布式锁的超时时间，默认为 30 秒 - expire: 30000 - ---- # Actuator 监控端点的配置项 -management: - endpoints: - web: - exposure: - include: '*' - endpoint: - health: - show-details: ALWAYS - logfile: - external-file: ./logs/sys-console.log - ---- # 默认/推荐使用sse推送 -sse: - enabled: true - path: /resource/sse - ---- # websocket -websocket: - # 如果关闭 需要和前端开关一起关闭 - enabled: false - # 路径 - path: /resource/websocket - # 设置访问源地址 - allowedOrigins: '*' - ---- #flowable配置 -flowable: - # 开关 用于启动/停用工作流 - enabled: true - process.enabled: ${flowable.enabled} - eventregistry.enabled: ${flowable.enabled} - async-executor-activate: false #关闭定时任务JOB - # 将databaseSchemaUpdate设置为true。当Flowable发现库与数据库表结构不一致时，会自动将数据库表结构升级至新版本。 - database-schema-update: true - activity-font-name: 宋体 - label-font-name: 宋体 - annotation-font-name: 宋体 - # 关闭各个模块生成表，目前只使用工作流基础表 - idm: - enabled: false - cmmn: - enabled: false - dmn: - enabled: false - app: - enabled: false - - # toco-配置 -endpoints: - enabled: false -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: ${DB_USER:hande_test_user} - password: ${DB_PASSWORD:Yu0FvhjUQDGdnmm5} - type: org.apache.tomcat.jdbc.pool.DataSource - jpa: - open-in-view: false - redis: - host: ${REDIS_HOST:redis.byteawake.com} - flyway: - enabled: false - exception: - isHtmlRequired: false - main: - allow-circular-references: true - allow-bean-definition-overriding: true -server: - forward-headers-strategy: framework -base: - package: com.toco_test_one -mock: - enabled: true -hibernate: - show_sql: true - dialect: org.hibernate.dialect.MySQLDialect -application: - name: toco_test_1 -mybatis: - configuration: - map-underscore-to-camel-case: true - -rocketmq: - name-server: ${ROCKETMQ_HOST:10.0.2.221:9876;10.0.2.222:9876;10.0.2.223:9876} - topic: ${DB_DATABASE:toco_test_1} - consumerGroup: CID_toco_test_1 - rocketmq.tag: '*' - producer.group: PID_toco_test_1 - -xxl: - job: - admin: - addresses: ${XXL_JOB_ADMIN_ADDRESS:https://xxljob.teitui.com/xxl-job-admin} - username: ${XXL_JOB_ADMIN_USER:admin} - password: ${XXL_JOB_ADMIN_PASSWORD:123456} - executor: - port: 9999 - appname: toco_test_1 - title: toco_test_1 - accessToken: default_token - -#redis -redis-config: - pool: - hostAndPort: ${REDIS_HOST:redis.byteawake.com:6379} - password: ${REDIS_PASSWORD:} - maxTotal: 100 - maxIdle: 10 - minIdle: 10 - maxWaitMillis: 10000 - softMinEvictableIdleTimeMillis: 10000 - testOnBorrow: true - testOnReturn: true - testWhileIdle: true - timeBetweenEvictionRunsMillis: 30000 - minEvictableIdleTimeMillis: 1800000 - numTestsPerEvictionRun: 3 - blockWhenExhausted: true - jmxEnabled: true - lifo: true -vs: - db: - basetable: - create: true - - - diff --git a/template/ruoyi-admin/src/main/resources/banner.txt b/template/ruoyi-admin/src/main/resources/banner.txt deleted file mode 100644 index 21b1126..0000000 --- a/template/ruoyi-admin/src/main/resources/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ -Application Version: ${revision} -Spring Boot Version: ${spring-boot.version} -__________ _____.___.__ ____ ____ __________.__ -\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ - | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/ - | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \ - |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ > - \/ \/ \/ \/ diff --git a/template/ruoyi-admin/src/main/resources/i18n/messages.properties b/template/ruoyi-admin/src/main/resources/i18n/messages.properties deleted file mode 100644 index cce11c8..0000000 --- a/template/ruoyi-admin/src/main/resources/i18n/messages.properties +++ /dev/null @@ -1,61 +0,0 @@ -#错误消息 -not.null=* 必须填写 -user.jcaptcha.error=验证码错误 -user.jcaptcha.expire=验证码已失效 -user.not.exists=对不起, 您的账号：{0} 不存在. -user.password.not.match=用户不存在/密码错误 -user.password.retry.limit.count=密码输入错误{0}次 -user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 -user.password.delete=对不起，您的账号：{0} 已被删除 -user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员 -role.blocked=角色已封禁，请联系管理员 -user.logout.success=退出成功 -length.not.valid=长度必须在{min}到{max}个字符之间 -user.username.not.blank=用户名不能为空 -user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 -user.username.length.valid=账户长度必须在{min}到{max}个字符之间 -user.password.not.blank=用户密码不能为空 -user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 -user.password.not.valid=* 5-50个字符 -user.email.not.valid=邮箱格式错误 -user.email.not.blank=邮箱不能为空 -user.phonenumber.not.blank=用户手机号不能为空 -user.mobile.phone.number.not.valid=手机号格式错误 -user.login.success=登录成功 -user.register.success=注册成功 -user.register.save.error=保存用户 {0} 失败，注册账号已存在 -user.register.error=注册失败，请联系系统管理人员 -user.notfound=请重新登录 -user.forcelogout=管理员强制退出，请重新登录 -user.unknown.error=未知错误，请重新登录 -auth.grant.type.error=认证权限类型错误 -auth.grant.type.blocked=认证权限类型已禁用 -auth.grant.type.not.blank=认证权限类型不能为空 -auth.clientid.not.blank=认证客户端id不能为空 -##文件上传消息 -upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ -upload.filename.exceed.length=上传的文件名最长{0}个字符 -##权限 -no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] -no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] -no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] -no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] -no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] -no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] -repeat.submit.message=不允许重复提交，请稍候再试 -rate.limiter.message=访问过于频繁，请稍候再试 -sms.code.not.blank=短信验证码不能为空 -sms.code.retry.limit.count=短信验证码输入错误{0}次 -sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟 -email.code.not.blank=邮箱验证码不能为空 -email.code.retry.limit.count=邮箱验证码输入错误{0}次 -email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟 -xcx.code.not.blank=小程序[code]不能为空 -social.source.not.blank=第三方登录平台[source]不能为空 -social.code.not.blank=第三方登录平台[code]不能为空 -social.state.not.blank=第三方登录平台[state]不能为空 -##租户 -tenant.number.not.blank=租户编号不能为空 -tenant.not.exists=对不起, 您的租户不存在，请联系管理员 -tenant.blocked=对不起，您的租户已禁用，请联系管理员 -tenant.expired=对不起，您的租户已过期，请联系管理员 diff --git a/template/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/template/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties deleted file mode 100644 index f948c4a..0000000 --- a/template/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ /dev/null @@ -1,61 +0,0 @@ -#错误消息 -not.null=* Required fill in -user.jcaptcha.error=Captcha error -user.jcaptcha.expire=Captcha invalid -user.not.exists=Sorry, your account: {0} does not exist -user.password.not.match=User does not exist/Password error -user.password.retry.limit.count=Password input error {0} times -user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes -user.password.delete=Sorry, your account：{0} has been deleted -user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator -role.blocked=Role disabled，please contact administrators -user.logout.success=Exit successful -length.not.valid=The length must be between {min} and {max} characters -user.username.not.blank=Username cannot be blank -user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number -user.username.length.valid=Account length must be between {min} and {max} characters -user.password.not.blank=Password cannot be empty -user.password.length.valid=Password length must be between {min} and {max} characters -user.password.not.valid=* 5-50 characters -user.email.not.valid=Mailbox format error -user.email.not.blank=Mailbox cannot be blank -user.phonenumber.not.blank=Phone number cannot be blank -user.mobile.phone.number.not.valid=Phone number format error -user.login.success=Login successful -user.register.success=Register successful -user.register.save.error=Failed to save user {0}, The registered account already exists -user.register.error=Register failed, please contact system administrator -user.notfound=Please login again -user.forcelogout=The administrator is forced to exit，please login again -user.unknown.error=Unknown error, please login again -auth.grant.type.error=Auth grant type error -auth.grant.type.blocked=Auth grant type disabled -auth.grant.type.not.blank=Auth grant type cannot be blank -auth.clientid.not.blank=Auth clientid cannot be blank -##文件上传消息 -upload.exceed.maxSize=The uploaded file size exceeds the limit file size！
the maximum allowed file size is：{0}MB！ -upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters -##权限 -no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}] -no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}] -no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}] -no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}] -no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}] -no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}] -repeat.submit.message=Repeat submit is not allowed, please try again later -rate.limiter.message=Visit too frequently, please try again later -sms.code.not.blank=Sms code cannot be blank -sms.code.retry.limit.count=Sms code input error {0} times -sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {1} minutes -email.code.not.blank=Email code cannot be blank -email.code.retry.limit.count=Email code input error {0} times -email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes -xcx.code.not.blank=Mini program [code] cannot be blank -social.source.not.blank=Social login platform [source] cannot be blank -social.code.not.blank=Social login platform [code] cannot be blank -social.state.not.blank=Social login platform [state] cannot be blank -##租户 -tenant.number.not.blank=Tenant number cannot be blank -tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator -tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator -tenant.expired=Sorry, your tenant has expired. Please contact the administrator. diff --git a/template/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/template/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties deleted file mode 100644 index cce11c8..0000000 --- a/template/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ /dev/null @@ -1,61 +0,0 @@ -#错误消息 -not.null=* 必须填写 -user.jcaptcha.error=验证码错误 -user.jcaptcha.expire=验证码已失效 -user.not.exists=对不起, 您的账号：{0} 不存在. -user.password.not.match=用户不存在/密码错误 -user.password.retry.limit.count=密码输入错误{0}次 -user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 -user.password.delete=对不起，您的账号：{0} 已被删除 -user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员 -role.blocked=角色已封禁，请联系管理员 -user.logout.success=退出成功 -length.not.valid=长度必须在{min}到{max}个字符之间 -user.username.not.blank=用户名不能为空 -user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 -user.username.length.valid=账户长度必须在{min}到{max}个字符之间 -user.password.not.blank=用户密码不能为空 -user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 -user.password.not.valid=* 5-50个字符 -user.email.not.valid=邮箱格式错误 -user.email.not.blank=邮箱不能为空 -user.phonenumber.not.blank=用户手机号不能为空 -user.mobile.phone.number.not.valid=手机号格式错误 -user.login.success=登录成功 -user.register.success=注册成功 -user.register.save.error=保存用户 {0} 失败，注册账号已存在 -user.register.error=注册失败，请联系系统管理人员 -user.notfound=请重新登录 -user.forcelogout=管理员强制退出，请重新登录 -user.unknown.error=未知错误，请重新登录 -auth.grant.type.error=认证权限类型错误 -auth.grant.type.blocked=认证权限类型已禁用 -auth.grant.type.not.blank=认证权限类型不能为空 -auth.clientid.not.blank=认证客户端id不能为空 -##文件上传消息 -upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ -upload.filename.exceed.length=上传的文件名最长{0}个字符 -##权限 -no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] -no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] -no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] -no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] -no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] -no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] -repeat.submit.message=不允许重复提交，请稍候再试 -rate.limiter.message=访问过于频繁，请稍候再试 -sms.code.not.blank=短信验证码不能为空 -sms.code.retry.limit.count=短信验证码输入错误{0}次 -sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟 -email.code.not.blank=邮箱验证码不能为空 -email.code.retry.limit.count=邮箱验证码输入错误{0}次 -email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟 -xcx.code.not.blank=小程序[code]不能为空 -social.source.not.blank=第三方登录平台[source]不能为空 -social.code.not.blank=第三方登录平台[code]不能为空 -social.state.not.blank=第三方登录平台[state]不能为空 -##租户 -tenant.number.not.blank=租户编号不能为空 -tenant.not.exists=对不起, 您的租户不存在，请联系管理员 -tenant.blocked=对不起，您的租户已禁用，请联系管理员 -tenant.expired=对不起，您的租户已过期，请联系管理员 diff --git a/template/ruoyi-admin/src/main/resources/ip2region.xdb b/template/ruoyi-admin/src/main/resources/ip2region.xdb deleted file mode 100644 index 7052c05..0000000 Binary files a/template/ruoyi-admin/src/main/resources/ip2region.xdb and /dev/null differ diff --git a/template/ruoyi-admin/src/main/resources/logback-plus.xml b/template/ruoyi-admin/src/main/resources/logback-plus.xml deleted file mode 100644 index 40fa33b..0000000 --- a/template/ruoyi-admin/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - ${console.log.pattern} - utf-8 - - - - - - ${log.path}/sys-console.log - - - ${log.path}/sys-console.%d{yyyy-MM-dd}.log - - 1 - - - ${log.pattern} - utf-8 - - - - INFO - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - 0 - - 512 - - - - - - - - 0 - - 512 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/template/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java deleted file mode 100644 index dba2323..0000000 --- a/template/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.dromara.test; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -/** - * 断言单元测试案例 - * - * @author Lion Li - */ -@DisplayName("断言单元测试案例") -public class AssertUnitTest { - - @DisplayName("测试 assertEquals 方法") - @Test - public void testAssertEquals() { - Assertions.assertEquals("666", new String("666")); - Assertions.assertNotEquals("666", new String("666")); - } - - @DisplayName("测试 assertSame 方法") - @Test - public void testAssertSame() { - Object obj = new Object(); - Object obj1 = obj; - Assertions.assertSame(obj, obj1); - Assertions.assertNotSame(obj, obj1); - } - - @DisplayName("测试 assertTrue 方法") - @Test - public void testAssertTrue() { - Assertions.assertTrue(true); - Assertions.assertFalse(true); - } - - @DisplayName("测试 assertNull 方法") - @Test - public void testAssertNull() { - Assertions.assertNull(null); - Assertions.assertNotNull(null); - } - -} diff --git a/template/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/template/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java deleted file mode 100644 index 5b3dfdc..0000000 --- a/template/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.test; - -import org.dromara.common.core.config.RuoYiConfig; -import org.junit.jupiter.api.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.concurrent.TimeUnit; - -/** - * 单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 -@DisplayName("单元测试案例") -public class DemoUnitTest { - - @Autowired - private RuoYiConfig ruoYiConfig; - - @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") - @Test - public void testTest() { - System.out.println(ruoYiConfig); - } - - @Disabled - @DisplayName("测试 @Disabled 注解") - @Test - public void testDisabled() { - System.out.println(ruoYiConfig); - } - - @Timeout(value = 2L, unit = TimeUnit.SECONDS) - @DisplayName("测试 @Timeout 注解") - @Test - public void testTimeout() throws InterruptedException { - Thread.sleep(3000); - System.out.println(ruoYiConfig); - } - - - @DisplayName("测试 @RepeatedTest 注解") - @RepeatedTest(3) - public void testRepeatedTest() { - System.out.println(666); - } - - @BeforeAll - public static void testBeforeAll() { - System.out.println("@BeforeAll =================="); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - @AfterAll - public static void testAfterAll() { - System.out.println("@AfterAll =================="); - } - -} diff --git a/template/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/template/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java deleted file mode 100644 index 1db51df..0000000 --- a/template/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.dromara.test; - -import org.dromara.common.core.enums.UserType; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; -import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.NullSource; -import org.junit.jupiter.params.provider.ValueSource; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - -/** - * 带参数单元测试案例 - * - * @author Lion Li - */ -@DisplayName("带参数单元测试案例") -public class ParamUnitTest { - - @DisplayName("测试 @ValueSource 注解") - @ParameterizedTest - @ValueSource(strings = {"t1", "t2", "t3"}) - public void testValueSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @NullSource 注解") - @ParameterizedTest - @NullSource - public void testNullSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @EnumSource 注解") - @ParameterizedTest - @EnumSource(UserType.class) - public void testEnumSource(UserType type) { - System.out.println(type.getUserType()); - } - - @DisplayName("测试 @MethodSource 注解") - @ParameterizedTest - @MethodSource("getParam") - public void testMethodSource(String str) { - System.out.println(str); - } - - public static Stream getParam() { - List list = new ArrayList<>(); - list.add("t1"); - list.add("t2"); - list.add("t3"); - return list.stream(); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} diff --git a/template/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/template/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java deleted file mode 100644 index b50afa6..0000000 --- a/template/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.test; - -import org.junit.jupiter.api.*; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * 标签单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest -@DisplayName("标签单元测试案例") -public class TagUnitTest { - - @Tag("dev") - @DisplayName("测试 @Tag dev") - @Test - public void testTagDev() { - System.out.println("dev"); - } - - @Tag("prod") - @DisplayName("测试 @Tag prod") - @Test - public void testTagProd() { - System.out.println("prod"); - } - - @Tag("local") - @DisplayName("测试 @Tag local") - @Test - public void testTagLocal() { - System.out.println("local"); - } - - @Tag("exclude") - @DisplayName("测试 @Tag exclude") - @Test - public void testTagExclude() { - System.out.println("exclude"); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} diff --git a/template/ruoyi-common/pom.xml b/template/ruoyi-common/pom.xml deleted file mode 100644 index 2930fd0..0000000 --- a/template/ruoyi-common/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - - - ruoyi-common-bom - ruoyi-common-social - ruoyi-common-core - ruoyi-common-doc - ruoyi-common-excel - ruoyi-common-idempotent - ruoyi-common-job - ruoyi-common-log - ruoyi-common-mail - ruoyi-common-mybatis - ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-redis - ruoyi-common-satoken - ruoyi-common-security - ruoyi-common-sms - ruoyi-common-web - ruoyi-common-translation - ruoyi-common-sensitive - ruoyi-common-json - ruoyi-common-encrypt - ruoyi-common-tenant - ruoyi-common-websocket - ruoyi-common-sse - - - ruoyi-common - pom - - - common 通用模块 - - - diff --git a/template/ruoyi-common/ruoyi-common-bom/pom.xml b/template/ruoyi-common/ruoyi-common-bom/pom.xml deleted file mode 100644 index dbc5f1c..0000000 --- a/template/ruoyi-common/ruoyi-common-bom/pom.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - 4.0.0 - - org.dromara - ruoyi-common-bom - ${revision} - pom - - - ruoyi-common-bom common依赖项 - - - - 5.2.3 - - - - - - - org.dromara - ruoyi-common-core - ${revision} - - - - - org.dromara - ruoyi-common-doc - ${revision} - - - - - org.dromara - ruoyi-common-excel - ${revision} - - - - - org.dromara - ruoyi-common-idempotent - ${revision} - - - - - org.dromara - ruoyi-common-job - ${revision} - - - - - org.dromara - ruoyi-common-log - ${revision} - - - - - org.dromara - ruoyi-common-mail - ${revision} - - - - - org.dromara - ruoyi-common-mybatis - ${revision} - - - - - org.dromara - ruoyi-common-oss - ${revision} - - - - - org.dromara - ruoyi-common-ratelimiter - ${revision} - - - - - org.dromara - ruoyi-common-redis - ${revision} - - - - - org.dromara - ruoyi-common-satoken - ${revision} - - - - - org.dromara - ruoyi-common-security - ${revision} - - - - - org.dromara - ruoyi-common-sms - ${revision} - - - - org.dromara - ruoyi-common-social - ${revision} - - - - - org.dromara - ruoyi-common-web - ${revision} - - - - - org.dromara - ruoyi-common-translation - ${revision} - - - - - org.dromara - ruoyi-common-sensitive - ${revision} - - - - - org.dromara - ruoyi-common-json - ${revision} - - - - - org.dromara - ruoyi-common-encrypt - ${revision} - - - - - org.dromara - ruoyi-common-tenant - ${revision} - - - - - org.dromara - ruoyi-common-websocket - ${revision} - - - - - org.dromara - ruoyi-common-sse - ${revision} - - - - - - diff --git a/template/ruoyi-common/ruoyi-common-core/pom.xml b/template/ruoyi-common/ruoyi-common-core/pom.xml deleted file mode 100644 index ad37e90..0000000 --- a/template/ruoyi-common/ruoyi-common-core/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-core - - - ruoyi-common-core 核心模块 - - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - org.springframework.boot - spring-boot-starter-validation - - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.apache.commons - commons-lang3 - - - - - jakarta.servlet - jakarta.servlet-api - - - - cn.hutool - hutool-core - - - - cn.hutool - hutool-http - - - - cn.hutool - hutool-extra - - - - org.projectlombok - lombok - - - - - org.springframework.boot - spring-boot-configuration-processor - - - - org.springframework.boot - spring-boot-properties-migrator - runtime - - - - io.github.linpeilie - mapstruct-plus-spring-boot-starter - - - - - org.lionsoul - ip2region - - - - - diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java deleted file mode 100644 index d9f70e4..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.common.core.config; - -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; - -/** - * 程序注解配置 - * - * @author Lion Li - */ -@AutoConfiguration -@EnableAspectJAutoProxy -@EnableAsync(proxyTargetClass = true) -public class ApplicationConfig { - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java deleted file mode 100644 index cd01e33..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.common.core.config; - -import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.core.task.VirtualThreadTaskExecutor; -import org.springframework.scheduling.annotation.AsyncConfigurer; - -import java.util.Arrays; -import java.util.concurrent.Executor; - -/** - * 异步配置 - *

- * 如果未使用虚拟线程则生效 - * - * @author Lion Li - */ -@AutoConfiguration -public class AsyncConfig implements AsyncConfigurer { - - /** - * 自定义 @Async 注解使用系统线程池 - */ - @Override - public Executor getAsyncExecutor() { - if(SpringUtils.isVirtual()) { - return new VirtualThreadTaskExecutor("async-"); - } - return SpringUtils.getBean("scheduledExecutorService"); - } - - /** - * 异步执行异常处理 - */ - @Override - public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - return (throwable, method, objects) -> { - throwable.printStackTrace(); - StringBuilder sb = new StringBuilder(); - sb.append("Exception message - ").append(throwable.getMessage()) - .append(", Method name - ").append(method.getName()); - if (ArrayUtil.isNotEmpty(objects)) { - sb.append(", Parameter value - ").append(Arrays.toString(objects)); - } - throw new ServiceException(sb.toString()); - }; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java deleted file mode 100644 index cc0d2df..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.common.core.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 读取项目相关配置 - * - * @author Lion Li - */ - -@Data -@Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig { - - /** - * 项目名称 - */ - private String name; - - /** - * 版本 - */ - private String version; - - /** - * 版权年份 - */ - private String copyrightYear; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java deleted file mode 100644 index b4d4528..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.dromara.common.core.config; - -import jakarta.annotation.PreDestroy; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.dromara.common.core.config.properties.ThreadPoolProperties; -import org.dromara.common.core.utils.Threads; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.ThreadPoolExecutor; - -/** - * 线程池配置 - * - * @author Lion Li - **/ -@Slf4j -@AutoConfiguration -@EnableConfigurationProperties(ThreadPoolProperties.class) -public class ThreadPoolConfig { - - /** - * 核心线程数 = cpu 核心数 + 1 - */ - private final int core = Runtime.getRuntime().availableProcessors() + 1; - - private ScheduledExecutorService scheduledExecutorService; - - @Bean(name = "threadPoolTaskExecutor") - @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") - public ThreadPoolTaskExecutor threadPoolTaskExecutor(ThreadPoolProperties threadPoolProperties) { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(core); - executor.setMaxPoolSize(core * 2); - executor.setQueueCapacity(threadPoolProperties.getQueueCapacity()); - executor.setKeepAliveSeconds(threadPoolProperties.getKeepAliveSeconds()); - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); - return executor; - } - - /** - * 执行周期性或定时任务 - */ - @Bean(name = "scheduledExecutorService") - protected ScheduledExecutorService scheduledExecutorService() { - ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(core, - new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(), - new ThreadPoolExecutor.CallerRunsPolicy()) { - @Override - protected void afterExecute(Runnable r, Throwable t) { - super.afterExecute(r, t); - Threads.printException(r, t); - } - }; - this.scheduledExecutorService = scheduledThreadPoolExecutor; - return scheduledThreadPoolExecutor; - } - - /** - * 销毁事件 - */ - @PreDestroy - public void destroy() { - try { - log.info("====关闭后台任务任务线程池===="); - Threads.shutdownAndAwaitTermination(scheduledExecutorService); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java deleted file mode 100644 index 45c5bd1..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.common.core.config; - -import jakarta.validation.Validator; -import org.hibernate.validator.HibernateValidator; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.MessageSource; -import org.springframework.context.annotation.Bean; -import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; - -import java.util.Properties; - -/** - * 校验框架配置类 - * - * @author Lion Li - */ -@AutoConfiguration -public class ValidatorConfig { - - /** - * 配置校验框架 快速返回模式 - */ - @Bean - public Validator validator(MessageSource messageSource) { - try (LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean()) { - // 国际化 - factoryBean.setValidationMessageSource(messageSource); - // 设置使用 HibernateValidator 校验器 - factoryBean.setProviderClass(HibernateValidator.class); - Properties properties = new Properties(); - // 设置 快速异常返回 - properties.setProperty("hibernate.validator.fail_fast", "true"); - factoryBean.setValidationProperties(properties); - // 加载配置 - factoryBean.afterPropertiesSet(); - return factoryBean.getValidator(); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java deleted file mode 100644 index 820564f..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.core.config.properties; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 线程池 配置属性 - * - * @author Lion Li - */ -@Data -@ConfigurationProperties(prefix = "thread-pool") -public class ThreadPoolProperties { - - /** - * 是否开启线程池 - */ - private boolean enabled; - - /** - * 队列最大长度 - */ - private int queueCapacity; - - /** - * 线程池维护线程所允许的空闲时间 - */ - private int keepAliveSeconds; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java deleted file mode 100644 index ceb8370..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 缓存的key 常量 - * - * @author Lion Li - */ -public interface CacheConstants { - - /** - * 在线用户 redis key - */ - String ONLINE_TOKEN_KEY = "online_tokens:"; - - /** - * 参数管理 cache key - */ - String SYS_CONFIG_KEY = "sys_config:"; - - /** - * 字典管理 cache key - */ - String SYS_DICT_KEY = "sys_dict:"; - - /** - * 登录账户密码错误次数 redis key - */ - String PWD_ERR_CNT_KEY = "pwd_err_cnt:"; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java deleted file mode 100644 index 28ba177..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 缓存组名称常量 - *

- * key 格式为 cacheNames#ttl#maxIdleTime#maxSize - *

- * ttl 过期时间 如果设置为0则不过期 默认为0 - * maxIdleTime 最大空闲时间 根据LRU算法清理空闲数据 如果设置为0则不检测 默认为0 - * maxSize 组最大长度 根据LRU算法清理溢出数据 如果设置为0则无限长 默认为0 - *

- * 例子: test#60s、test#0#60s、test#0#1m#1000、test#1h#0#500 - * - * @author Lion Li - */ -public interface CacheNames { - - /** - * 演示案例 - */ - String DEMO_CACHE = "demo:cache#60s#10m#20"; - - /** - * 系统配置 - */ - String SYS_CONFIG = "sys_config"; - - /** - * 数据字典 - */ - String SYS_DICT = "sys_dict"; - - /** - * 租户 - */ - String SYS_TENANT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_tenant#30d"; - - /** - * 客户端 - */ - String SYS_CLIENT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_client#30d"; - - /** - * 用户账户 - */ - String SYS_USER_NAME = "sys_user_name#30d"; - - /** - * 用户名称 - */ - String SYS_NICKNAME = "sys_nickname#30d"; - - /** - * 部门 - */ - String SYS_DEPT = "sys_dept#30d"; - - /** - * OSS内容 - */ - String SYS_OSS = "sys_oss#30d"; - - /** - * OSS配置 - */ - String SYS_OSS_CONFIG = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss_config"; - - /** - * 在线用户 - */ - String ONLINE_TOKEN = "online_tokens"; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java deleted file mode 100644 index cdbda89..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 通用常量信息 - * - * @author ruoyi - */ -public interface Constants { - - /** - * UTF-8 字符集 - */ - String UTF8 = "UTF-8"; - - /** - * GBK 字符集 - */ - String GBK = "GBK"; - - /** - * www主域 - */ - String WWW = "www."; - - /** - * http请求 - */ - String HTTP = "http://"; - - /** - * https请求 - */ - String HTTPS = "https://"; - - /** - * 通用成功标识 - */ - String SUCCESS = "0"; - - /** - * 通用失败标识 - */ - String FAIL = "1"; - - /** - * 登录成功 - */ - String LOGIN_SUCCESS = "Success"; - - /** - * 注销 - */ - String LOGOUT = "Logout"; - - /** - * 注册 - */ - String REGISTER = "Register"; - - /** - * 登录失败 - */ - String LOGIN_FAIL = "Error"; - - /** - * 验证码有效期（分钟） - */ - Integer CAPTCHA_EXPIRATION = 2; - - /** - * 令牌 - */ - String TOKEN = "token"; - - /** - * 顶级部门id - */ - Long TOP_PARENT_ID = 0L; - -} - diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java deleted file mode 100644 index 5352b11..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 全局的key常量 (业务无关的key) - * - * @author Lion Li - */ -public interface GlobalConstants { - - /** - * 全局 redis key (业务无关的key) - */ - String GLOBAL_REDIS_KEY = "global:"; - - /** - * 验证码 redis key - */ - String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:"; - - /** - * 防重提交 redis key - */ - String REPEAT_SUBMIT_KEY = GLOBAL_REDIS_KEY + "repeat_submit:"; - - /** - * 限流 redis key - */ - String RATE_LIMIT_KEY = GLOBAL_REDIS_KEY + "rate_limit:"; - - /** - * 三方认证 redis key - */ - String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:"; -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java deleted file mode 100644 index 85566e8..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 返回状态码 - * - * @author Lion Li - */ -public interface HttpStatus { - /** - * 操作成功 - */ - int SUCCESS = 200; - - /** - * 对象创建成功 - */ - int CREATED = 201; - - /** - * 请求已经被接受 - */ - int ACCEPTED = 202; - - /** - * 操作已经执行成功，但是没有返回数据 - */ - int NO_CONTENT = 204; - - /** - * 资源已被移除 - */ - int MOVED_PERM = 301; - - /** - * 重定向 - */ - int SEE_OTHER = 303; - - /** - * 资源没有被修改 - */ - int NOT_MODIFIED = 304; - - /** - * 参数列表错误（缺少，格式不匹配） - */ - int BAD_REQUEST = 400; - - /** - * 未授权 - */ - int UNAUTHORIZED = 401; - - /** - * 访问受限，授权过期 - */ - int FORBIDDEN = 403; - - /** - * 资源，服务未找到 - */ - int NOT_FOUND = 404; - - /** - * 不允许的http方法 - */ - int BAD_METHOD = 405; - - /** - * 资源冲突，或者资源被锁 - */ - int CONFLICT = 409; - - /** - * 不支持的数据，媒体类型 - */ - int UNSUPPORTED_TYPE = 415; - - /** - * 系统内部错误 - */ - int ERROR = 500; - - /** - * 接口未实现 - */ - int NOT_IMPLEMENTED = 501; - - /** - * 系统警告消息 - */ - int WARN = 601; -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java deleted file mode 100644 index 77eed8c..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.common.core.constant; - -import cn.hutool.core.lang.RegexPool; - -/** - * 常用正则表达式字符串 - *

- * 常用正则表达式集合，更多正则见: https://any86.github.io/any-rule/ - * - * @author Feng - */ -public interface RegexConstants extends RegexPool { - - /** - * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） - */ - String DICTIONARY_TYPE = "^[a-z][a-z0-9_]*$"; - - /** - * 权限标识必须符合 tool:build:list 格式，或者空字符串 - */ - String PERMISSION_STRING = "^(|^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+:[a-zA-Z0-9_]+)$"; - - /** - * 身份证号码（后6位） - */ - String ID_CARD_LAST_6 = "^(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$"; - - /** - * QQ号码 - */ - String QQ_NUMBER = "^[1-9][0-9]\\d{4,9}$"; - - /** - * 邮政编码 - */ - String POSTAL_CODE = "^[1-9]\\d{5}$"; - - /** - * 注册账号 - */ - String ACCOUNT = "^[a-zA-Z][a-zA-Z0-9_]{4,15}$"; - - /** - * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符 - */ - String PASSWORD = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$"; - - /** - * 通用状态（0表示正常，1表示停用） - */ - String STATUS = "^[01]$"; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java deleted file mode 100644 index 86b63c9..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 租户常量信息 - * - * @author Lion Li - */ -public interface TenantConstants { - - /** - * 租户正常状态 - */ - String NORMAL = "0"; - - /** - * 租户封禁状态 - */ - String DISABLE = "1"; - - /** - * 超级管理员ID - */ - Long SUPER_ADMIN_ID = 1L; - - /** - * 超级管理员角色 roleKey - */ - String SUPER_ADMIN_ROLE_KEY = "superadmin"; - - /** - * 租户管理员角色 roleKey - */ - String TENANT_ADMIN_ROLE_KEY = "admin"; - - /** - * 租户管理员角色名称 - */ - String TENANT_ADMIN_ROLE_NAME = "管理员"; - - /** - * 默认租户ID - */ - String DEFAULT_TENANT_ID = "000000"; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java deleted file mode 100644 index 76f6dd4..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.dromara.common.core.constant; - -/** - * 用户常量信息 - * - * @author ruoyi - */ -public interface UserConstants { - - /** - * 平台内系统用户的唯一标志 - */ - String SYS_USER = "SYS_USER"; - - /** - * 正常状态 - */ - String NORMAL = "0"; - - /** - * 异常状态 - */ - String EXCEPTION = "1"; - - /** - * 用户正常状态 - */ - String USER_NORMAL = "0"; - - /** - * 用户封禁状态 - */ - String USER_DISABLE = "1"; - - /** - * 角色正常状态 - */ - String ROLE_NORMAL = "0"; - - /** - * 角色封禁状态 - */ - String ROLE_DISABLE = "1"; - - /** - * 部门正常状态 - */ - String DEPT_NORMAL = "0"; - - /** - * 部门停用状态 - */ - String DEPT_DISABLE = "1"; - - /** - * 岗位正常状态 - */ - String POST_NORMAL = "0"; - - /** - * 岗位停用状态 - */ - String POST_DISABLE = "1"; - - /** - * 字典正常状态 - */ - String DICT_NORMAL = "0"; - - /** - * 通用存在标志 - */ - String DEL_FLAG_NORMAL = "0"; - - /** - * 通用删除标志 - */ - String DEL_FLAG_REMOVED = "2"; - - /** - * 是否为系统默认（是） - */ - String YES = "Y"; - - /** - * 是否菜单外链（是） - */ - String YES_FRAME = "0"; - - /** - * 是否菜单外链（否） - */ - String NO_FRAME = "1"; - - /** - * 菜单正常状态 - */ - String MENU_NORMAL = "0"; - - /** - * 菜单停用状态 - */ - String MENU_DISABLE = "1"; - - /** - * 菜单类型（目录） - */ - String TYPE_DIR = "M"; - - /** - * 菜单类型（菜单） - */ - String TYPE_MENU = "C"; - - /** - * 菜单类型（按钮） - */ - String TYPE_BUTTON = "F"; - - /** - * Layout组件标识 - */ - String LAYOUT = "Layout"; - - /** - * ParentView组件标识 - */ - String PARENT_VIEW = "ParentView"; - - /** - * InnerLink组件标识 - */ - String INNER_LINK = "InnerLink"; - - /** - * 用户名长度限制 - */ - int USERNAME_MIN_LENGTH = 2; - int USERNAME_MAX_LENGTH = 20; - - /** - * 密码长度限制 - */ - int PASSWORD_MIN_LENGTH = 5; - int PASSWORD_MAX_LENGTH = 20; - - /** - * 超级管理员ID - */ - Long SUPER_ADMIN_ID = 1L; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java deleted file mode 100644 index be85805..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.dromara.common.core.domain; - -import org.dromara.common.core.constant.HttpStatus; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 响应信息主体 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class R implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 成功 - */ - public static final int SUCCESS = 200; - - /** - * 失败 - */ - public static final int FAIL = 500; - - private int code; - - private String msg; - - private T data; - - public static R ok() { - return restResult(null, SUCCESS, "操作成功"); - } - - public static R ok(T data) { - return restResult(data, SUCCESS, "操作成功"); - } - - public static R ok(String msg) { - return restResult(null, SUCCESS, msg); - } - - public static R ok(String msg, T data) { - return restResult(data, SUCCESS, msg); - } - - public static R fail() { - return restResult(null, FAIL, "操作失败"); - } - - public static R fail(String msg) { - return restResult(null, FAIL, msg); - } - - public static R fail(T data) { - return restResult(data, FAIL, "操作失败"); - } - - public static R fail(String msg, T data) { - return restResult(data, FAIL, msg); - } - - public static R fail(int code, String msg) { - return restResult(null, code, msg); - } - - /** - * 返回警告消息 - * - * @param msg 返回内容 - * @return 警告消息 - */ - public static R warn(String msg) { - return restResult(null, HttpStatus.WARN, msg); - } - - /** - * 返回警告消息 - * - * @param msg 返回内容 - * @param data 数据对象 - * @return 警告消息 - */ - public static R warn(String msg, T data) { - return restResult(data, HttpStatus.WARN, msg); - } - - private static R restResult(T data, int code, String msg) { - R r = new R<>(); - r.setCode(code); - r.setData(data); - r.setMsg(msg); - return r; - } - - public static Boolean isError(R ret) { - return !isSuccess(ret); - } - - public static Boolean isSuccess(R ret) { - return R.SUCCESS == ret.getCode(); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java deleted file mode 100644 index 463821c..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.common.core.domain.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * OSS对象 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class OssDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 对象存储主键 - */ - private Long ossId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 原名 - */ - private String originalName; - - /** - * 文件后缀名 - */ - private String fileSuffix; - - /** - * URL地址 - */ - private String url; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java deleted file mode 100644 index aea8e7a..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.common.core.domain.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 角色 - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -public class RoleDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private Long roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 角色权限 - */ - private String roleKey; - - /** - * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） - */ - private String dataScope; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java deleted file mode 100644 index cb5def9..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.common.core.domain.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户 - * - * @author Michelle.Chung - */ -@Data -@NoArgsConstructor -public class UserDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private Long userId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 用户昵称 - */ - private String nickName; - - /** - * 用户类型（sys_user系统用户） - */ - private String userType; - - /** - * 用户邮箱 - */ - private String email; - - /** - * 手机号码 - */ - private String phonenumber; - - /** - * 用户性别（0男 1女 2未知） - */ - private String sex; - - /** - * 帐号状态（0正常 1停用） - */ - private String status; - - /** - * 创建时间 - */ - private Date createTime; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java deleted file mode 100644 index 43d8c3c..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.dromara.common.core.domain.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 当前在线会话 - * - * @author ruoyi - */ - -@Data -@NoArgsConstructor -public class UserOnlineDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 会话编号 - */ - private String tokenId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 用户名称 - */ - private String userName; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地址 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 登录时间 - */ - private Long loginTime; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java deleted file mode 100644 index 61c7efc..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.dromara.common.core.domain.event; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 总体流程监听 - * - * @author may - */ - -@Data -public class ProcessEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程定义key - */ - private String key; - - /** - * 业务id - */ - private String businessKey; - - /** - * 状态 - */ - private String status; - - /** - * 当为true时为申请人节点办理 - */ - private boolean submit; - - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java deleted file mode 100644 index 019ca82..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.common.core.domain.event; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 流程办理监听 - * - * @author may - */ - -@Data -public class ProcessTaskEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程定义key - */ - private String key; - - /** - * 审批节点key - */ - private String taskDefinitionKey; - - /** - * 任务id - */ - private String taskId; - - /** - * 业务id - */ - private String businessKey; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java deleted file mode 100644 index ffde8c6..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 邮件登录对象 - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class EmailLoginBody extends LoginBody { - - /** - * 邮箱 - */ - @NotBlank(message = "{user.email.not.blank}") - @Email(message = "{user.email.not.valid}") - private String email; - - /** - * 邮箱code - */ - @NotBlank(message = "{email.code.not.blank}") - private String emailCode; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java deleted file mode 100644 index 63bee0d..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 用户登录对象 - * - * @author Lion Li - */ - -@Data -public class LoginBody implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 客户端id - */ - @NotBlank(message = "{auth.clientid.not.blank}") - private String clientId; - - /** - * 授权类型 - */ - @NotBlank(message = "{auth.grant.type.not.blank}") - private String grantType; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 验证码 - */ - private String code; - - /** - * 唯一标识 - */ - private String uuid; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java deleted file mode 100644 index c723e76..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.dromara.common.core.domain.model; - -import org.dromara.common.core.domain.dto.RoleDTO; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; -import java.util.Set; - -/** - * 登录用户身份权限 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class LoginUser implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 用户ID - */ - private Long userId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 部门类别编码 - */ - private String deptCategory; - - /** - * 部门名 - */ - private String deptName; - - /** - * 用户唯一标识 - */ - private String token; - - /** - * 用户类型 - */ - private String userType; - - /** - * 登录时间 - */ - private Long loginTime; - - /** - * 过期时间 - */ - private Long expireTime; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 菜单权限 - */ - private Set menuPermission; - - /** - * 角色权限 - */ - private Set rolePermission; - - /** - * 用户名 - */ - private String username; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 角色对象 - */ - private List roles; - - /** - * 数据权限 当前角色ID - */ - private Long roleId; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 获取登录id - */ - public String getLoginId() { - if (userType == null) { - throw new IllegalArgumentException("用户类型不能为空"); - } - if (userId == null) { - throw new IllegalArgumentException("用户ID不能为空"); - } - return userType + ":" + userId; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java deleted file mode 100644 index 22de8f2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.Length; - -import static org.dromara.common.core.constant.UserConstants.*; - -/** - * 密码登录对象 - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class PasswordLoginBody extends LoginBody { - - /** - * 用户名 - */ - @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") - private String username; - - /** - * 用户密码 - */ - @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") - private String password; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java deleted file mode 100644 index 440422b..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.Length; - -import static org.dromara.common.core.constant.UserConstants.*; - -/** - * 用户注册对象 - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class RegisterBody extends LoginBody { - - /** - * 用户名 - */ - @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") - private String username; - - /** - * 用户密码 - */ - @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") - private String password; - - private String userType; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java deleted file mode 100644 index a878348..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 短信登录对象 - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class SmsLoginBody extends LoginBody { - - /** - * 手机号 - */ - @NotBlank(message = "{user.phonenumber.not.blank}") - private String phonenumber; - - /** - * 短信code - */ - @NotBlank(message = "{sms.code.not.blank}") - private String smsCode; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java deleted file mode 100644 index 0d1b121..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 三方登录对象 - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class SocialLoginBody extends LoginBody { - - /** - * 第三方登录平台 - */ - @NotBlank(message = "{social.source.not.blank}") - private String source; - - /** - * 第三方登录code - */ - @NotBlank(message = "{social.code.not.blank}") - private String socialCode; - - /** - * 第三方登录socialState - */ - @NotBlank(message = "{social.state.not.blank}") - private String socialState; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java deleted file mode 100644 index 518fe2e..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.common.core.domain.model; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 三方登录对象 - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class XcxLoginBody extends LoginBody { - - /** - * 小程序id(多个小程序时使用) - */ - private String appid; - - /** - * 小程序code - */ - @NotBlank(message = "{xcx.code.not.blank}") - private String xcxCode; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java deleted file mode 100644 index e5f3d6c..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.common.core.domain.model; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serial; - -/** - * 小程序登录用户身份权限 - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -public class XcxLoginUser extends LoginUser { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * openid - */ - private String openid; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java deleted file mode 100644 index 0af943a..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.dromara.common.core.enums; - -import cn.hutool.core.util.StrUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; - -import java.util.Arrays; - -/** - * 业务状态枚举 - * - * @author may - */ -@Getter -@AllArgsConstructor -public enum BusinessStatusEnum { - /** - * 已撤销 - */ - CANCEL("cancel", "已撤销"), - /** - * 草稿 - */ - DRAFT("draft", "草稿"), - /** - * 待审核 - */ - WAITING("waiting", "待审核"), - /** - * 已完成 - */ - FINISH("finish", "已完成"), - /** - * 已作废 - */ - INVALID("invalid", "已作废"), - /** - * 已退回 - */ - BACK("back", "已退回"), - /** - * 已终止 - */ - TERMINATION("termination", "已终止"); - - /** - * 状态 - */ - private final String status; - - /** - * 描述 - */ - private final String desc; - - /** - * 获取业务状态 - * - * @param status 状态 - */ - public static String findByStatus(String status) { - if (StringUtils.isBlank(status)) { - return StrUtil.EMPTY; - } - return Arrays.stream(BusinessStatusEnum.values()) - .filter(statusEnum -> statusEnum.getStatus().equals(status)) - .findFirst() - .map(BusinessStatusEnum::getDesc) - .orElse(StrUtil.EMPTY); - } - - /** - * 启动流程校验 - * - * @param status 状态 - */ - public static void checkStartStatus(String status) { - if (WAITING.getStatus().equals(status)) { - throw new ServiceException("该单据已提交过申请,正在审批中！"); - } else if (FINISH.getStatus().equals(status)) { - throw new ServiceException("该单据已完成申请！"); - } else if (INVALID.getStatus().equals(status)) { - throw new ServiceException("该单据已作废！"); - } else if (TERMINATION.getStatus().equals(status)) { - throw new ServiceException("该单据已终止！"); - } else if (StringUtils.isBlank(status)) { - throw new ServiceException("流程状态为空！"); - } - } - - /** - * 撤销流程校验 - * - * @param status 状态 - */ - public static void checkCancelStatus(String status) { - if (CANCEL.getStatus().equals(status)) { - throw new ServiceException("该单据已撤销！"); - } else if (FINISH.getStatus().equals(status)) { - throw new ServiceException("该单据已完成申请！"); - } else if (INVALID.getStatus().equals(status)) { - throw new ServiceException("该单据已作废！"); - } else if (TERMINATION.getStatus().equals(status)) { - throw new ServiceException("该单据已终止！"); - } else if (BACK.getStatus().equals(status)) { - throw new ServiceException("该单据已退回！"); - } else if (StringUtils.isBlank(status)) { - throw new ServiceException("流程状态为空！"); - } - } - - /** - * 驳回流程校验 - * - * @param status 状态 - */ - public static void checkBackStatus(String status) { - if (BACK.getStatus().equals(status)) { - throw new ServiceException("该单据已退回！"); - } else if (FINISH.getStatus().equals(status)) { - throw new ServiceException("该单据已完成申请！"); - } else if (INVALID.getStatus().equals(status)) { - throw new ServiceException("该单据已作废！"); - } else if (TERMINATION.getStatus().equals(status)) { - throw new ServiceException("该单据已终止！"); - } else if (CANCEL.getStatus().equals(status)) { - throw new ServiceException("该单据已撤销！"); - } else if (StringUtils.isBlank(status)) { - throw new ServiceException("流程状态为空！"); - } - } - - /** - * 作废,终止流程校验 - * - * @param status 状态 - */ - public static void checkInvalidStatus(String status) { - if (FINISH.getStatus().equals(status)) { - throw new ServiceException("该单据已完成申请！"); - } else if (INVALID.getStatus().equals(status)) { - throw new ServiceException("该单据已作废！"); - } else if (TERMINATION.getStatus().equals(status)) { - throw new ServiceException("该单据已终止！"); - } else if (StringUtils.isBlank(status)) { - throw new ServiceException("流程状态为空！"); - } - } -} - diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java deleted file mode 100644 index dbadfc2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 设备类型 - * 针对一套 用户体系 - * - * @author Lion Li - */ -@Getter -@AllArgsConstructor -public enum DeviceType { - - /** - * pc端 - */ - PC("pc"), - - /** - * app端 - */ - APP("app"), - - /** - * 小程序端 - */ - XCX("xcx"), - - /** - * social第三方端 - */ - SOCIAL("social"); - - private final String device; -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java deleted file mode 100644 index f9cac66..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.dromara.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 登录类型 - * - * @author Lion Li - */ -@Getter -@AllArgsConstructor -public enum LoginType { - - /** - * 密码登录 - */ - PASSWORD("user.password.retry.limit.exceed", "user.password.retry.limit.count"), - - /** - * 短信登录 - */ - SMS("sms.code.retry.limit.exceed", "sms.code.retry.limit.count"), - - /** - * 邮箱登录 - */ - EMAIL("email.code.retry.limit.exceed", "email.code.retry.limit.count"), - - /** - * 小程序登录 - */ - XCX("", ""); - - /** - * 登录重试超出限制提示 - */ - final String retryLimitExceed; - - /** - * 登录重试限制计数提示 - */ - final String retryLimitCount; -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java deleted file mode 100644 index 400a399..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 用户状态 - * - * @author LionLi - */ -@Getter -@AllArgsConstructor -public enum TenantStatus { - /** - * 正常 - */ - OK("0", "正常"), - /** - * 停用 - */ - DISABLE("1", "停用"), - /** - * 删除 - */ - DELETED("2", "删除"); - - private final String code; - private final String info; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java deleted file mode 100644 index be7e44d..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 用户状态 - * - * @author ruoyi - */ -@Getter -@AllArgsConstructor -public enum UserStatus { - /** - * 正常 - */ - OK("0", "正常"), - /** - * 停用 - */ - DISABLE("1", "停用"), - /** - * 删除 - */ - DELETED("2", "删除"); - - private final String code; - private final String info; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java deleted file mode 100644 index 69e4753..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.common.core.enums; - -import org.dromara.common.core.utils.StringUtils; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 设备类型 - * 针对多套 用户体系 - * - * @author Lion Li - */ -@Getter -@AllArgsConstructor -public enum UserType { - - /** - * pc端 - */ - SYS_USER("sys_user"), - - /** - * app端 - */ - APP_USER("app_user"); - - private final String userType; - - public static UserType getUserType(String str) { - for (UserType value : values()) { - if (StringUtils.contains(str, value.getUserType())) { - return value; - } - } - throw new RuntimeException("'UserType' not found By " + str); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java deleted file mode 100644 index e9dc6ec..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.common.core.exception; - -import lombok.*; - -import java.io.Serial; - -/** - * 业务异常 - * - * @author ruoyi - */ -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -public final class ServiceException extends RuntimeException { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 错误码 - */ - private Integer code; - - /** - * 错误提示 - */ - private String message; - - /** - * 错误明细，内部调试错误 - */ - private String detailMessage; - - public ServiceException(String message) { - this.message = message; - } - - public ServiceException(String message, Integer code) { - this.message = message; - this.code = code; - } - - @Override - public String getMessage() { - return message; - } - - public ServiceException setMessage(String message) { - this.message = message; - return this; - } - - public ServiceException setDetailMessage(String detailMessage) { - this.detailMessage = detailMessage; - return this; - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java deleted file mode 100644 index a76e16d..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.common.core.exception; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serial; - -/** - * sse 特制异常 - * - * @author LionLi - */ -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -public final class SseException extends RuntimeException { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 错误码 - */ - private Integer code; - - /** - * 错误提示 - */ - private String message; - - /** - * 错误明细，内部调试错误 - */ - private String detailMessage; - - public SseException(String message) { - this.message = message; - } - - public SseException(String message, Integer code) { - this.message = message; - this.code = code; - } - - @Override - public String getMessage() { - return message; - } - - public SseException setMessage(String message) { - this.message = message; - return this; - } - - public SseException setDetailMessage(String detailMessage) { - this.detailMessage = detailMessage; - return this; - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java deleted file mode 100644 index 40ce01b..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.dromara.common.core.exception.base; - -import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serial; - -/** - * 基础异常 - * - * @author ruoyi - */ -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -public class BaseException extends RuntimeException { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 所属模块 - */ - private String module; - - /** - * 错误码 - */ - private String code; - - /** - * 错误码对应的参数 - */ - private Object[] args; - - /** - * 错误消息 - */ - private String defaultMessage; - - public BaseException(String module, String code, Object[] args) { - this(module, code, args, null); - } - - public BaseException(String module, String defaultMessage) { - this(module, null, null, defaultMessage); - } - - public BaseException(String code, Object[] args) { - this(null, code, args, null); - } - - public BaseException(String defaultMessage) { - this(null, null, null, defaultMessage); - } - - @Override - public String getMessage() { - String message = null; - if (!StringUtils.isEmpty(code)) { - message = MessageUtils.message(code, args); - } - if (message == null) { - message = defaultMessage; - } - return message; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java deleted file mode 100644 index d374fc0..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.common.core.exception.file; - -import org.dromara.common.core.exception.base.BaseException; - -import java.io.Serial; - -/** - * 文件信息异常类 - * - * @author ruoyi - */ -public class FileException extends BaseException { - - @Serial - private static final long serialVersionUID = 1L; - - public FileException(String code, Object[] args) { - super("file", code, args, null); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java deleted file mode 100644 index af98124..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.exception.file; - -import java.io.Serial; - -/** - * 文件名称超长限制异常类 - * - * @author ruoyi - */ -public class FileNameLengthLimitExceededException extends FileException { - - @Serial - private static final long serialVersionUID = 1L; - - public FileNameLengthLimitExceededException(int defaultFileNameLength) { - super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java deleted file mode 100644 index 1eb8d40..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.exception.file; - -import java.io.Serial; - -/** - * 文件名大小限制异常类 - * - * @author ruoyi - */ -public class FileSizeLimitExceededException extends FileException { - - @Serial - private static final long serialVersionUID = 1L; - - public FileSizeLimitExceededException(long defaultMaxSize) { - super("upload.exceed.maxSize", new Object[]{defaultMaxSize}); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java deleted file mode 100644 index 43824e0..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.exception.user; - -import java.io.Serial; - -/** - * 验证码错误异常类 - * - * @author ruoyi - */ -public class CaptchaException extends UserException { - - @Serial - private static final long serialVersionUID = 1L; - - public CaptchaException() { - super("user.jcaptcha.error"); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java deleted file mode 100644 index f4b8cac..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.exception.user; - -import java.io.Serial; - -/** - * 验证码失效异常类 - * - * @author ruoyi - */ -public class CaptchaExpireException extends UserException { - - @Serial - private static final long serialVersionUID = 1L; - - public CaptchaExpireException() { - super("user.jcaptcha.expire"); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java deleted file mode 100644 index 024fed6..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.common.core.exception.user; - -import org.dromara.common.core.exception.base.BaseException; - -import java.io.Serial; - -/** - * 用户信息异常类 - * - * @author ruoyi - */ -public class UserException extends BaseException { - - @Serial - private static final long serialVersionUID = 1L; - - public UserException(String code, Object... args) { - super("user", code, args, null); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java deleted file mode 100644 index fd907d2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.common.core.factory; - -import cn.hutool.core.lang.PatternPool; -import org.dromara.common.core.constant.RegexConstants; - -import java.util.regex.Pattern; - -/** - * 正则表达式模式池工厂 - *

初始化的时候将正则表达式加入缓存池当中

- *

提高正则表达式的性能，避免重复编译相同的正则表达式

- * - * @author 21001 - */ -public class RegexPatternPoolFactory extends PatternPool { - - /** - * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） - */ - public static final Pattern DICTIONARY_TYPE = get(RegexConstants.DICTIONARY_TYPE); - - /** - * 身份证号码（后6位） - */ - public static final Pattern ID_CARD_LAST_6 = get(RegexConstants.ID_CARD_LAST_6); - - /** - * QQ号码 - */ - public static final Pattern QQ_NUMBER = get(RegexConstants.QQ_NUMBER); - - /** - * 邮政编码 - */ - public static final Pattern POSTAL_CODE = get(RegexConstants.POSTAL_CODE); - - /** - * 注册账号 - */ - public static final Pattern ACCOUNT = get(RegexConstants.ACCOUNT); - - /** - * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符 - */ - public static final Pattern PASSWORD = get(RegexConstants.PASSWORD); - - /** - * 通用状态（0表示正常，1表示停用） - */ - public static final Pattern STATUS = get(RegexConstants.STATUS); - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java deleted file mode 100644 index af61b90..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.common.core.factory; - -import org.dromara.common.core.utils.StringUtils; -import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; -import org.springframework.core.env.PropertiesPropertySource; -import org.springframework.core.env.PropertySource; -import org.springframework.core.io.support.DefaultPropertySourceFactory; -import org.springframework.core.io.support.EncodedResource; - -import java.io.IOException; - -/** - * yml 配置源工厂 - * - * @author Lion Li - */ -public class YmlPropertySourceFactory extends DefaultPropertySourceFactory { - - @Override - public PropertySource createPropertySource(String name, EncodedResource resource) throws IOException { - String sourceName = resource.getResource().getFilename(); - if (StringUtils.isNotBlank(sourceName) && StringUtils.endsWithAny(sourceName, ".yml", ".yaml")) { - YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); - factory.setResources(resource.getResource()); - factory.afterPropertiesSet(); - return new PropertiesPropertySource(sourceName, factory.getObject()); - } - return super.createPropertySource(name, resource); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java deleted file mode 100644 index 7328c69..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.service; - -/** - * 通用 参数配置服务 - * - * @author Lion Li - */ -public interface ConfigService { - - /** - * 根据参数 key 获取参数值 - * - * @param configKey 参数 key - * @return 参数值 - */ - String getConfigValue(String configKey); - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java deleted file mode 100644 index db9463e..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.core.service; - -/** - * 通用 部门服务 - * - * @author Lion Li - */ -public interface DeptService { - - /** - * 通过部门ID查询部门名称 - * - * @param deptIds 部门ID串逗号分隔 - * @return 部门名称串逗号分隔 - */ - String selectDeptNameByIds(String deptIds); - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java deleted file mode 100644 index b78a7f2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.dromara.common.core.service; - -import java.util.Map; - -/** - * 通用 字典服务 - * - * @author Lion Li - */ -public interface DictService { - - /** - * 分隔符 - */ - String SEPARATOR = ","; - - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @return 字典标签 - */ - default String getDictLabel(String dictType, String dictValue) { - return getDictLabel(dictType, dictValue, SEPARATOR); - } - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @return 字典值 - */ - default String getDictValue(String dictType, String dictLabel) { - return getDictValue(dictType, dictLabel, SEPARATOR); - } - - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @param separator 分隔符 - * @return 字典标签 - */ - String getDictLabel(String dictType, String dictValue, String separator); - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @param separator 分隔符 - * @return 字典值 - */ - String getDictValue(String dictType, String dictLabel, String separator); - - /** - * 获取字典下所有的字典值与标签 - * - * @param dictType 字典类型 - * @return dictValue为key，dictLabel为值组成的Map - */ - Map getAllDictByDictType(String dictType); - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java deleted file mode 100644 index 1a52de0..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.common.core.service; - -import org.dromara.common.core.domain.dto.OssDTO; - -import java.util.List; - -/** - * 通用 OSS服务 - * - * @author Lion Li - */ -public interface OssService { - - /** - * 通过ossId查询对应的url - * - * @param ossIds ossId串逗号分隔 - * @return url串逗号分隔 - */ - String selectUrlByIds(String ossIds); - - /** - * 通过ossId查询列表 - * - * @param ossIds ossId串逗号分隔 - * @return 列表 - */ - List selectByIds(String ossIds); -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java deleted file mode 100644 index 43aef28..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.dromara.common.core.service; - -import org.dromara.common.core.domain.dto.UserDTO; - -import java.util.List; - -/** - * 通用 用户服务 - * - * @author Lion Li - */ -public interface UserService { - - /** - * 通过用户ID查询用户账户 - * - * @param userId 用户ID - * @return 用户账户 - */ - String selectUserNameById(Long userId); - - /** - * 通过用户ID查询用户账户 - * - * @param userId 用户ID - * @return 用户名称 - */ - String selectNicknameById(Long userId); - - /** - * 通过用户ID查询用户账户 - * - * @param userIds 用户ID 多个用逗号隔开 - * @return 用户名称 - */ - String selectNicknameByIds(String userIds); - - /** - * 通过用户ID查询用户手机号 - * - * @param userId 用户id - * @return 用户手机号 - */ - String selectPhonenumberById(Long userId); - - /** - * 通过用户ID查询用户邮箱 - * - * @param userId 用户id - * @return 用户邮箱 - */ - String selectEmailById(Long userId); - - /** - * 通过用户ID查询用户列表 - * - * @param userIds 用户ids - * @return 用户列表 - */ - List selectListByIds(List userIds); - - /** - * 通过角色ID查询用户ID - * - * @param roleIds 角色ids - * @return 用户ids - */ - List selectUserIdsByRoleIds(List roleIds); - - /** - * 通过角色ID查询用户 - * - * @param roleIds 角色ids - * @return 用户 - */ - List selectUsersByRoleIds(List roleIds); - - /** - * 通过部门ID查询用户 - * - * @param deptIds 部门ids - * @return 用户 - */ - List selectUsersByDeptIds(List deptIds); -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java deleted file mode 100644 index 4e556c9..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.common.core.service; - -import java.util.List; -import java.util.Map; - -/** - * 通用 工作流服务 - * - * @author may - */ -public interface WorkflowService { - - /** - * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - * @return 结果 - */ - boolean deleteRunAndHisInstance(List businessKeys); - - /** - * 获取当前流程状态 - * - * @param taskId 任务id - */ - String getBusinessStatusByTaskId(String taskId); - - /** - * 获取当前流程状态 - * - * @param businessKey 业务id - */ - String getBusinessStatus(String businessKey); - - /** - * 设置流程变量(全局变量) - * - * @param taskId 任务id - * @param variableName 变量名称 - * @param value 变量值 - */ - void setVariable(String taskId, String variableName, Object value); - - /** - * 设置流程变量(全局变量) - * - * @param taskId 任务id - * @param variables 流程变量 - */ - void setVariables(String taskId, Map variables); - - /** - * 设置流程变量(本地变量,非全局变量) - * - * @param taskId 任务id - * @param variableName 变量名称 - * @param value 变量值 - */ - void setVariableLocal(String taskId, String variableName, Object value); - - /** - * 设置流程变量(本地变量,非全局变量) - * - * @param taskId 任务id - * @param variables 流程变量 - */ - void setVariablesLocal(String taskId, Map variables); - - /** - * 按照业务id查询流程实例id - * - * @param businessKey 业务id - * @return 结果 - */ - String getInstanceIdByBusinessKey(String businessKey); -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java deleted file mode 100644 index 72178a7..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ /dev/null @@ -1,168 +0,0 @@ -package org.dromara.common.core.utils; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.time.DateFormatUtils; - -import java.lang.management.ManagementFactory; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Date; - -/** - * 时间工具类 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class DateUtils extends org.apache.commons.lang3.time.DateUtils { - - public static final String YYYY = "yyyy"; - - public static final String YYYY_MM = "yyyy-MM"; - - public static final String YYYY_MM_DD = "yyyy-MM-dd"; - - public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; - - public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - - private static final String[] PARSE_PATTERNS = { - "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", - "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", - "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; - - /** - * 获取当前Date型日期 - * - * @return Date() 当前日期 - */ - public static Date getNowDate() { - return new Date(); - } - - /** - * 获取当前日期, 默认格式为yyyy-MM-dd - * - * @return String - */ - public static String getDate() { - return dateTimeNow(YYYY_MM_DD); - } - - public static String getTime() { - return dateTimeNow(YYYY_MM_DD_HH_MM_SS); - } - - public static String dateTimeNow() { - return dateTimeNow(YYYYMMDDHHMMSS); - } - - public static String dateTimeNow(final String format) { - return parseDateToStr(format, new Date()); - } - - public static String dateTime(final Date date) { - return parseDateToStr(YYYY_MM_DD, date); - } - - public static String parseDateToStr(final String format, final Date date) { - return new SimpleDateFormat(format).format(date); - } - - public static Date dateTime(final String format, final String ts) { - try { - return new SimpleDateFormat(format).parse(ts); - } catch (ParseException e) { - throw new RuntimeException(e); - } - } - - /** - * 日期路径 即年/月/日 如2018/08/08 - */ - public static String datePath() { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyy/MM/dd"); - } - - /** - * 日期路径 即年/月/日 如20180808 - */ - public static String dateTime() { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyyMMdd"); - } - - /** - * 日期型字符串转化为日期 格式 - */ - public static Date parseDate(Object str) { - if (str == null) { - return null; - } - try { - return parseDate(str.toString(), PARSE_PATTERNS); - } catch (ParseException e) { - return null; - } - } - - /** - * 获取服务器启动时间 - */ - public static Date getServerStartDate() { - long time = ManagementFactory.getRuntimeMXBean().getStartTime(); - return new Date(time); - } - - /** - * 计算相差天数 - */ - public static int differentDaysByMillisecond(Date date1, Date date2) { - return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); - } - - /** - * 计算两个时间差 - */ - public static String getDatePoor(Date endDate, Date nowDate) { - long nd = 1000 * 24 * 60 * 60; - long nh = 1000 * 60 * 60; - long nm = 1000 * 60; - // long ns = 1000; - // 获得两个时间的毫秒时间差异 - long diff = endDate.getTime() - nowDate.getTime(); - // 计算差多少天 - long day = diff / nd; - // 计算差多少小时 - long hour = diff % nd / nh; - // 计算差多少分钟 - long min = diff % nd % nh / nm; - // 计算差多少秒//输出结果 - // long sec = diff % nd % nh % nm / ns; - return day + "天" + hour + "小时" + min + "分钟"; - } - - /** - * 增加 LocalDateTime ==> Date - */ - public static Date toDate(LocalDateTime temporalAccessor) { - ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); - return Date.from(zdt.toInstant()); - } - - /** - * 增加 LocalDate ==> Date - */ - public static Date toDate(LocalDate temporalAccessor) { - LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); - ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); - return Date.from(zdt.toInstant()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java deleted file mode 100644 index b6acff7..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import io.github.linpeilie.Converter; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.List; -import java.util.Map; - -/** - * Mapstruct 工具类 - *

参考文档：mapstruct-plus

- * - * - * @author Michelle.Chung - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class MapstructUtils { - - private final static Converter CONVERTER = SpringUtils.getBean(Converter.class); - - /** - * 将 T 类型对象，转换为 desc 类型的对象并返回 - * - * @param source 数据来源实体 - * @param desc 描述对象 转换后的对象 - * @return desc - */ - public static V convert(T source, Class desc) { - if (ObjectUtil.isNull(source)) { - return null; - } - if (ObjectUtil.isNull(desc)) { - return null; - } - return CONVERTER.convert(source, desc); - } - - /** - * 将 T 类型对象，按照配置的映射字段规则，给 desc 类型的对象赋值并返回 desc 对象 - * - * @param source 数据来源实体 - * @param desc 转换后的对象 - * @return desc - */ - public static V convert(T source, V desc) { - if (ObjectUtil.isNull(source)) { - return null; - } - if (ObjectUtil.isNull(desc)) { - return null; - } - return CONVERTER.convert(source, desc); - } - - /** - * 将 T 类型的集合，转换为 desc 类型的集合并返回 - * - * @param sourceList 数据来源实体列表 - * @param desc 描述对象 转换后的对象 - * @return desc - */ - public static List convert(List sourceList, Class desc) { - if (ObjectUtil.isNull(sourceList)) { - return null; - } - if (CollUtil.isEmpty(sourceList)) { - return CollUtil.newArrayList(); - } - return CONVERTER.convert(sourceList, desc); - } - - /** - * 将 Map 转换为 beanClass 类型的集合并返回 - * - * @param map 数据来源 - * @param beanClass bean类 - * @return bean对象 - */ - public static T convert(Map map, Class beanClass) { - if (MapUtil.isEmpty(map)) { - return null; - } - if (ObjectUtil.isNull(beanClass)) { - return null; - } - return CONVERTER.convert(map, beanClass); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java deleted file mode 100644 index 48dfc08..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.common.core.utils; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.springframework.context.MessageSource; -import org.springframework.context.NoSuchMessageException; -import org.springframework.context.i18n.LocaleContextHolder; - -/** - * 获取i18n资源文件 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class MessageUtils { - - private static final MessageSource MESSAGE_SOURCE = SpringUtils.getBean(MessageSource.class); - - /** - * 根据消息键和参数 获取消息 委托给spring messageSource - * - * @param code 消息键 - * @param args 参数 - * @return 获取国际化翻译值 - */ - public static String message(String code, Object... args) { - try { - return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale()); - } catch (NoSuchMessageException e) { - return code; - } - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java deleted file mode 100644 index a1316eb..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ /dev/null @@ -1,228 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.convert.Convert; -import cn.hutool.extra.servlet.JakartaServletUtil; -import cn.hutool.http.HttpStatus; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.springframework.http.MediaType; -import org.springframework.util.LinkedCaseInsensitiveMap; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import java.io.IOException; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - -/** - * 客户端工具类 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ServletUtils extends JakartaServletUtil { - - /** - * 获取String参数 - */ - public static String getParameter(String name) { - return getRequest().getParameter(name); - } - - /** - * 获取String参数 - */ - public static String getParameter(String name, String defaultValue) { - return Convert.toStr(getRequest().getParameter(name), defaultValue); - } - - /** - * 获取Integer参数 - */ - public static Integer getParameterToInt(String name) { - return Convert.toInt(getRequest().getParameter(name)); - } - - /** - * 获取Integer参数 - */ - public static Integer getParameterToInt(String name, Integer defaultValue) { - return Convert.toInt(getRequest().getParameter(name), defaultValue); - } - - /** - * 获取Boolean参数 - */ - public static Boolean getParameterToBool(String name) { - return Convert.toBool(getRequest().getParameter(name)); - } - - /** - * 获取Boolean参数 - */ - public static Boolean getParameterToBool(String name, Boolean defaultValue) { - return Convert.toBool(getRequest().getParameter(name), defaultValue); - } - - /** - * 获得所有请求参数 - * - * @param request 请求对象{@link ServletRequest} - * @return Map - */ - public static Map getParams(ServletRequest request) { - final Map map = request.getParameterMap(); - return Collections.unmodifiableMap(map); - } - - /** - * 获得所有请求参数 - * - * @param request 请求对象{@link ServletRequest} - * @return Map - */ - public static Map getParamMap(ServletRequest request) { - Map params = new HashMap<>(); - for (Map.Entry entry : getParams(request).entrySet()) { - params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR)); - } - return params; - } - - /** - * 获取request - */ - public static HttpServletRequest getRequest() { - try { - return getRequestAttributes().getRequest(); - } catch (Exception e) { - return null; - } - } - - /** - * 获取response - */ - public static HttpServletResponse getResponse() { - try { - return getRequestAttributes().getResponse(); - } catch (Exception e) { - return null; - } - } - - /** - * 获取session - */ - public static HttpSession getSession() { - return getRequest().getSession(); - } - - public static ServletRequestAttributes getRequestAttributes() { - try { - RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); - return (ServletRequestAttributes) attributes; - } catch (Exception e) { - return null; - } - } - - public static String getHeader(HttpServletRequest request, String name) { - String value = request.getHeader(name); - if (StringUtils.isEmpty(value)) { - return StringUtils.EMPTY; - } - return urlDecode(value); - } - - public static Map getHeaders(HttpServletRequest request) { - Map map = new LinkedCaseInsensitiveMap<>(); - Enumeration enumeration = request.getHeaderNames(); - if (enumeration != null) { - while (enumeration.hasMoreElements()) { - String key = enumeration.nextElement(); - String value = request.getHeader(key); - map.put(key, value); - } - } - return map; - } - - /** - * 将字符串渲染到客户端 - * - * @param response 渲染对象 - * @param string 待渲染的字符串 - */ - public static void renderString(HttpServletResponse response, String string) { - try { - response.setStatus(HttpStatus.HTTP_OK); - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setCharacterEncoding(StandardCharsets.UTF_8.toString()); - response.getWriter().print(string); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** - * 是否是Ajax异步请求 - * - * @param request - */ - public static boolean isAjaxRequest(HttpServletRequest request) { - - String accept = request.getHeader("accept"); - if (accept != null && accept.contains(MediaType.APPLICATION_JSON_VALUE)) { - return true; - } - - String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { - return true; - } - - String uri = request.getRequestURI(); - if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) { - return true; - } - - String ajax = request.getParameter("__ajax"); - return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml"); - } - - public static String getClientIP() { - return getClientIP(getRequest()); - } - - /** - * 内容编码 - * - * @param str 内容 - * @return 编码后的内容 - */ - public static String urlEncode(String str) { - return URLEncoder.encode(str, StandardCharsets.UTF_8); - } - - /** - * 内容解码 - * - * @param str 内容 - * @return 解码后的内容 - */ - public static String urlDecode(String str) { - return URLDecoder.decode(str, StandardCharsets.UTF_8); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java deleted file mode 100644 index 169c6e2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.extra.spring.SpringUtil; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.boot.autoconfigure.thread.Threading; -import org.springframework.context.ApplicationContext; -import org.springframework.core.env.Environment; -import org.springframework.stereotype.Component; - -/** - * spring工具类 - * - * @author Lion Li - */ -@Component -public final class SpringUtils extends SpringUtil { - - /** - * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true - */ - public static boolean containsBean(String name) { - return getBeanFactory().containsBean(name); - } - - /** - * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 - * 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException） - */ - public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException { - return getBeanFactory().isSingleton(name); - } - - /** - * @return Class 注册对象的类型 - */ - public static Class getType(String name) throws NoSuchBeanDefinitionException { - return getBeanFactory().getType(name); - } - - /** - * 如果给定的bean名字在bean定义中有别名，则返回这些别名 - */ - public static String[] getAliases(String name) throws NoSuchBeanDefinitionException { - return getBeanFactory().getAliases(name); - } - - /** - * 获取aop代理对象 - */ - @SuppressWarnings("unchecked") - public static T getAopProxy(T invoker) { - return (T) getBean(invoker.getClass()); - } - - - /** - * 获取spring上下文 - */ - public static ApplicationContext context() { - return getApplicationContext(); - } - - public static boolean isVirtual() { - return Threading.VIRTUAL.isActive(getBean(Environment.class)); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java deleted file mode 100644 index 1342deb..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ /dev/null @@ -1,283 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.*; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * stream 流工具类 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class StreamUtils { - - /** - * 将collection过滤 - * - * @param collection 需要转化的集合 - * @param function 过滤方法 - * @return 过滤后的list - */ - public static List filter(Collection collection, Predicate function) { - if (CollUtil.isEmpty(collection)) { - return CollUtil.newArrayList(); - } - // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 - return collection.stream().filter(function).collect(Collectors.toList()); - } - - /** - * 找到流中满足条件的第一个元素 - * - * @param collection 需要查询的集合 - * @param function 过滤方法 - * @return 找到符合条件的第一个元素，没有则返回null - */ - public static E findFirst(Collection collection, Predicate function) { - if (CollUtil.isEmpty(collection)) { - return null; - } - return collection.stream().filter(function).findFirst().orElse(null); - } - - /** - * 找到流中任意一个满足条件的元素 - * - * @param collection 需要查询的集合 - * @param function 过滤方法 - * @return 找到符合条件的任意一个元素，没有则返回null - */ - public static Optional findAny(Collection collection, Predicate function) { - if (CollUtil.isEmpty(collection)) { - return Optional.empty(); - } - return collection.stream().filter(function).findAny(); - } - - /** - * 将collection拼接 - * - * @param collection 需要转化的集合 - * @param function 拼接方法 - * @return 拼接后的list - */ - public static String join(Collection collection, Function function) { - return join(collection, function, StringUtils.SEPARATOR); - } - - /** - * 将collection拼接 - * - * @param collection 需要转化的集合 - * @param function 拼接方法 - * @param delimiter 拼接符 - * @return 拼接后的list - */ - public static String join(Collection collection, Function function, CharSequence delimiter) { - if (CollUtil.isEmpty(collection)) { - return StringUtils.EMPTY; - } - return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter)); - } - - /** - * 将collection排序 - * - * @param collection 需要转化的集合 - * @param comparing 排序方法 - * @return 排序后的list - */ - public static List sorted(Collection collection, Comparator comparing) { - if (CollUtil.isEmpty(collection)) { - return CollUtil.newArrayList(); - } - // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 - return collection.stream().filter(Objects::nonNull).sorted(comparing).collect(Collectors.toList()); - } - - /** - * 将collection转化为类型不变的map
- * {@code Collection ----> Map} - * - * @param collection 需要转化的集合 - * @param key V类型转化为K类型的lambda方法 - * @param collection中的泛型 - * @param map中的key类型 - * @return 转化后的map - */ - public static Map toIdentityMap(Collection collection, Function key) { - if (CollUtil.isEmpty(collection)) { - return MapUtil.newHashMap(); - } - return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, Function.identity(), (l, r) -> l)); - } - - /** - * 将Collection转化为map(value类型与collection的泛型不同)
- * {@code Collection -----> Map } - * - * @param collection 需要转化的集合 - * @param key E类型转化为K类型的lambda方法 - * @param value E类型转化为V类型的lambda方法 - * @param collection中的泛型 - * @param map中的key类型 - * @param map中的value类型 - * @return 转化后的map - */ - public static Map toMap(Collection collection, Function key, Function value) { - if (CollUtil.isEmpty(collection)) { - return MapUtil.newHashMap(); - } - return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, value, (l, r) -> l)); - } - - /** - * 将collection按照规则(比如有相同的班级id)分类成map
- * {@code Collection -------> Map> } - * - * @param collection 需要分类的集合 - * @param key 分类的规则 - * @param collection中的泛型 - * @param map中的key类型 - * @return 分类后的map - */ - public static Map> groupByKey(Collection collection, Function key) { - if (CollUtil.isEmpty(collection)) { - return MapUtil.newHashMap(); - } - return collection - .stream().filter(Objects::nonNull) - .collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList())); - } - - /** - * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
- * {@code Collection ---> Map>> } - * - * @param collection 需要分类的集合 - * @param key1 第一个分类的规则 - * @param key2 第二个分类的规则 - * @param 集合元素类型 - * @param 第一个map中的key类型 - * @param 第二个map中的key类型 - * @return 分类后的map - */ - public static Map>> groupBy2Key(Collection collection, Function key1, Function key2) { - if (CollUtil.isEmpty(collection)) { - return MapUtil.newHashMap(); - } - return collection - .stream().filter(Objects::nonNull) - .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList()))); - } - - /** - * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
- * {@code Collection ---> Map> } - * - * @param collection 需要分类的集合 - * @param key1 第一个分类的规则 - * @param key2 第二个分类的规则 - * @param 第一个map中的key类型 - * @param 第二个map中的key类型 - * @param collection中的泛型 - * @return 分类后的map - */ - public static Map> group2Map(Collection collection, Function key1, Function key2) { - if (CollUtil.isEmpty(collection) || key1 == null || key2 == null) { - return MapUtil.newHashMap(); - } - return collection - .stream().filter(Objects::nonNull) - .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l))); - } - - /** - * 将collection转化为List集合，但是两者的泛型不同
- * {@code Collection ------> List } - * - * @param collection 需要转化的集合 - * @param function collection中的泛型转化为list泛型的lambda表达式 - * @param collection中的泛型 - * @param List中的泛型 - * @return 转化后的list - */ - public static List toList(Collection collection, Function function) { - if (CollUtil.isEmpty(collection)) { - return CollUtil.newArrayList(); - } - return collection - .stream() - .map(function) - .filter(Objects::nonNull) - // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 - .collect(Collectors.toList()); - } - - /** - * 将collection转化为Set集合，但是两者的泛型不同
- * {@code Collection ------> Set } - * - * @param collection 需要转化的集合 - * @param function collection中的泛型转化为set泛型的lambda表达式 - * @param collection中的泛型 - * @param Set中的泛型 - * @return 转化后的Set - */ - public static Set toSet(Collection collection, Function function) { - if (CollUtil.isEmpty(collection) || function == null) { - return CollUtil.newHashSet(); - } - return collection - .stream() - .map(function) - .filter(Objects::nonNull) - .collect(Collectors.toSet()); - } - - - /** - * 合并两个相同key类型的map - * - * @param map1 第一个需要合并的 map - * @param map2 第二个需要合并的 map - * @param merge 合并的lambda，将key value1 value2合并成最终的类型,注意value可能为空的情况 - * @param map中的key类型 - * @param 第一个 map的value类型 - * @param 第二个 map的value类型 - * @param 最终map的value类型 - * @return 合并后的map - */ - public static Map merge(Map map1, Map map2, BiFunction merge) { - if (MapUtil.isEmpty(map1) && MapUtil.isEmpty(map2)) { - return MapUtil.newHashMap(); - } else if (MapUtil.isEmpty(map1)) { - map1 = MapUtil.newHashMap(); - } else if (MapUtil.isEmpty(map2)) { - map2 = MapUtil.newHashMap(); - } - Set key = new HashSet<>(); - key.addAll(map1.keySet()); - key.addAll(map2.keySet()); - Map map = new HashMap<>(); - for (K t : key) { - X x = map1.get(t); - Y y = map2.get(t); - V z = merge.apply(x, y); - if (z != null) { - map.put(t, z); - } - } - return map; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java deleted file mode 100644 index dd6ebb1..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ /dev/null @@ -1,323 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.util.StrUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.springframework.util.AntPathMatcher; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 字符串工具类 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class StringUtils extends org.apache.commons.lang3.StringUtils { - - public static final String SEPARATOR = ","; - - public static final String SLASH = "/"; - - /** - * 获取参数不为空值 - * - * @param str defaultValue 要判断的value - * @return value 返回值 - */ - public static String blankToDefault(String str, String defaultValue) { - return StrUtil.blankToDefault(str, defaultValue); - } - - /** - * * 判断一个字符串是否为空串 - * - * @param str String - * @return true：为空 false：非空 - */ - public static boolean isEmpty(String str) { - return StrUtil.isEmpty(str); - } - - /** - * * 判断一个字符串是否为非空串 - * - * @param str String - * @return true：非空串 false：空串 - */ - public static boolean isNotEmpty(String str) { - return !isEmpty(str); - } - - /** - * 去空格 - */ - public static String trim(String str) { - return StrUtil.trim(str); - } - - /** - * 截取字符串 - * - * @param str 字符串 - * @param start 开始 - * @return 结果 - */ - public static String substring(final String str, int start) { - return substring(str, start, str.length()); - } - - /** - * 截取字符串 - * - * @param str 字符串 - * @param start 开始 - * @param end 结束 - * @return 结果 - */ - public static String substring(final String str, int start, int end) { - return StrUtil.sub(str, start, end); - } - - /** - * 格式化文本, {} 表示占位符
- * 此方法只是简单将占位符 {} 按照顺序替换为参数
- * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
- * 例：
- * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
- * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a
- * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- * - * @param template 文本模板，被替换的部分用 {} 表示 - * @param params 参数值 - * @return 格式化后的文本 - */ - public static String format(String template, Object... params) { - return StrUtil.format(template, params); - } - - /** - * 是否为http(s)://开头 - * - * @param link 链接 - * @return 结果 - */ - public static boolean ishttp(String link) { - return Validator.isUrl(link); - } - - /** - * 字符串转set - * - * @param str 字符串 - * @param sep 分隔符 - * @return set集合 - */ - public static Set str2Set(String str, String sep) { - return new HashSet<>(str2List(str, sep, true, false)); - } - - /** - * 字符串转list - * - * @param str 字符串 - * @param sep 分隔符 - * @param filterBlank 过滤纯空白 - * @param trim 去掉首尾空白 - * @return list集合 - */ - public static List str2List(String str, String sep, boolean filterBlank, boolean trim) { - List list = new ArrayList<>(); - if (isEmpty(str)) { - return list; - } - - // 过滤空白字符串 - if (filterBlank && isBlank(str)) { - return list; - } - String[] split = str.split(sep); - for (String string : split) { - if (filterBlank && isBlank(string)) { - continue; - } - if (trim) { - string = trim(string); - } - list.add(string); - } - - return list; - } - - /** - * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 - * - * @param cs 指定字符串 - * @param searchCharSequences 需要检查的字符串数组 - * @return 是否包含任意一个字符串 - */ - public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { - return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences); - } - - /** - * 驼峰转下划线命名 - */ - public static String toUnderScoreCase(String str) { - return StrUtil.toUnderlineCase(str); - } - - /** - * 是否包含字符串 - * - * @param str 验证字符串 - * @param strs 字符串组 - * @return 包含返回true - */ - public static boolean inStringIgnoreCase(String str, String... strs) { - return StrUtil.equalsAnyIgnoreCase(str, strs); - } - - /** - * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld - * - * @param name 转换前的下划线大写方式命名的字符串 - * @return 转换后的驼峰式命名的字符串 - */ - public static String convertToCamelCase(String name) { - return StrUtil.upperFirst(StrUtil.toCamelCase(name)); - } - - /** - * 驼峰式命名法 例如：user_name->userName - */ - public static String toCamelCase(String s) { - return StrUtil.toCamelCase(s); - } - - /** - * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 - * - * @param str 指定字符串 - * @param strs 需要检查的字符串数组 - * @return 是否匹配 - */ - public static boolean matches(String str, List strs) { - if (isEmpty(str) || CollUtil.isEmpty(strs)) { - return false; - } - for (String pattern : strs) { - if (isMatch(pattern, str)) { - return true; - } - } - return false; - } - - /** - * 判断url是否与规则配置: - * ? 表示单个字符; - * * 表示一层路径内的任意字符串，不可跨层级; - * ** 表示任意层路径; - * - * @param pattern 匹配规则 - * @param url 需要匹配的url - */ - public static boolean isMatch(String pattern, String url) { - AntPathMatcher matcher = new AntPathMatcher(); - return matcher.match(pattern, url); - } - - /** - * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。 - * - * @param num 数字对象 - * @param size 字符串指定长度 - * @return 返回数字的字符串格式，该字符串为指定长度。 - */ - public static String padl(final Number num, final int size) { - return padl(num.toString(), size, '0'); - } - - /** - * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。 - * - * @param s 原始字符串 - * @param size 字符串指定长度 - * @param c 用于补齐的字符 - * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。 - */ - public static String padl(final String s, final int size, final char c) { - final StringBuilder sb = new StringBuilder(size); - if (s != null) { - final int len = s.length(); - if (s.length() <= size) { - sb.append(String.valueOf(c).repeat(size - len)); - sb.append(s); - } else { - return s.substring(len - size, len); - } - } else { - sb.append(String.valueOf(c).repeat(Math.max(0, size))); - } - return sb.toString(); - } - - /** - * 切分字符串(分隔符默认逗号) - * - * @param str 被切分的字符串 - * @return 分割后的数据列表 - */ - public static List splitList(String str) { - return splitTo(str, Convert::toStr); - } - - /** - * 切分字符串 - * - * @param str 被切分的字符串 - * @param separator 分隔符 - * @return 分割后的数据列表 - */ - public static List splitList(String str, String separator) { - return splitTo(str, separator, Convert::toStr); - } - - /** - * 切分字符串自定义转换(分隔符默认逗号) - * - * @param str 被切分的字符串 - * @param mapper 自定义转换 - * @return 分割后的数据列表 - */ - public static List splitTo(String str, Function mapper) { - return splitTo(str, SEPARATOR, mapper); - } - - /** - * 切分字符串自定义转换 - * - * @param str 被切分的字符串 - * @param separator 分隔符 - * @param mapper 自定义转换 - * @return 分割后的数据列表 - */ - public static List splitTo(String str, String separator, Function mapper) { - if (isBlank(str)) { - return new ArrayList<>(0); - } - return StrUtil.split(str, separator) - .stream() - .filter(Objects::nonNull) - .map(mapper) - .collect(Collectors.toList()); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java deleted file mode 100644 index ae6cfa3..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.common.core.utils; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.util.concurrent.*; - -/** - * 线程相关工具类. - * - * @author ruoyi - */ -@Slf4j -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class Threads { - - /** - * sleep等待,单位为毫秒 - */ - public static void sleep(long milliseconds) { - try { - Thread.sleep(milliseconds); - } catch (InterruptedException e) { - return; - } - } - - /** - * 停止线程池 - * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. - * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. - * 如果仍然超時，則強制退出. - * 另对在shutdown时线程本身被调用中断做了处理. - */ - public static void shutdownAndAwaitTermination(ExecutorService pool) { - if (pool != null && !pool.isShutdown()) { - pool.shutdown(); - try { - if (!pool.awaitTermination(120, TimeUnit.SECONDS)) { - pool.shutdownNow(); - if (!pool.awaitTermination(120, TimeUnit.SECONDS)) { - log.info("Pool did not terminate"); - } - } - } catch (InterruptedException ie) { - pool.shutdownNow(); - Thread.currentThread().interrupt(); - } - } - } - - /** - * 打印线程异常信息 - */ - public static void printException(Runnable r, Throwable t) { - if (t == null && r instanceof Future) { - try { - Future future = (Future) r; - if (future.isDone()) { - future.get(); - } - } catch (CancellationException ce) { - t = ce; - } catch (ExecutionException ee) { - t = ee.getCause(); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - } - } - if (t != null) { - log.error(t.getMessage(), t); - } - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java deleted file mode 100644 index 8e501df..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.tree.Tree; -import cn.hutool.core.lang.tree.TreeNodeConfig; -import cn.hutool.core.lang.tree.TreeUtil; -import cn.hutool.core.lang.tree.parser.NodeParser; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; - -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * 扩展 hutool TreeUtil 封装系统树构建 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class TreeBuildUtils extends TreeUtil { - - /** - * 根据前端定制差异化字段 - */ - public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label"); - - /** - * 构建树形结构 - * - * @param 输入节点的类型 - * @param 节点ID的类型 - * @param list 节点列表，其中包含了要构建树形结构的所有节点 - * @param nodeParser 解析器，用于将输入节点转换为树节点 - * @return 构建好的树形结构列表 - */ - public static List> build(List list, NodeParser nodeParser) { - if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); - } - K k = ReflectUtils.invokeGetter(list.get(0), "parentId"); - return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser); - } - - /** - * 获取节点列表中所有节点的叶子节点 - * - * @param 节点ID的类型 - * @param nodes 节点列表 - * @return 包含所有叶子节点的列表 - */ - public static List> getLeafNodes(List> nodes) { - if (CollUtil.isEmpty(nodes)) { - return CollUtil.newArrayList(); - } - return nodes.stream() - .flatMap(TreeBuildUtils::extractLeafNodes) - .collect(Collectors.toList()); - } - - /** - * 获取指定节点下的所有叶子节点 - * - * @param 节点ID的类型 - * @param node 要查找叶子节点的根节点 - * @return 包含所有叶子节点的列表 - */ - private static Stream> extractLeafNodes(Tree node) { - if (!node.hasChild()) { - return Stream.of(node); - } else { - // 递归调用，获取所有子节点的叶子节点 - return node.getChildren().stream() - .flatMap(TreeBuildUtils::extractLeafNodes); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java deleted file mode 100644 index 06b8fd6..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.common.core.utils; - -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import jakarta.validation.Validator; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.Set; - -/** - * Validator 校验框架工具 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ValidatorUtils { - - private static final Validator VALID = SpringUtils.getBean(Validator.class); - - /** - * 对给定对象进行参数校验，并根据指定的校验组进行校验 - * - * @param object 要进行校验的对象 - * @param groups 校验组 - * @throws ConstraintViolationException 如果校验不通过，则抛出参数校验异常 - */ - public static void validate(T object, Class... groups) { - Set> validate = VALID.validate(object, groups); - if (!validate.isEmpty()) { - throw new ConstraintViolationException("参数校验异常", validate); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java deleted file mode 100644 index 573b207..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.dromara.common.core.utils.file; - -import cn.hutool.core.io.FileUtil; -import jakarta.servlet.http.HttpServletResponse; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -/** - * 文件处理工具类 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class FileUtils extends FileUtil { - - /** - * 下载文件名重新编码 - * - * @param response 响应对象 - * @param realFileName 真实文件名 - */ - public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) { - String percentEncodedFileName = percentEncode(realFileName); - String contentDispositionValue = "attachment; filename=%s;filename*=utf-8''%s".formatted(percentEncodedFileName, percentEncodedFileName); - response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); - response.setHeader("Content-disposition", contentDispositionValue); - response.setHeader("download-filename", percentEncodedFileName); - } - - /** - * 百分号编码工具方法 - * - * @param s 需要百分号编码的字符串 - * @return 百分号编码后的字符串 - */ - public static String percentEncode(String s) { - String encode = URLEncoder.encode(s, StandardCharsets.UTF_8); - return encode.replaceAll("\\+", "%20"); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java deleted file mode 100644 index 23fa2cf..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.common.core.utils.file; - -/** - * 媒体类型工具类 - * - * @author ruoyi - */ -public class MimeTypeUtils { - public static final String IMAGE_PNG = "image/png"; - - public static final String IMAGE_JPG = "image/jpg"; - - public static final String IMAGE_JPEG = "image/jpeg"; - - public static final String IMAGE_BMP = "image/bmp"; - - public static final String IMAGE_GIF = "image/gif"; - - public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"}; - - public static final String[] FLASH_EXTENSION = {"swf", "flv"}; - - public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", - "asf", "rm", "rmvb"}; - - public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"}; - - public static final String[] DEFAULT_ALLOWED_EXTENSION = { - // 图片 - "bmp", "gif", "jpg", "jpeg", "png", - // word excel powerpoint - "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", - // 压缩文件 - "rar", "zip", "gz", "bz2", - // 视频格式 - "mp4", "avi", "rmvb", - // pdf - "pdf"}; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java deleted file mode 100644 index 3f7cd57..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.common.core.utils.ip; - -import cn.hutool.core.net.NetUtil; -import cn.hutool.http.HtmlUtil; -import org.dromara.common.core.utils.StringUtils; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -/** - * 获取地址类 - * - * @author Lion Li - */ -@Slf4j -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class AddressUtils { - - // 未知地址 - public static final String UNKNOWN = "XX XX"; - - public static String getRealAddressByIP(String ip) { - if (StringUtils.isBlank(ip)) { - return UNKNOWN; - } - // 内网不查询 - ip = StringUtils.contains(ip, "0:0:0:0:0:0:0:1") ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip); - if (NetUtil.isInnerIP(ip)) { - return "内网IP"; - } - return RegionUtils.getCityInfo(ip); - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java deleted file mode 100644 index 6e2a44e..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.dromara.common.core.utils.ip; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.resource.ClassPathResource; -import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.file.FileUtils; -import lombok.extern.slf4j.Slf4j; -import org.lionsoul.ip2region.xdb.Searcher; - -import java.io.File; - -/** - * 根据ip地址定位工具类，离线方式 - * 参考地址：集成 ip2region 实现离线IP地址定位库 - * - * @author lishuyan - */ -@Slf4j -public class RegionUtils { - - private static final Searcher SEARCHER; - - static { - String fileName = "/ip2region.xdb"; - File existFile = FileUtils.file(FileUtil.getTmpDir() + FileUtil.FILE_SEPARATOR + fileName); - if (!FileUtils.exist(existFile)) { - ClassPathResource fileStream = new ClassPathResource(fileName); - if (ObjectUtil.isEmpty(fileStream.getStream())) { - throw new ServiceException("RegionUtils初始化失败，原因：IP地址库数据不存在！"); - } - FileUtils.writeFromStream(fileStream.getStream(), existFile); - } - - String dbPath = existFile.getPath(); - - // 1、从 dbPath 加载整个 xdb 到内存。 - byte[] cBuff; - try { - cBuff = Searcher.loadContentFromFile(dbPath); - } catch (Exception e) { - throw new ServiceException("RegionUtils初始化失败，原因：从ip2region.xdb文件加载内容失败！" + e.getMessage()); - } - // 2、使用上述的 cBuff 创建一个完全基于内存的查询对象。 - try { - SEARCHER = Searcher.newWithBuffer(cBuff); - } catch (Exception e) { - throw new ServiceException("RegionUtils初始化失败，原因：" + e.getMessage()); - } - } - - /** - * 根据IP地址离线获取城市 - */ - public static String getCityInfo(String ip) { - try { - ip = ip.trim(); - // 3、执行查询 - String region = SEARCHER.search(ip); - return region.replace("0|", "").replace("|0", ""); - } catch (Exception e) { - log.error("IP地址离线获取城市异常 {}", ip); - return "未知"; - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java deleted file mode 100644 index 367e8c9..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.dromara.common.core.utils.reflect; - -import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.lang.reflect.Method; - -/** - * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. - * - * @author Lion Li - */ -@SuppressWarnings("rawtypes") -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ReflectUtils extends ReflectUtil { - - private static final String SETTER_PREFIX = "set"; - - private static final String GETTER_PREFIX = "get"; - - /** - * 调用Getter方法. - * 支持多级，如：对象名.对象名.方法 - */ - @SuppressWarnings("unchecked") - public static E invokeGetter(Object obj, String propertyName) { - Object object = obj; - for (String name : StringUtils.split(propertyName, ".")) { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); - object = invoke(object, getterMethodName); - } - return (E) object; - } - - /** - * 调用Setter方法, 仅匹配方法名。 - * 支持多级，如：对象名.对象名.方法 - */ - public static void invokeSetter(Object obj, String propertyName, E value) { - Object object = obj; - String[] names = StringUtils.split(propertyName, "."); - for (int i = 0; i < names.length; i++) { - if (i < names.length - 1) { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); - object = invoke(object, getterMethodName); - } else { - String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); - Method method = getMethodByName(object.getClass(), setterMethodName); - invoke(object, method, value); - } - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java deleted file mode 100644 index 6dde129..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.common.core.utils.regex; - - -import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.constant.RegexConstants; - -/** - * 正则相关工具类 - * - * @author Feng - */ -public final class RegexUtils extends ReUtil { - - /** - * 从输入字符串中提取匹配的部分，如果没有匹配则返回默认值 - * - * @param input 要提取的输入字符串 - * @param regex 用于匹配的正则表达式，可以使用 {@link RegexConstants} 中定义的常量 - * @param defaultInput 如果没有匹配时返回的默认值 - * @return 如果找到匹配的部分，则返回匹配的部分，否则返回默认值 - */ - public static String extractFromString(String input, String regex, String defaultInput) { - try { - String str = ReUtil.get(regex, input, 1); - return str == null ? defaultInput : str; - } catch (Exception e) { - return defaultInput; - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java deleted file mode 100644 index c0dda20..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.common.core.utils.regex; - -import cn.hutool.core.exceptions.ValidateException; -import cn.hutool.core.lang.Validator; -import org.dromara.common.core.factory.RegexPatternPoolFactory; - -import java.util.regex.Pattern; - -/** - * 正则字段校验器 - * 主要验证字段非空、是否为满足指定格式等 - * - * @author Feng - */ -public class RegexValidator extends Validator { - - /** - * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） - */ - public static final Pattern DICTIONARY_TYPE = RegexPatternPoolFactory.DICTIONARY_TYPE; - - /** - * 身份证号码（后6位） - */ - public static final Pattern ID_CARD_LAST_6 = RegexPatternPoolFactory.ID_CARD_LAST_6; - - /** - * QQ号码 - */ - public static final Pattern QQ_NUMBER = RegexPatternPoolFactory.QQ_NUMBER; - - /** - * 邮政编码 - */ - public static final Pattern POSTAL_CODE = RegexPatternPoolFactory.POSTAL_CODE; - - /** - * 注册账号 - */ - public static final Pattern ACCOUNT = RegexPatternPoolFactory.ACCOUNT; - - /** - * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符 - */ - public static final Pattern PASSWORD = RegexPatternPoolFactory.PASSWORD; - - /** - * 通用状态（0表示正常，1表示停用） - */ - public static final Pattern STATUS = RegexPatternPoolFactory.STATUS; - - - /** - * 检查输入的账号是否匹配预定义的规则 - * - * @param value 要验证的账号 - * @return 如果账号符合规则，返回 true；否则，返回 false。 - */ - public static boolean isAccount(CharSequence value) { - return isMatchRegex(ACCOUNT, value); - } - - /** - * 验证输入的账号是否符合规则，如果不符合，则抛出 ValidateException 异常 - * - * @param value 要验证的账号 - * @param errorMsg 验证失败时抛出的异常消息 - * @param CharSequence 的子类型 - * @return 如果验证通过，返回输入的账号 - * @throws ValidateException 如果验证失败 - */ - public static T validateAccount(T value, String errorMsg) throws ValidateException { - if (!isAccount(value)) { - throw new ValidateException(errorMsg); - } - return value; - } - - /** - * 检查输入的状态是否匹配预定义的规则 - * - * @param value 要验证的状态 - * @return 如果状态符合规则，返回 true；否则，返回 false。 - */ - public static boolean isStatus(CharSequence value) { - return isMatchRegex(STATUS, value); - } - - /** - * 验证输入的状态是否符合规则，如果不符合，则抛出 ValidateException 异常 - * - * @param value 要验证的状态 - * @param errorMsg 验证失败时抛出的异常消息 - * @param CharSequence 的子类型 - * @return 如果验证通过，返回输入的状态 - * @throws ValidateException 如果验证失败 - */ - public static T validateStatus(T value, String errorMsg) throws ValidateException { - if (!isStatus(value)) { - throw new ValidateException(errorMsg); - } - return value; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java deleted file mode 100644 index fcf9fb4..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.dromara.common.core.utils.sql; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; - -/** - * sql操作工具类 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class SqlUtil { - - /** - * 定义常用的 sql关键字 - */ - public static String SQL_REGEX = "and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()"; - - /** - * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） - */ - public static final String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; - - /** - * 检查字符，防止注入绕过 - */ - public static String escapeOrderBySql(String value) { - if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) { - throw new IllegalArgumentException("参数不符合规范，不能进行查询"); - } - return value; - } - - /** - * 验证 order by 语法是否符合规范 - */ - public static boolean isValidOrderBySql(String value) { - return value.matches(SQL_PATTERN); - } - - /** - * SQL关键字检查 - */ - public static void filterKeyword(String value) { - if (StringUtils.isEmpty(value)) { - return; - } - String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); - for (String sqlKeyword : sqlKeywords) { - if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) { - throw new IllegalArgumentException("参数存在SQL注入风险"); - } - } - } -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java deleted file mode 100644 index 0275899..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.dromara.common.core.validate; - -/** - * 校验分组 add - * - * @author Lion Li - */ -public interface AddGroup { -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java deleted file mode 100644 index 77c5040..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.dromara.common.core.validate; - -/** - * 校验分组 edit - * - * @author Lion Li - */ -public interface EditGroup { -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java deleted file mode 100644 index 02a0ac2..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.dromara.common.core.validate; - -/** - * 校验分组 query - * - * @author Lion Li - */ -public interface QueryGroup { -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java deleted file mode 100644 index eed495f..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.common.core.xss; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 自定义xss校验注解 - * - * @author Lion Li - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) -@Constraint(validatedBy = {XssValidator.class}) -public @interface Xss { - - String message() default "不允许任何脚本运行"; - - Class[] groups() default {}; - - Class[] payload() default {}; - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java deleted file mode 100644 index 9c32563..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.common.core.xss; - -import cn.hutool.core.util.ReUtil; -import cn.hutool.http.HtmlUtil; - -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; - -/** - * 自定义xss校验注解实现 - * - * @author Lion Li - */ -public class XssValidator implements ConstraintValidator { - - @Override - public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { - return !ReUtil.contains(HtmlUtil.RE_HTML_MARK, value); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3395e73..0000000 --- a/template/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,6 +0,0 @@ -org.dromara.common.core.config.ApplicationConfig -org.dromara.common.core.config.AsyncConfig -org.dromara.common.core.config.RuoYiConfig -org.dromara.common.core.config.ThreadPoolConfig -org.dromara.common.core.config.ValidatorConfig -org.dromara.common.core.utils.SpringUtils diff --git a/template/ruoyi-common/ruoyi-common-doc/pom.xml b/template/ruoyi-common/ruoyi-common-doc/pom.xml deleted file mode 100644 index c6199a1..0000000 --- a/template/ruoyi-common/ruoyi-common-doc/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-doc - - - ruoyi-common-doc 系统接口 - - - - - org.dromara - ruoyi-common-core - - - - org.springdoc - springdoc-openapi-starter-webmvc-api - - - - com.github.therapi - therapi-runtime-javadoc - - - - com.fasterxml.jackson.module - jackson-module-kotlin - - - - - diff --git a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java deleted file mode 100644 index 069ef9a..0000000 --- a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.dromara.common.doc.config; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Paths; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.security.SecurityRequirement; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.doc.config.properties.SpringDocProperties; -import org.dromara.common.doc.handler.OpenApiHandler; -import org.springdoc.core.configuration.SpringDocConfiguration; -import org.springdoc.core.customizers.OpenApiBuilderCustomizer; -import org.springdoc.core.customizers.OpenApiCustomizer; -import org.springdoc.core.customizers.ServerBaseUrlCustomizer; -import org.springdoc.core.properties.SpringDocConfigProperties; -import org.springdoc.core.providers.JavadocProvider; -import org.springdoc.core.service.OpenAPIService; -import org.springdoc.core.service.SecurityService; -import org.springdoc.core.utils.PropertyResolverUtils; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.web.ServerProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -/** - * Swagger 文档配置 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@AutoConfiguration(before = SpringDocConfiguration.class) -@EnableConfigurationProperties(SpringDocProperties.class) -@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true) -public class SpringDocConfig { - - private final ServerProperties serverProperties; - - @Bean - @ConditionalOnMissingBean(OpenAPI.class) - public OpenAPI openApi(SpringDocProperties properties) { - OpenAPI openApi = new OpenAPI(); - // 文档基本信息 - SpringDocProperties.InfoProperties infoProperties = properties.getInfo(); - Info info = convertInfo(infoProperties); - openApi.info(info); - // 扩展文档信息 - openApi.externalDocs(properties.getExternalDocs()); - openApi.tags(properties.getTags()); - openApi.paths(properties.getPaths()); - openApi.components(properties.getComponents()); - Set keySet = properties.getComponents().getSecuritySchemes().keySet(); - List list = new ArrayList<>(); - SecurityRequirement securityRequirement = new SecurityRequirement(); - keySet.forEach(securityRequirement::addList); - list.add(securityRequirement); - openApi.security(list); - - return openApi; - } - - private Info convertInfo(SpringDocProperties.InfoProperties infoProperties) { - Info info = new Info(); - info.setTitle(infoProperties.getTitle()); - info.setDescription(infoProperties.getDescription()); - info.setContact(infoProperties.getContact()); - info.setLicense(infoProperties.getLicense()); - info.setVersion(infoProperties.getVersion()); - return info; - } - - /** - * 自定义 openapi 处理器 - */ - @Bean - public OpenAPIService openApiBuilder(Optional openAPI, - SecurityService securityParser, - SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils, - Optional> openApiBuilderCustomisers, - Optional> serverBaseUrlCustomisers, Optional javadocProvider) { - return new OpenApiHandler(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomisers, serverBaseUrlCustomisers, javadocProvider); - } - - /** - * 对已经生成好的 OpenApi 进行自定义操作 - */ - @Bean - public OpenApiCustomizer openApiCustomizer() { - String contextPath = serverProperties.getServlet().getContextPath(); - String finalContextPath; - if (StringUtils.isBlank(contextPath) || "/".equals(contextPath)) { - finalContextPath = ""; - } else { - finalContextPath = contextPath; - } - // 对所有路径增加前置上下文路径 - return openApi -> { - Paths oldPaths = openApi.getPaths(); - if (oldPaths instanceof PlusPaths) { - return; - } - PlusPaths newPaths = new PlusPaths(); - oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v)); - openApi.setPaths(newPaths); - }; - } - - /** - * 单独使用一个类便于判断 解决springdoc路径拼接重复问题 - * - * @author Lion Li - */ - static class PlusPaths extends Paths { - - public PlusPaths() { - super(); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java deleted file mode 100644 index eae3b4c..0000000 --- a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.dromara.common.doc.config.properties; - -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.ExternalDocumentation; -import io.swagger.v3.oas.models.Paths; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.tags.Tag; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; - -import java.util.List; - -/** - * swagger 配置属性 - * - * @author Lion Li - */ -@Data -@ConfigurationProperties(prefix = "springdoc") -public class SpringDocProperties { - - /** - * 文档基本信息 - */ - @NestedConfigurationProperty - private InfoProperties info = new InfoProperties(); - - /** - * 扩展文档地址 - */ - @NestedConfigurationProperty - private ExternalDocumentation externalDocs; - - /** - * 标签 - */ - private List tags = null; - - /** - * 路径 - */ - @NestedConfigurationProperty - private Paths paths = null; - - /** - * 组件 - */ - @NestedConfigurationProperty - private Components components = null; - - /** - *

- * 文档的基础属性信息 - *

- * - * @see io.swagger.v3.oas.models.info.Info - * - * 为了 springboot 自动生产配置提示信息，所以这里复制一个类出来 - */ - @Data - public static class InfoProperties { - - /** - * 标题 - */ - private String title = null; - - /** - * 描述 - */ - private String description = null; - - /** - * 联系人信息 - */ - @NestedConfigurationProperty - private Contact contact = null; - - /** - * 许可证 - */ - @NestedConfigurationProperty - private License license = null; - - /** - * 版本 - */ - private String version = null; - - } - -} diff --git a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java deleted file mode 100644 index 56b7369..0000000 --- a/template/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ /dev/null @@ -1,253 +0,0 @@ -package org.dromara.common.doc.handler; - -import cn.hutool.core.io.IoUtil; -import io.swagger.v3.core.jackson.TypeNameResolver; -import io.swagger.v3.core.util.AnnotationsUtils; -import io.swagger.v3.oas.annotations.tags.Tags; -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.Paths; -import io.swagger.v3.oas.models.tags.Tag; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.springdoc.core.customizers.OpenApiBuilderCustomizer; -import org.springdoc.core.customizers.ServerBaseUrlCustomizer; -import org.springdoc.core.properties.SpringDocConfigProperties; -import org.springdoc.core.providers.JavadocProvider; -import org.springdoc.core.service.OpenAPIService; -import org.springdoc.core.service.SecurityService; -import org.springdoc.core.utils.PropertyResolverUtils; -import org.springframework.context.ApplicationContext; -import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.util.CollectionUtils; -import org.springframework.web.method.HandlerMethod; - -import java.io.StringReader; -import java.lang.reflect.Method; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * 自定义 openapi 处理器 - * 对源码功能进行修改 增强使用 - */ -@Slf4j -@SuppressWarnings("all") -public class OpenApiHandler extends OpenAPIService { - - /** - * The Basic error controller. - */ - private static Class basicErrorController; - - /** - * The Security parser. - */ - private final SecurityService securityParser; - - /** - * The Mappings map. - */ - private final Map mappingsMap = new HashMap<>(); - - /** - * The Springdoc tags. - */ - private final Map springdocTags = new HashMap<>(); - - /** - * The Open api builder customisers. - */ - private final Optional> openApiBuilderCustomisers; - - /** - * The server base URL customisers. - */ - private final Optional> serverBaseUrlCustomizers; - - /** - * The Spring doc config properties. - */ - private final SpringDocConfigProperties springDocConfigProperties; - - /** - * The Cached open api map. - */ - private final Map cachedOpenAPI = new HashMap<>(); - - /** - * The Property resolver utils. - */ - private final PropertyResolverUtils propertyResolverUtils; - - /** - * The javadoc provider. - */ - private final Optional javadocProvider; - - /** - * The Context. - */ - private ApplicationContext context; - - /** - * The Open api. - */ - private OpenAPI openAPI; - - /** - * The Is servers present. - */ - private boolean isServersPresent; - - /** - * The Server base url. - */ - private String serverBaseUrl; - - /** - * Instantiates a new Open api builder. - * - * @param openAPI the open api - * @param securityParser the security parser - * @param springDocConfigProperties the spring doc config properties - * @param propertyResolverUtils the property resolver utils - * @param openApiBuilderCustomizers the open api builder customisers - * @param serverBaseUrlCustomizers the server base url customizers - * @param javadocProvider the javadoc provider - */ - public OpenApiHandler(Optional openAPI, SecurityService securityParser, - SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils, - Optional> openApiBuilderCustomizers, - Optional> serverBaseUrlCustomizers, - Optional javadocProvider) { - super(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomizers, serverBaseUrlCustomizers, javadocProvider); - if (openAPI.isPresent()) { - this.openAPI = openAPI.get(); - if (this.openAPI.getComponents() == null) - this.openAPI.setComponents(new Components()); - if (this.openAPI.getPaths() == null) - this.openAPI.setPaths(new Paths()); - if (!CollectionUtils.isEmpty(this.openAPI.getServers())) - this.isServersPresent = true; - } - this.propertyResolverUtils = propertyResolverUtils; - this.securityParser = securityParser; - this.springDocConfigProperties = springDocConfigProperties; - this.openApiBuilderCustomisers = openApiBuilderCustomizers; - this.serverBaseUrlCustomizers = serverBaseUrlCustomizers; - this.javadocProvider = javadocProvider; - if (springDocConfigProperties.isUseFqn()) - TypeNameResolver.std.setUseFqn(true); - } - - @Override - public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI, Locale locale) { - - Set tags = new HashSet<>(); - Set tagsStr = new HashSet<>(); - - buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr, locale); - buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr, locale); - - if (!CollectionUtils.isEmpty(tagsStr)) - tagsStr = tagsStr.stream() - .map(str -> propertyResolverUtils.resolve(str, locale)) - .collect(Collectors.toSet()); - - if (springdocTags.containsKey(handlerMethod)) { - io.swagger.v3.oas.models.tags.Tag tag = springdocTags.get(handlerMethod); - tagsStr.add(tag.getName()); - if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) { - openAPI.addTagsItem(tag); - } - } - - if (!CollectionUtils.isEmpty(tagsStr)) { - if (CollectionUtils.isEmpty(operation.getTags())) - operation.setTags(new ArrayList<>(tagsStr)); - else { - Set operationTagsSet = new HashSet<>(operation.getTags()); - operationTagsSet.addAll(tagsStr); - operation.getTags().clear(); - operation.getTags().addAll(operationTagsSet); - } - } - - if (isAutoTagClasses(operation)) { - - - if (javadocProvider.isPresent()) { - String description = javadocProvider.get().getClassJavadoc(handlerMethod.getBeanType()); - if (StringUtils.isNotBlank(description)) { - io.swagger.v3.oas.models.tags.Tag tag = new io.swagger.v3.oas.models.tags.Tag(); - - // 自定义部分 修改使用java注释当tag名 - List list = IoUtil.readLines(new StringReader(description), new ArrayList<>()); - // tag.setName(tagAutoName); - tag.setName(list.get(0)); - operation.addTagsItem(list.get(0)); - - tag.setDescription(description); - if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) { - openAPI.addTagsItem(tag); - } - } - } else { - String tagAutoName = splitCamelCase(handlerMethod.getBeanType().getSimpleName()); - operation.addTagsItem(tagAutoName); - } - } - - if (!CollectionUtils.isEmpty(tags)) { - // Existing tags - List openApiTags = openAPI.getTags(); - if (!CollectionUtils.isEmpty(openApiTags)) - tags.addAll(openApiTags); - openAPI.setTags(new ArrayList<>(tags)); - } - - // Handle SecurityRequirement at operation level - io.swagger.v3.oas.annotations.security.SecurityRequirement[] securityRequirements = securityParser - .getSecurityRequirements(handlerMethod); - if (securityRequirements != null) { - if (securityRequirements.length == 0) - operation.setSecurity(Collections.emptyList()); - else - securityParser.buildSecurityRequirement(securityRequirements, operation); - } - - return operation; - } - - private void buildTagsFromMethod(Method method, Set tags, Set tagsStr, Locale locale) { - // method tags - Set tagsSet = AnnotatedElementUtils - .findAllMergedAnnotations(method, Tags.class); - Set methodTags = tagsSet.stream() - .flatMap(x -> Stream.of(x.value())).collect(Collectors.toSet()); - methodTags.addAll(AnnotatedElementUtils.findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.tags.Tag.class)); - if (!CollectionUtils.isEmpty(methodTags)) { - tagsStr.addAll(StreamUtils.toSet(methodTags, tag -> propertyResolverUtils.resolve(tag.name(), locale))); - List allTags = new ArrayList<>(methodTags); - addTags(allTags, tags, locale); - } - } - - private void addTags(List sourceTags, Set tags, Locale locale) { - Optional> optionalTagSet = AnnotationsUtils - .getTags(sourceTags.toArray(new io.swagger.v3.oas.annotations.tags.Tag[0]), true); - optionalTagSet.ifPresent(tagsSet -> { - tagsSet.forEach(tag -> { - tag.name(propertyResolverUtils.resolve(tag.getName(), locale)); - tag.description(propertyResolverUtils.resolve(tag.getDescription(), locale)); - if (tags.stream().noneMatch(t -> t.getName().equals(tag.getName()))) - tags.add(tag); - }); - }); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fe11e76..0000000 --- a/template/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.doc.config.SpringDocConfig diff --git a/template/ruoyi-common/ruoyi-common-encrypt/pom.xml b/template/ruoyi-common/ruoyi-common-encrypt/pom.xml deleted file mode 100644 index ed4910e..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-encrypt - - - ruoyi-common-encrypt 数据加解密模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.bouncycastle - bcprov-jdk15to18 - - - - cn.hutool - hutool-crypto - - - - org.springframework - spring-webmvc - - - - com.baomidou - mybatis-plus-spring-boot3-starter - true - - - org.mybatis - mybatis-spring - - - - - - - diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java deleted file mode 100644 index 7f52de8..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.common.encrypt.annotation; - -import java.lang.annotation.*; - -/** - * 强制加密注解 - * - * @author Michelle.Chung - */ -@Documented -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface ApiEncrypt { - - /** - * 响应加密忽略，默认不加密，为 true 时加密 - */ - boolean response() default false; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java deleted file mode 100644 index d357d72..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.dromara.common.encrypt.annotation; - -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; - -import java.lang.annotation.*; - -/** - * 字段加密注解 - * - * @author 老马 - */ -@Documented -@Inherited -@Target({ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface EncryptField { - - /** - * 加密算法 - */ - AlgorithmType algorithm() default AlgorithmType.DEFAULT; - - /** - * 秘钥。AES、SM4需要 - */ - String password() default ""; - - /** - * 公钥。RSA、SM2需要 - */ - String publicKey() default ""; - - /** - * 私钥。RSA、SM2需要 - */ - String privateKey() default ""; - - /** - * 编码方式。对加密算法为BASE64的不起作用 - */ - EncodeType encode() default EncodeType.DEFAULT; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java deleted file mode 100644 index 098f6bc..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dromara.common.encrypt.config; - -import jakarta.servlet.DispatcherType; -import org.dromara.common.encrypt.filter.CryptoFilter; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; - -/** - * api 解密自动配置 - * - * @author wdhcr - */ -@AutoConfiguration -@EnableConfigurationProperties(ApiDecryptProperties.class) -@ConditionalOnProperty(value = "api-decrypt.enabled", havingValue = "true") -public class ApiDecryptAutoConfiguration { - - @Bean - public FilterRegistrationBean cryptoFilterRegistration(ApiDecryptProperties properties) { - FilterRegistrationBean registration = new FilterRegistrationBean<>(); - registration.setDispatcherTypes(DispatcherType.REQUEST); - registration.setFilter(new CryptoFilter(properties)); - registration.addUrlPatterns("/*"); - registration.setName("cryptoFilter"); - registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE); - return registration; - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java deleted file mode 100644 index fbc4e52..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.dromara.common.encrypt.config; - -import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; -import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; -import org.dromara.common.encrypt.properties.EncryptorProperties; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; - -/** - * 加解密配置 - * - * @author 老马 - * @version 4.6.0 - */ -@AutoConfiguration(after = MybatisPlusAutoConfiguration.class) -@EnableConfigurationProperties(EncryptorProperties.class) -@ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true") -@Slf4j -public class EncryptorAutoConfiguration { - - @Autowired - private EncryptorProperties properties; - - @Bean - public EncryptorManager encryptorManager(MybatisPlusProperties mybatisPlusProperties) { - return new EncryptorManager(mybatisPlusProperties.getTypeAliasesPackage()); - } - - @Bean - public MybatisEncryptInterceptor mybatisEncryptInterceptor(EncryptorManager encryptorManager) { - return new MybatisEncryptInterceptor(encryptorManager, properties); - } - - @Bean - public MybatisDecryptInterceptor mybatisDecryptInterceptor(EncryptorManager encryptorManager) { - return new MybatisDecryptInterceptor(encryptorManager, properties); - } - -} - - - diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java deleted file mode 100644 index 2f02eaf..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.dromara.common.encrypt.core; - -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import lombok.Data; - -/** - * 加密上下文 用于encryptor传递必要的参数。 - * - * @author 老马 - * @version 4.6.0 - */ -@Data -public class EncryptContext { - - /** - * 默认算法 - */ - private AlgorithmType algorithm; - - /** - * 安全秘钥 - */ - private String password; - - /** - * 公钥 - */ - private String publicKey; - - /** - * 私钥 - */ - private String privateKey; - - /** - * 编码方式，base64/hex - */ - private EncodeType encode; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java deleted file mode 100644 index 2d795e0..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ /dev/null @@ -1,162 +0,0 @@ -package org.dromara.common.encrypt.core; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.io.Resources; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.ClassMetadata; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.util.ClassUtils; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -/** - * 加密管理类 - * - * @author 老马 - * @version 4.6.0 - */ -@Slf4j -@NoArgsConstructor -public class EncryptorManager { - - /** - * 缓存加密器 - */ - Map encryptorMap = new ConcurrentHashMap<>(); - - /** - * 类加密字段缓存 - */ - Map, Set> fieldCache = new ConcurrentHashMap<>(); - - /** - * 构造方法传入类加密字段缓存 - * - * @param typeAliasesPackage 实体类包 - */ - public EncryptorManager(String typeAliasesPackage) { - scanEncryptClasses(typeAliasesPackage); - } - - - /** - * 获取类加密字段缓存 - */ - public Set getFieldCache(Class sourceClazz) { - if (ObjectUtil.isNotNull(fieldCache)) { - return fieldCache.get(sourceClazz); - } - return null; - } - - /** - * 注册加密执行者到缓存 - * - * @param encryptContext 加密执行者需要的相关配置参数 - */ - public IEncryptor registAndGetEncryptor(EncryptContext encryptContext) { - int key = encryptContext.hashCode(); - if (encryptorMap.containsKey(key)) { - return encryptorMap.get(key); - } - IEncryptor encryptor = ReflectUtil.newInstance(encryptContext.getAlgorithm().getClazz(), encryptContext); - encryptorMap.put(key, encryptor); - return encryptor; - } - - /** - * 移除缓存中的加密执行者 - * - * @param encryptContext 加密执行者需要的相关配置参数 - */ - public void removeEncryptor(EncryptContext encryptContext) { - this.encryptorMap.remove(encryptContext.hashCode()); - } - - /** - * 根据配置进行加密。会进行本地缓存对应的算法和对应的秘钥信息。 - * - * @param value 待加密的值 - * @param encryptContext 加密相关的配置信息 - */ - public String encrypt(String value, EncryptContext encryptContext) { - IEncryptor encryptor = this.registAndGetEncryptor(encryptContext); - return encryptor.encrypt(value, encryptContext.getEncode()); - } - - /** - * 根据配置进行解密 - * - * @param value 待解密的值 - * @param encryptContext 加密相关的配置信息 - */ - public String decrypt(String value, EncryptContext encryptContext) { - IEncryptor encryptor = this.registAndGetEncryptor(encryptContext); - return encryptor.decrypt(value); - } - - /** - * 通过 typeAliasesPackage 设置的扫描包 扫描缓存实体 - */ - private void scanEncryptClasses(String typeAliasesPackage) { - PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory(); - String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); - String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX; - try { - for (String packagePattern : packagePatternArray) { - String path = ClassUtils.convertClassNameToResourcePath(packagePattern); - Resource[] resources = resolver.getResources(classpath + path + "/*.class"); - for (Resource resource : resources) { - ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata(); - Class clazz = Resources.classForName(classMetadata.getClassName()); - Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz); - if (CollUtil.isNotEmpty(encryptFieldSet)) { - fieldCache.put(clazz, encryptFieldSet); - } - } - } - } catch (Exception e) { - log.error("初始化数据安全缓存时出错:{}", e.getMessage()); - } - } - - /** - * 获得一个类的加密字段集合 - */ - private Set getEncryptFieldSetFromClazz(Class clazz) { - Set fieldSet = new HashSet<>(); - // 判断clazz如果是接口,内部类,匿名类就直接返回 - if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) { - return fieldSet; - } - while (clazz != null) { - Field[] fields = clazz.getDeclaredFields(); - fieldSet.addAll(Arrays.asList(fields)); - clazz = clazz.getSuperclass(); - } - fieldSet = fieldSet.stream().filter(field -> - field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class) - .collect(Collectors.toSet()); - for (Field field : fieldSet) { - field.setAccessible(true); - } - return fieldSet; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java deleted file mode 100644 index dbc4420..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.common.encrypt.core; - -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; - -/** - * 加解者 - * - * @author 老马 - * @version 4.6.0 - */ -public interface IEncryptor { - - /** - * 获得当前算法 - */ - AlgorithmType algorithm(); - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - * @return 加密后的字符串 - */ - String encrypt(String value, EncodeType encodeType); - - /** - * 解密 - * - * @param value 待加密字符串 - * @return 解密后的字符串 - */ - String decrypt(String value); -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java deleted file mode 100644 index 858d229..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.IEncryptor; - -/** - * 所有加密执行者的基类 - * - * @author 老马 - * @version 4.6.0 - */ -public abstract class AbstractEncryptor implements IEncryptor { - - public AbstractEncryptor(EncryptContext context) { - // 用户配置校验与配置注入 - } - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java deleted file mode 100644 index e4dc597..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; - -/** - * AES算法实现 - * - * @author 老马 - * @version 4.6.0 - */ -public class AesEncryptor extends AbstractEncryptor { - - private final EncryptContext context; - - public AesEncryptor(EncryptContext context) { - super(context); - this.context = context; - } - - /** - * 获得当前算法 - */ - @Override - public AlgorithmType algorithm() { - return AlgorithmType.AES; - } - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - */ - @Override - public String encrypt(String value, EncodeType encodeType) { - if (encodeType == EncodeType.HEX) { - return EncryptUtils.encryptByAesHex(value, context.getPassword()); - } else { - return EncryptUtils.encryptByAes(value, context.getPassword()); - } - } - - /** - * 解密 - * - * @param value 待加密字符串 - */ - @Override - public String decrypt(String value) { - return EncryptUtils.decryptByAes(value, context.getPassword()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java deleted file mode 100644 index 0028548..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; - -/** - * Base64算法实现 - * - * @author 老马 - * @version 4.6.0 - */ -public class Base64Encryptor extends AbstractEncryptor { - - public Base64Encryptor(EncryptContext context) { - super(context); - } - - /** - * 获得当前算法 - */ - @Override - public AlgorithmType algorithm() { - return AlgorithmType.BASE64; - } - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - */ - @Override - public String encrypt(String value, EncodeType encodeType) { - return EncryptUtils.encryptByBase64(value); - } - - /** - * 解密 - * - * @param value 待加密字符串 - */ - @Override - public String decrypt(String value) { - return EncryptUtils.decryptByBase64(value); - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java deleted file mode 100644 index 5f03a4b..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; - - -/** - * RSA算法实现 - * - * @author 老马 - * @version 4.6.0 - */ -public class RsaEncryptor extends AbstractEncryptor { - - private final EncryptContext context; - - public RsaEncryptor(EncryptContext context) { - super(context); - String privateKey = context.getPrivateKey(); - String publicKey = context.getPublicKey(); - if (StringUtils.isAnyEmpty(privateKey, publicKey)) { - throw new IllegalArgumentException("RSA公私钥均需要提供，公钥加密，私钥解密。"); - } - this.context = context; - } - - /** - * 获得当前算法 - */ - @Override - public AlgorithmType algorithm() { - return AlgorithmType.RSA; - } - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - */ - @Override - public String encrypt(String value, EncodeType encodeType) { - if (encodeType == EncodeType.HEX) { - return EncryptUtils.encryptByRsaHex(value, context.getPublicKey()); - } else { - return EncryptUtils.encryptByRsa(value, context.getPublicKey()); - } - } - - /** - * 解密 - * - * @param value 待加密字符串 - */ - @Override - public String decrypt(String value) { - return EncryptUtils.decryptByRsa(value, context.getPrivateKey()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java deleted file mode 100644 index aec5d82..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; - -/** - * sm2算法实现 - * - * @author 老马 - * @version 4.6.0 - */ -public class Sm2Encryptor extends AbstractEncryptor { - - private final EncryptContext context; - - public Sm2Encryptor(EncryptContext context) { - super(context); - String privateKey = context.getPrivateKey(); - String publicKey = context.getPublicKey(); - if (StringUtils.isAnyEmpty(privateKey, publicKey)) { - throw new IllegalArgumentException("SM2公私钥均需要提供，公钥加密，私钥解密。"); - } - this.context = context; - } - - /** - * 获得当前算法 - */ - @Override - public AlgorithmType algorithm() { - return AlgorithmType.SM2; - } - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - */ - @Override - public String encrypt(String value, EncodeType encodeType) { - if (encodeType == EncodeType.HEX) { - return EncryptUtils.encryptBySm2Hex(value, context.getPublicKey()); - } else { - return EncryptUtils.encryptBySm2(value, context.getPublicKey()); - } - } - - /** - * 解密 - * - * @param value 待加密字符串 - */ - @Override - public String decrypt(String value) { - return EncryptUtils.decryptBySm2(value, context.getPrivateKey()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java deleted file mode 100644 index adaf674..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.dromara.common.encrypt.core.encryptor; - -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; - -/** - * sm4算法实现 - * - * @author 老马 - * @version 4.6.0 - */ -public class Sm4Encryptor extends AbstractEncryptor { - - private final EncryptContext context; - - public Sm4Encryptor(EncryptContext context) { - super(context); - this.context = context; - } - - /** - * 获得当前算法 - */ - @Override - public AlgorithmType algorithm() { - return AlgorithmType.SM4; - } - - /** - * 加密 - * - * @param value 待加密字符串 - * @param encodeType 加密后的编码格式 - */ - @Override - public String encrypt(String value, EncodeType encodeType) { - if (encodeType == EncodeType.HEX) { - return EncryptUtils.encryptBySm4Hex(value, context.getPassword()); - } else { - return EncryptUtils.encryptBySm4(value, context.getPassword()); - } - } - - /** - * 解密 - * - * @param value 待加密字符串 - */ - @Override - public String decrypt(String value) { - return EncryptUtils.decryptBySm4(value, context.getPassword()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java deleted file mode 100644 index 26ee1ee..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.encrypt.enumd; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.dromara.common.encrypt.core.encryptor.*; - -/** - * 算法名称 - * - * @author 老马 - * @version 4.6.0 - */ -@Getter -@AllArgsConstructor -public enum AlgorithmType { - - /** - * 默认走yml配置 - */ - DEFAULT(null), - - /** - * base64 - */ - BASE64(Base64Encryptor.class), - - /** - * aes - */ - AES(AesEncryptor.class), - - /** - * rsa - */ - RSA(RsaEncryptor.class), - - /** - * sm2 - */ - SM2(Sm2Encryptor.class), - - /** - * sm4 - */ - SM4(Sm4Encryptor.class); - - private final Class clazz; -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java deleted file mode 100644 index f471221..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.common.encrypt.enumd; - -/** - * 编码类型 - * - * @author 老马 - * @version 4.6.0 - */ -public enum EncodeType { - - /** - * 默认使用yml配置 - */ - DEFAULT, - - /** - * base64编码 - */ - BASE64, - - /** - * 16进制编码 - */ - HEX; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java deleted file mode 100644 index 79d58da..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.dromara.common.encrypt.filter; - -import cn.hutool.core.util.ObjectUtil; -import jakarta.servlet.*; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; -import org.springframework.http.HttpMethod; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerExceptionResolver; -import org.springframework.web.servlet.HandlerExecutionChain; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import java.io.IOException; - - -/** - * Crypto 过滤器 - * - * @author wdhcr - */ -public class CryptoFilter implements Filter { - private final ApiDecryptProperties properties; - - public CryptoFilter(ApiDecryptProperties properties) { - this.properties = properties; - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - HttpServletRequest servletRequest = (HttpServletRequest) request; - HttpServletResponse servletResponse = (HttpServletResponse) response; - // 获取加密注解 - ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest); - boolean responseFlag = apiEncrypt != null && apiEncrypt.response(); - ServletRequest requestWrapper = null; - ServletResponse responseWrapper = null; - EncryptResponseBodyWrapper responseBodyWrapper = null; - - // 是否为 put 或者 post 请求 - if (HttpMethod.PUT.matches(servletRequest.getMethod()) || HttpMethod.POST.matches(servletRequest.getMethod())) { - // 是否存在加密标头 - String headerValue = servletRequest.getHeader(properties.getHeaderFlag()); - if (StringUtils.isNotBlank(headerValue)) { - // 请求解密 - requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag()); - } else { - // 是否有注解，有就报错，没有放行 - if (ObjectUtil.isNotNull(apiEncrypt)) { - HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver", HandlerExceptionResolver.class); - exceptionResolver.resolveException( - servletRequest, servletResponse, null, - new ServiceException("没有访问权限，请联系管理员授权", HttpStatus.FORBIDDEN)); - return; - } - } - } - - // 判断是否响应加密 - if (responseFlag) { - responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse); - responseWrapper = responseBodyWrapper; - } - - chain.doFilter( - ObjectUtil.defaultIfNull(requestWrapper, request), - ObjectUtil.defaultIfNull(responseWrapper, response)); - - if (responseFlag) { - servletResponse.reset(); - // 对原始内容加密 - String encryptContent = responseBodyWrapper.getEncryptContent( - servletResponse, properties.getPublicKey(), properties.getHeaderFlag()); - // 对加密后的内容写出 - servletResponse.getWriter().write(encryptContent); - } - } - - /** - * 获取 ApiEncrypt 注解 - */ - private ApiEncrypt getApiEncryptAnnotation(HttpServletRequest servletRequest) { - RequestMappingHandlerMapping handlerMapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class); - // 获取注解 - try { - HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest); - if (ObjectUtil.isNotNull(mappingHandler)) { - Object handler = mappingHandler.getHandler(); - if (ObjectUtil.isNotNull(handler)) { - // 从handler获取注解 - if (handler instanceof HandlerMethod handlerMethod) { - return handlerMethod.getMethodAnnotation(ApiEncrypt.class); - } - } - } - } catch (Exception e) { - return null; - } - return null; - } - - @Override - public void destroy() { - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java deleted file mode 100644 index 98f4bc7..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.dromara.common.encrypt.filter; - -import cn.hutool.core.io.IoUtil; -import jakarta.servlet.ReadListener; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.encrypt.utils.EncryptUtils; -import org.springframework.http.MediaType; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; - -/** - * 解密请求参数工具类 - * - * @author wdhcr - */ -public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper { - - private final byte[] body; - - public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException { - super(request); - // 获取 AES 密码 采用 RSA 加密 - String headerRsa = request.getHeader(headerFlag); - String decryptAes = EncryptUtils.decryptByRsa(headerRsa, privateKey); - // 解密 AES 密码 - String aesPassword = EncryptUtils.decryptByBase64(decryptAes); - request.setCharacterEncoding(Constants.UTF8); - byte[] readBytes = IoUtil.readBytes(request.getInputStream(), false); - String requestBody = new String(readBytes, StandardCharsets.UTF_8); - // 解密 body 采用 AES 加密 - String decryptBody = EncryptUtils.decryptByAes(requestBody, aesPassword); - body = decryptBody.getBytes(StandardCharsets.UTF_8); - } - - @Override - public BufferedReader getReader() { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - - @Override - public int getContentLength() { - return body.length; - } - - @Override - public long getContentLengthLong() { - return body.length; - } - - @Override - public String getContentType() { - return MediaType.APPLICATION_JSON_VALUE; - } - - - @Override - public ServletInputStream getInputStream() { - final ByteArrayInputStream bais = new ByteArrayInputStream(body); - return new ServletInputStream() { - @Override - public int read() { - return bais.read(); - } - - @Override - public int available() { - return body.length; - } - - @Override - public boolean isFinished() { - return false; - } - - @Override - public boolean isReady() { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - }; - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java deleted file mode 100644 index c0af232..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.dromara.common.encrypt.filter; - -import cn.hutool.core.util.RandomUtil; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.WriteListener; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpServletResponseWrapper; -import org.dromara.common.encrypt.utils.EncryptUtils; - -import java.io.*; -import java.nio.charset.StandardCharsets; - -/** - * 加密响应参数包装类 - * - * @author Michelle.Chung - */ -public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { - - private final ByteArrayOutputStream byteArrayOutputStream; - private final ServletOutputStream servletOutputStream; - private final PrintWriter printWriter; - - public EncryptResponseBodyWrapper(HttpServletResponse response) throws IOException { - super(response); - this.byteArrayOutputStream = new ByteArrayOutputStream(); - this.servletOutputStream = this.getOutputStream(); - this.printWriter = new PrintWriter(new OutputStreamWriter(byteArrayOutputStream)); - } - - @Override - public PrintWriter getWriter() { - return printWriter; - } - - @Override - public void flushBuffer() throws IOException { - if (servletOutputStream != null) { - servletOutputStream.flush(); - } - if (printWriter != null) { - printWriter.flush(); - } - } - - @Override - public void reset() { - byteArrayOutputStream.reset(); - } - - public byte[] getResponseData() throws IOException { - flushBuffer(); - return byteArrayOutputStream.toByteArray(); - } - - public String getContent() throws IOException { - flushBuffer(); - return byteArrayOutputStream.toString(); - } - - /** - * 获取加密内容 - * - * @param servletResponse response - * @param publicKey RSA公钥 (用于加密 AES 秘钥) - * @param headerFlag 请求头标志 - * @return 加密内容 - * @throws IOException - */ - public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException { - // 生成秘钥 - String aesPassword = RandomUtil.randomString(32); - // 秘钥使用 Base64 编码 - String encryptAes = EncryptUtils.encryptByBase64(aesPassword); - // Rsa 公钥加密 Base64 编码 - String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey); - - // 设置响应头 - servletResponse.addHeader("Access-Control-Expose-Headers", headerFlag); - servletResponse.setHeader(headerFlag, encryptPassword); - servletResponse.setHeader("Access-Control-Allow-Origin", "*"); - servletResponse.setHeader("Access-Control-Allow-Methods", "*"); - servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString()); - - // 获取原始内容 - String originalBody = this.getContent(); - // 对内容进行加密 - return EncryptUtils.encryptByAes(originalBody, aesPassword); - } - - @Override - public ServletOutputStream getOutputStream() throws IOException { - return new ServletOutputStream() { - @Override - public boolean isReady() { - return false; - } - - @Override - public void setWriteListener(WriteListener writeListener) { - - } - - @Override - public void write(int b) throws IOException { - byteArrayOutputStream.write(b); - } - - @Override - public void write(byte[] b) throws IOException { - byteArrayOutputStream.write(b); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - byteArrayOutputStream.write(b, off, len); - } - }; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java deleted file mode 100644 index 460aa36..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.dromara.common.encrypt.interceptor; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.executor.resultset.ResultSetHandler; -import org.apache.ibatis.plugin.*; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; - -import java.lang.reflect.Field; -import java.sql.Statement; -import java.util.*; - -/** - * 出参解密拦截器 - * - * @author 老马 - * @version 4.6.0 - */ -@Slf4j -@Intercepts({@Signature( - type = ResultSetHandler.class, - method = "handleResultSets", - args = {Statement.class}) -}) -@AllArgsConstructor -public class MybatisDecryptInterceptor implements Interceptor { - - private final EncryptorManager encryptorManager; - private final EncryptorProperties defaultProperties; - - @Override - public Object intercept(Invocation invocation) throws Throwable { - // 获取执行mysql执行结果 - Object result = invocation.proceed(); - if (result == null) { - return null; - } - decryptHandler(result); - return result; - } - - /** - * 解密对象 - * - * @param sourceObject 待加密对象 - */ - private void decryptHandler(Object sourceObject) { - if (ObjectUtil.isNull(sourceObject)) { - return; - } - if (sourceObject instanceof Map map) { - new HashSet<>(map.values()).forEach(this::decryptHandler); - return; - } - if (sourceObject instanceof List list) { - if(CollUtil.isEmpty(list)) { - return; - } - // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = list.get(0); - if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { - return; - } - list.forEach(this::decryptHandler); - return; - } - // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错) - Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); - if(ObjectUtil.isNull(fields)){ - return; - } - try { - for (Field field : fields) { - field.set(sourceObject, this.decryptField(Convert.toStr(field.get(sourceObject)), field)); - } - } catch (Exception e) { - log.error("处理解密字段时出错", e); - } - } - - /** - * 字段值进行加密。通过字段的批注注册新的加密算法 - * - * @param value 待加密的值 - * @param field 待加密字段 - * @return 加密后结果 - */ - private String decryptField(String value, Field field) { - if (ObjectUtil.isNull(value)) { - return null; - } - EncryptField encryptField = field.getAnnotation(EncryptField.class); - EncryptContext encryptContext = new EncryptContext(); - encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm()); - encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode()); - encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password()); - encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey()); - encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey()); - return this.encryptorManager.decrypt(value, encryptContext); - } - - @Override - public Object plugin(Object target) { - return Plugin.wrap(target, this); - } - - @Override - public void setProperties(Properties properties) { - - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java deleted file mode 100644 index bcc2f4c..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.dromara.common.encrypt.interceptor; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.executor.parameter.ParameterHandler; -import org.apache.ibatis.plugin.Interceptor; -import org.apache.ibatis.plugin.Intercepts; -import org.apache.ibatis.plugin.Invocation; -import org.apache.ibatis.plugin.Signature; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; - -import java.lang.reflect.Field; -import java.sql.PreparedStatement; -import java.util.*; - -/** - * 入参加密拦截器 - * - * @author 老马 - * @version 4.6.0 - */ -@Slf4j -@Intercepts({@Signature( - type = ParameterHandler.class, - method = "setParameters", - args = {PreparedStatement.class}) -}) -@AllArgsConstructor -public class MybatisEncryptInterceptor implements Interceptor { - - private final EncryptorManager encryptorManager; - private final EncryptorProperties defaultProperties; - - @Override - public Object intercept(Invocation invocation) throws Throwable { - return invocation; - } - - @Override - public Object plugin(Object target) { - if (target instanceof ParameterHandler parameterHandler) { - // 进行加密操作 - Object parameterObject = parameterHandler.getParameterObject(); - if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) { - this.encryptHandler(parameterObject); - } - } - return target; - } - - /** - * 加密对象 - * - * @param sourceObject 待加密对象 - */ - private void encryptHandler(Object sourceObject) { - if (ObjectUtil.isNull(sourceObject)) { - return; - } - if (sourceObject instanceof Map map) { - new HashSet<>(map.values()).forEach(this::encryptHandler); - return; - } - if (sourceObject instanceof List list) { - if(CollUtil.isEmpty(list)) { - return; - } - // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = list.get(0); - if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { - return; - } - list.forEach(this::encryptHandler); - return; - } - // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错) - Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); - if(ObjectUtil.isNull(fields)){ - return; - } - try { - for (Field field : fields) { - field.set(sourceObject, this.encryptField(Convert.toStr(field.get(sourceObject)), field)); - } - } catch (Exception e) { - log.error("处理加密字段时出错", e); - } - } - - /** - * 字段值进行加密。通过字段的批注注册新的加密算法 - * - * @param value 待加密的值 - * @param field 待加密字段 - * @return 加密后结果 - */ - private String encryptField(String value, Field field) { - if (ObjectUtil.isNull(value)) { - return null; - } - EncryptField encryptField = field.getAnnotation(EncryptField.class); - EncryptContext encryptContext = new EncryptContext(); - encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm()); - encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode()); - encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password()); - encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey()); - encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey()); - return this.encryptorManager.encrypt(value, encryptContext); - } - - - @Override - public void setProperties(Properties properties) { - } -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java deleted file mode 100644 index 6aadb3e..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.common.encrypt.properties; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * api解密属性配置类 - * @author wdhcr - */ -@Data -@ConfigurationProperties(prefix = "api-decrypt") -public class ApiDecryptProperties { - - /** - * 加密开关 - */ - private Boolean enabled; - - /** - * 头部标识 - */ - private String headerFlag; - - /** - * 响应加密公钥 - */ - private String publicKey; - - /** - * 请求解密私钥 - */ - private String privateKey; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java deleted file mode 100644 index ba445c1..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.encrypt.properties; - -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 加解密属性配置类 - * - * @author 老马 - * @version 4.6.0 - */ -@Data -@ConfigurationProperties(prefix = "mybatis-encryptor") -public class EncryptorProperties { - - /** - * 过滤开关 - */ - private Boolean enable; - - /** - * 默认算法 - */ - private AlgorithmType algorithm; - - /** - * 安全秘钥 - */ - private String password; - - /** - * 公钥 - */ - private String publicKey; - - /** - * 私钥 - */ - private String privateKey; - - /** - * 编码方式，base64/hex - */ - private EncodeType encode; - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java deleted file mode 100644 index 8e34843..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ /dev/null @@ -1,311 +0,0 @@ -package org.dromara.common.encrypt.utils; - -import cn.hutool.core.codec.Base64; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.SmUtil; -import cn.hutool.crypto.asymmetric.KeyType; -import cn.hutool.crypto.asymmetric.RSA; -import cn.hutool.crypto.asymmetric.SM2; - -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -/** - * 安全相关工具类 - * - * @author 老马 - */ -public class EncryptUtils { - /** - * 公钥 - */ - public static final String PUBLIC_KEY = "publicKey"; - /** - * 私钥 - */ - public static final String PRIVATE_KEY = "privateKey"; - - /** - * Base64加密 - * - * @param data 待加密数据 - * @return 加密后字符串 - */ - public static String encryptByBase64(String data) { - return Base64.encode(data, StandardCharsets.UTF_8); - } - - /** - * Base64解密 - * - * @param data 待解密数据 - * @return 解密后字符串 - */ - public static String decryptByBase64(String data) { - return Base64.decodeStr(data, StandardCharsets.UTF_8); - } - - /** - * AES加密 - * - * @param data 待解密数据 - * @param password 秘钥字符串 - * @return 加密后字符串, 采用Base64编码 - */ - public static String encryptByAes(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("AES需要传入秘钥信息"); - } - // aes算法的秘钥要求是16位、24位、32位 - int[] array = {16, 24, 32}; - if (!ArrayUtil.contains(array, password.length())) { - throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); - } - return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8); - } - - /** - * AES加密 - * - * @param data 待解密数据 - * @param password 秘钥字符串 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptByAesHex(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("AES需要传入秘钥信息"); - } - // aes算法的秘钥要求是16位、24位、32位 - int[] array = {16, 24, 32}; - if (!ArrayUtil.contains(array, password.length())) { - throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); - } - return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8); - } - - /** - * AES解密 - * - * @param data 待解密数据 - * @param password 秘钥字符串 - * @return 解密后字符串 - */ - public static String decryptByAes(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("AES需要传入秘钥信息"); - } - // aes算法的秘钥要求是16位、24位、32位 - int[] array = {16, 24, 32}; - if (!ArrayUtil.contains(array, password.length())) { - throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); - } - return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8); - } - - /** - * sm4加密 - * - * @param data 待加密数据 - * @param password 秘钥字符串 - * @return 加密后字符串, 采用Base64编码 - */ - public static String encryptBySm4(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("SM4需要传入秘钥信息"); - } - // sm4算法的秘钥要求是16位长度 - int sm4PasswordLength = 16; - if (sm4PasswordLength != password.length()) { - throw new IllegalArgumentException("SM4秘钥长度要求为16位"); - } - return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8); - } - - /** - * sm4加密 - * - * @param data 待加密数据 - * @param password 秘钥字符串 - * @return 加密后字符串, 采用Base64编码 - */ - public static String encryptBySm4Hex(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("SM4需要传入秘钥信息"); - } - // sm4算法的秘钥要求是16位长度 - int sm4PasswordLength = 16; - if (sm4PasswordLength != password.length()) { - throw new IllegalArgumentException("SM4秘钥长度要求为16位"); - } - return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8); - } - - /** - * sm4解密 - * - * @param data 待解密数据 - * @param password 秘钥字符串 - * @return 解密后字符串 - */ - public static String decryptBySm4(String data, String password) { - if (StrUtil.isBlank(password)) { - throw new IllegalArgumentException("SM4需要传入秘钥信息"); - } - // sm4算法的秘钥要求是16位长度 - int sm4PasswordLength = 16; - if (sm4PasswordLength != password.length()) { - throw new IllegalArgumentException("SM4秘钥长度要求为16位"); - } - return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8); - } - - /** - * 产生sm2加解密需要的公钥和私钥 - * - * @return 公私钥Map - */ - public static Map generateSm2Key() { - Map keyMap = new HashMap<>(2); - SM2 sm2 = SmUtil.sm2(); - keyMap.put(PRIVATE_KEY, sm2.getPrivateKeyBase64()); - keyMap.put(PUBLIC_KEY, sm2.getPublicKeyBase64()); - return keyMap; - } - - /** - * sm2公钥加密 - * - * @param data 待加密数据 - * @param publicKey 公钥 - * @return 加密后字符串, 采用Base64编码 - */ - public static String encryptBySm2(String data, String publicKey) { - if (StrUtil.isBlank(publicKey)) { - throw new IllegalArgumentException("SM2需要传入公钥进行加密"); - } - SM2 sm2 = SmUtil.sm2(null, publicKey); - return sm2.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey); - } - - /** - * sm2公钥加密 - * - * @param data 待加密数据 - * @param publicKey 公钥 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptBySm2Hex(String data, String publicKey) { - if (StrUtil.isBlank(publicKey)) { - throw new IllegalArgumentException("SM2需要传入公钥进行加密"); - } - SM2 sm2 = SmUtil.sm2(null, publicKey); - return sm2.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey); - } - - /** - * sm2私钥解密 - * - * @param data 待加密数据 - * @param privateKey 私钥 - * @return 解密后字符串 - */ - public static String decryptBySm2(String data, String privateKey) { - if (StrUtil.isBlank(privateKey)) { - throw new IllegalArgumentException("SM2需要传入私钥进行解密"); - } - SM2 sm2 = SmUtil.sm2(privateKey, null); - return sm2.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8); - } - - /** - * 产生RSA加解密需要的公钥和私钥 - * - * @return 公私钥Map - */ - public static Map generateRsaKey() { - Map keyMap = new HashMap<>(2); - RSA rsa = SecureUtil.rsa(); - keyMap.put(PRIVATE_KEY, rsa.getPrivateKeyBase64()); - keyMap.put(PUBLIC_KEY, rsa.getPublicKeyBase64()); - return keyMap; - } - - /** - * rsa公钥加密 - * - * @param data 待加密数据 - * @param publicKey 公钥 - * @return 加密后字符串, 采用Base64编码 - */ - public static String encryptByRsa(String data, String publicKey) { - if (StrUtil.isBlank(publicKey)) { - throw new IllegalArgumentException("RSA需要传入公钥进行加密"); - } - RSA rsa = SecureUtil.rsa(null, publicKey); - return rsa.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey); - } - - /** - * rsa公钥加密 - * - * @param data 待加密数据 - * @param publicKey 公钥 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptByRsaHex(String data, String publicKey) { - if (StrUtil.isBlank(publicKey)) { - throw new IllegalArgumentException("RSA需要传入公钥进行加密"); - } - RSA rsa = SecureUtil.rsa(null, publicKey); - return rsa.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey); - } - - /** - * rsa私钥解密 - * - * @param data 待加密数据 - * @param privateKey 私钥 - * @return 解密后字符串 - */ - public static String decryptByRsa(String data, String privateKey) { - if (StrUtil.isBlank(privateKey)) { - throw new IllegalArgumentException("RSA需要传入私钥进行解密"); - } - RSA rsa = SecureUtil.rsa(privateKey, null); - return rsa.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8); - } - - /** - * md5加密 - * - * @param data 待加密数据 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptByMd5(String data) { - return SecureUtil.md5(data); - } - - /** - * sha256加密 - * - * @param data 待加密数据 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptBySha256(String data) { - return SecureUtil.sha256(data); - } - - /** - * sm3加密 - * - * @param data 待加密数据 - * @return 加密后字符串, 采用Hex编码 - */ - public static String encryptBySm3(String data) { - return SmUtil.sm3(data); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 132cf29..0000000 --- a/template/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -org.dromara.common.encrypt.config.EncryptorAutoConfiguration -org.dromara.common.encrypt.config.ApiDecryptAutoConfiguration - diff --git a/template/ruoyi-common/ruoyi-common-excel/pom.xml b/template/ruoyi-common/ruoyi-common-excel/pom.xml deleted file mode 100644 index dd4a5ee..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-excel - - - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-json - - - - com.alibaba - easyexcel - - - - diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java deleted file mode 100644 index 6b9211b..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.common.excel.annotation; - -import org.dromara.common.excel.core.CellMergeStrategy; - -import java.lang.annotation.*; - -/** - * excel 列单元格合并(合并列相同项) - * - * 需搭配 {@link CellMergeStrategy} 策略使用 - * - * @author Lion Li - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -public @interface CellMerge { - - /** - * col index - */ - int index() default -1; - - /** - * 合并需要依赖的其他字段名称 - */ - String[] mergeBy() default {}; - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java deleted file mode 100644 index 5c51842..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dromara.common.excel.annotation; - -import org.dromara.common.core.utils.StringUtils; - -import java.lang.annotation.*; - -/** - * 字典格式化 - * - * @author Lion Li - */ -@Target({ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -public @interface ExcelDictFormat { - - /** - * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) - */ - String dictType() default ""; - - /** - * 读取内容转表达式 (如: 0=男,1=女,2=未知) - */ - String readConverterExp() default ""; - - /** - * 分隔符，读取字符串组内容 - */ - String separator() default StringUtils.SEPARATOR; - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java deleted file mode 100644 index 290379d..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.excel.annotation; - -import java.lang.annotation.*; - -/** - * 枚举格式化 - * - * @author Liang - */ -@Target({ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -public @interface ExcelEnumFormat { - - /** - * 字典枚举类型 - */ - Class> enumClass(); - - /** - * 字典枚举类中对应的code属性名称，默认为code - */ - String codeField() default "code"; - - /** - * 字典枚举类中对应的text属性名称，默认为text - */ - String textField() default "text"; - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java deleted file mode 100644 index 07cc4c4..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.common.excel.convert; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; -import lombok.extern.slf4j.Slf4j; - -import java.math.BigDecimal; - -/** - * 大数值转换 - * Excel 数值长度位15位 大于15位的数值转换位字符串 - * - * @author Lion Li - */ -@Slf4j -public class ExcelBigNumberConvert implements Converter { - - @Override - public Class supportJavaTypeKey() { - return Long.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.STRING; - } - - @Override - public Long convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - return Convert.toLong(cellData.getData()); - } - - @Override - public WriteCellData convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - if (ObjectUtil.isNotNull(object)) { - String str = Convert.toStr(object); - if (str.length() > 15) { - return new WriteCellData<>(str); - } - } - WriteCellData cellData = new WriteCellData<>(new BigDecimal(object)); - cellData.setType(CellDataTypeEnum.NUMBER); - return cellData; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java deleted file mode 100644 index 61eeabf..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.common.excel.convert; - -import cn.hutool.core.annotation.AnnotationUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.utils.ExcelUtil; -import lombok.extern.slf4j.Slf4j; - -import java.lang.reflect.Field; - -/** - * 字典格式化转换处理 - * - * @author Lion Li - */ -@Slf4j -public class ExcelDictConvert implements Converter { - - @Override - public Class supportJavaTypeKey() { - return Object.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return null; - } - - @Override - public Object convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - ExcelDictFormat anno = getAnnotation(contentProperty.getField()); - String type = anno.dictType(); - String label = cellData.getStringValue(); - String value; - if (StringUtils.isBlank(type)) { - value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator()); - } else { - value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator()); - } - return Convert.convert(contentProperty.getField().getType(), value); - } - - @Override - public WriteCellData convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - if (ObjectUtil.isNull(object)) { - return new WriteCellData<>(""); - } - ExcelDictFormat anno = getAnnotation(contentProperty.getField()); - String type = anno.dictType(); - String value = Convert.toStr(object); - String label; - if (StringUtils.isBlank(type)) { - label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator()); - } else { - label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator()); - } - return new WriteCellData<>(label); - } - - private ExcelDictFormat getAnnotation(Field field) { - return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class); - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java deleted file mode 100644 index b948ea7..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.dromara.common.excel.convert; - -import cn.hutool.core.annotation.AnnotationUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import lombok.extern.slf4j.Slf4j; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -/** - * 枚举格式化转换处理 - * - * @author Liang - */ -@Slf4j -public class ExcelEnumConvert implements Converter { - - @Override - public Class supportJavaTypeKey() { - return Object.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return null; - } - - @Override - public Object convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - cellData.checkEmpty(); - // Excel中填入的是枚举中指定的描述 - Object textValue = switch (cellData.getType()) { - case STRING, DIRECT_STRING, RICH_TEXT_STRING -> cellData.getStringValue(); - case NUMBER -> cellData.getNumberValue(); - case BOOLEAN -> cellData.getBooleanValue(); - default -> throw new IllegalArgumentException("单元格类型异常!"); - }; - // 如果是空值 - if (ObjectUtil.isNull(textValue)) { - return null; - } - Map enumCodeToTextMap = beforeConvert(contentProperty); - // 从Java输出至Excel是code转text - // 因此从Excel转Java应该将text与code对调 - Map enumTextToCodeMap = new HashMap<>(); - enumCodeToTextMap.forEach((key, value) -> enumTextToCodeMap.put(value, key)); - // 应该从text -> code中查找 - Object codeValue = enumTextToCodeMap.get(textValue); - return Convert.convert(contentProperty.getField().getType(), codeValue); - } - - @Override - public WriteCellData convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - if (ObjectUtil.isNull(object)) { - return new WriteCellData<>(""); - } - Map enumValueMap = beforeConvert(contentProperty); - String value = Convert.toStr(enumValueMap.get(object), ""); - return new WriteCellData<>(value); - } - - private Map beforeConvert(ExcelContentProperty contentProperty) { - ExcelEnumFormat anno = getAnnotation(contentProperty.getField()); - Map enumValueMap = new HashMap<>(); - Enum[] enumConstants = anno.enumClass().getEnumConstants(); - for (Enum enumConstant : enumConstants) { - Object codeValue = ReflectUtils.invokeGetter(enumConstant, anno.codeField()); - String textValue = ReflectUtils.invokeGetter(enumConstant, anno.textField()); - enumValueMap.put(codeValue, textValue); - } - return enumValueMap; - } - - private ExcelEnumFormat getAnnotation(Field field) { - return AnnotationUtil.getAnnotation(field, ExcelEnumFormat.class); - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java deleted file mode 100644 index 7c7721c..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.dromara.common.excel.core; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.metadata.Head; -import com.alibaba.excel.write.handler.WorkbookWriteHandler; -import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; -import com.alibaba.excel.write.merge.AbstractMergeStrategy; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.util.CellRangeAddress; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.CellMerge; - -import java.lang.reflect.Field; -import java.util.*; - -/** - * 列值重复合并策略 - * - * @author Lion Li - */ -@Slf4j -public class CellMergeStrategy extends AbstractMergeStrategy implements WorkbookWriteHandler { - - private final List cellList; - private final boolean hasTitle; - private int rowIndex; - - public CellMergeStrategy(List list, boolean hasTitle) { - this.hasTitle = hasTitle; - // 行合并开始下标 - this.rowIndex = hasTitle ? 1 : 0; - this.cellList = handle(list, hasTitle); - } - - @Override - protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) { - //单元格写入了,遍历合并区域,如果该Cell在区域内,但非首行,则清空 - final int rowIndex = cell.getRowIndex(); - if (CollUtil.isNotEmpty(cellList)){ - for (CellRangeAddress cellAddresses : cellList) { - final int firstRow = cellAddresses.getFirstRow(); - if (cellAddresses.isInRange(cell) && rowIndex != firstRow){ - cell.setBlank(); - } - } - } - } - - @Override - public void afterWorkbookDispose(final WorkbookWriteHandlerContext context) { - //当前表格写完后，统一写入 - if (CollUtil.isNotEmpty(cellList)){ - for (CellRangeAddress item : cellList) { - context.getWriteContext().writeSheetHolder().getSheet().addMergedRegion(item); - } - } - } - - @SneakyThrows - private List handle(List list, boolean hasTitle) { - List cellList = new ArrayList<>(); - if (CollUtil.isEmpty(list)) { - return cellList; - } - Field[] fields = ReflectUtils.getFields(list.get(0).getClass(), field -> !"serialVersionUID".equals(field.getName())); - - // 有注解的字段 - List mergeFields = new ArrayList<>(); - List mergeFieldsIndex = new ArrayList<>(); - for (int i = 0; i < fields.length; i++) { - Field field = fields[i]; - if (field.isAnnotationPresent(CellMerge.class)) { - CellMerge cm = field.getAnnotation(CellMerge.class); - mergeFields.add(field); - mergeFieldsIndex.add(cm.index() == -1 ? i : cm.index()); - if (hasTitle) { - ExcelProperty property = field.getAnnotation(ExcelProperty.class); - rowIndex = Math.max(rowIndex, property.value().length); - } - } - } - - Map map = new HashMap<>(); - // 生成两两合并单元格 - for (int i = 0; i < list.size(); i++) { - for (int j = 0; j < mergeFields.size(); j++) { - Field field = mergeFields.get(j); - Object val = ReflectUtils.invokeGetter(list.get(i), field.getName()); - - int colNum = mergeFieldsIndex.get(j); - if (!map.containsKey(field)) { - map.put(field, new RepeatCell(val, i)); - } else { - RepeatCell repeatCell = map.get(field); - Object cellValue = repeatCell.getValue(); - if (cellValue == null || "".equals(cellValue)) { - // 空值跳过不合并 - continue; - } - - if (!cellValue.equals(val)) { - if ((i - repeatCell.getCurrent() > 1)) { - cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum)); - } - map.put(field, new RepeatCell(val, i)); - } else if (i == list.size() - 1) { - if (i > repeatCell.getCurrent() && isMerge(list, i, field)) { - cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum)); - } - } else if (!isMerge(list, i, field)) { - if ((i - repeatCell.getCurrent() > 1)) { - cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum)); - } - map.put(field, new RepeatCell(val, i)); - } - } - } - } - return cellList; - } - - private boolean isMerge(List list, int i, Field field) { - boolean isMerge = true; - CellMerge cm = field.getAnnotation(CellMerge.class); - final String[] mergeBy = cm.mergeBy(); - if (StrUtil.isAllNotBlank(mergeBy)) { - //比对当前list(i)和list(i - 1)的各个属性值一一比对 如果全为真 则为真 - for (String fieldName : mergeBy) { - final Object valCurrent = ReflectUtil.getFieldValue(list.get(i), fieldName); - final Object valPre = ReflectUtil.getFieldValue(list.get(i - 1), fieldName); - if (!Objects.equals(valPre, valCurrent)) { - //依赖字段如有任一不等值,则标记为不可合并 - isMerge = false; - } - } - } - return isMerge; - } - - @Data - @AllArgsConstructor - static class RepeatCell { - - private Object value; - - private int current; - - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java deleted file mode 100644 index b6fa0b4..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.dromara.common.excel.core; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.excel.exception.ExcelAnalysisException; -import com.alibaba.excel.exception.ExcelDataConvertException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.util.Map; -import java.util.Set; - -/** - * Excel 导入监听 - * - * @author Yjoioooo - * @author Lion Li - */ -@Slf4j -@NoArgsConstructor -public class DefaultExcelListener extends AnalysisEventListener implements ExcelListener { - - /** - * 是否Validator检验，默认为是 - */ - private Boolean isValidate = Boolean.TRUE; - - /** - * excel 表头数据 - */ - private Map headMap; - - /** - * 导入回执 - */ - private ExcelResult excelResult; - - public DefaultExcelListener(boolean isValidate) { - this.excelResult = new DefaultExcelResult<>(); - this.isValidate = isValidate; - } - - /** - * 处理异常 - * - * @param exception ExcelDataConvertException - * @param context Excel 上下文 - */ - @Override - public void onException(Exception exception, AnalysisContext context) throws Exception { - String errMsg = null; - if (exception instanceof ExcelDataConvertException excelDataConvertException) { - // 如果是某一个单元格的转换异常 能获取到具体行号 - Integer rowIndex = excelDataConvertException.getRowIndex(); - Integer columnIndex = excelDataConvertException.getColumnIndex(); - errMsg = StrUtil.format("第{}行-第{}列-表头{}: 解析异常
", - rowIndex + 1, columnIndex + 1, headMap.get(columnIndex)); - if (log.isDebugEnabled()) { - log.error(errMsg); - } - } - if (exception instanceof ConstraintViolationException constraintViolationException) { - Set> constraintViolations = constraintViolationException.getConstraintViolations(); - String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", "); - errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg); - if (log.isDebugEnabled()) { - log.error(errMsg); - } - } - excelResult.getErrorList().add(errMsg); - throw new ExcelAnalysisException(errMsg); - } - - @Override - public void invokeHeadMap(Map headMap, AnalysisContext context) { - this.headMap = headMap; - log.debug("解析到一条表头数据: {}", JsonUtils.toJsonString(headMap)); - } - - @Override - public void invoke(T data, AnalysisContext context) { - if (isValidate) { - ValidatorUtils.validate(data); - } - excelResult.getList().add(data); - } - - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - log.debug("所有数据解析完成！"); - } - - @Override - public ExcelResult getExcelResult() { - return excelResult; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java deleted file mode 100644 index 7373e12..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.common.excel.core; - -import cn.hutool.core.util.StrUtil; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.List; - -/** - * 默认excel返回对象 - * - * @author Yjoioooo - * @author Lion Li - */ -public class DefaultExcelResult implements ExcelResult { - - /** - * 数据对象list - */ - @Setter - private List list; - - /** - * 错误信息列表 - */ - @Setter - private List errorList; - - public DefaultExcelResult() { - this.list = new ArrayList<>(); - this.errorList = new ArrayList<>(); - } - - public DefaultExcelResult(List list, List errorList) { - this.list = list; - this.errorList = errorList; - } - - public DefaultExcelResult(ExcelResult excelResult) { - this.list = excelResult.getList(); - this.errorList = excelResult.getErrorList(); - } - - @Override - public List getList() { - return list; - } - - @Override - public List getErrorList() { - return errorList; - } - - /** - * 获取导入回执 - * - * @return 导入回执 - */ - @Override - public String getAnalysis() { - int successCount = list.size(); - int errorCount = errorList.size(); - if (successCount == 0) { - return "读取失败，未解析到数据"; - } else { - if (errorCount == 0) { - return StrUtil.format("恭喜您，全部读取成功！共{}条", successCount); - } else { - return ""; - } - } - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java deleted file mode 100644 index 8b53a0c..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.dromara.common.excel.core; - -import cn.hutool.core.util.StrUtil; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - *

Excel下拉可选项

- * 注意：为确保下拉框解析正确，传值务必使用createOptionValue()做为值的拼接 - * - * @author Emil.Zhang - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuppressWarnings("unused") -public class DropDownOptions { - /** - * 一级下拉所在列index，从0开始算 - */ - private int index = 0; - /** - * 二级下拉所在的index，从0开始算，不能与一级相同 - */ - private int nextIndex = 0; - /** - * 一级下拉所包含的数据 - */ - private List options = new ArrayList<>(); - /** - * 二级下拉所包含的数据Map - *

以每一个一级选项值为Key，每个一级选项对应的二级数据为Value

- */ - private Map> nextOptions = new HashMap<>(); - /** - * 分隔符 - */ - private static final String DELIMITER = "_"; - - /** - * 创建只有一级的下拉选 - */ - public DropDownOptions(int index, List options) { - this.index = index; - this.options = options; - } - - /** - *

创建每个选项可选值

- *

注意：不能以数字，特殊符号开头，选项中不可以包含任何运算符号

- * - * @param vars 可选值内包含的参数 - * @return 合规的可选值 - */ - public static String createOptionValue(Object... vars) { - StringBuilder stringBuffer = new StringBuilder(); - String regex = "^[\\S\\d\\u4e00-\\u9fa5]+$"; - for (int i = 0; i < vars.length; i++) { - String var = StrUtil.trimToEmpty(String.valueOf(vars[i])); - if (!var.matches(regex)) { - throw new ServiceException("选项数据不符合规则，仅允许使用中英文字符以及数字"); - } - stringBuffer.append(var); - if (i < vars.length - 1) { - // 直至最后一个前，都以_作为切割线 - stringBuffer.append(DELIMITER); - } - } - if (stringBuffer.toString().matches("^\\d_*$")) { - throw new ServiceException("禁止以数字开头"); - } - return stringBuffer.toString(); - } - - /** - * 将处理后合理的可选值解析为原始的参数 - * - * @param option 经过处理后的合理的可选项 - * @return 原始的参数 - */ - public static List analyzeOptionValue(String option) { - return StrUtil.split(option, DELIMITER, true, true); - } - - /** - * 创建级联下拉选项 - * - * @param parentList 父实体可选项原始数据 - * @param parentIndex 父下拉选位置 - * @param sonList 子实体可选项原始数据 - * @param sonIndex 子下拉选位置 - * @param parentHowToGetIdFunction 父类如何获取唯一标识 - * @param sonHowToGetParentIdFunction 子类如何获取父类的唯一标识 - * @param howToBuildEveryOption 如何生成下拉选内容 - * @return 级联下拉选项 - */ - public static DropDownOptions buildLinkedOptions(List parentList, - int parentIndex, - List sonList, - int sonIndex, - Function parentHowToGetIdFunction, - Function sonHowToGetParentIdFunction, - Function howToBuildEveryOption) { - DropDownOptions parentLinkSonOptions = new DropDownOptions(); - // 先创建父类的下拉 - parentLinkSonOptions.setIndex(parentIndex); - parentLinkSonOptions.setOptions( - parentList.stream() - .map(howToBuildEveryOption) - .collect(Collectors.toList()) - ); - // 提取父-子级联下拉 - Map> sonOptions = new HashMap<>(); - // 父级依据自己的ID分组 - Map> parentGroupByIdMap = - parentList.stream().collect(Collectors.groupingBy(parentHowToGetIdFunction)); - // 遍历每个子集，提取到Map中 - sonList.forEach(everySon -> { - if (parentGroupByIdMap.containsKey(sonHowToGetParentIdFunction.apply(everySon))) { - // 找到对应的上级 - T parentObj = parentGroupByIdMap.get(sonHowToGetParentIdFunction.apply(everySon)).get(0); - // 提取名称和ID作为Key - String key = howToBuildEveryOption.apply(parentObj); - // Key对应的Value - List thisParentSonOptionList; - if (sonOptions.containsKey(key)) { - thisParentSonOptionList = sonOptions.get(key); - } else { - thisParentSonOptionList = new ArrayList<>(); - sonOptions.put(key, thisParentSonOptionList); - } - // 往Value中添加当前子集选项 - thisParentSonOptionList.add(howToBuildEveryOption.apply(everySon)); - } - }); - parentLinkSonOptions.setNextIndex(sonIndex); - parentLinkSonOptions.setNextOptions(sonOptions); - return parentLinkSonOptions; - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java deleted file mode 100644 index b3f68ed..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ /dev/null @@ -1,373 +0,0 @@ -package org.dromara.common.excel.core; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.EnumUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.metadata.FieldCache; -import com.alibaba.excel.metadata.FieldWrapper; -import com.alibaba.excel.util.ClassUtils; -import com.alibaba.excel.write.handler.SheetWriteHandler; -import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; -import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.ss.util.WorkbookUtil; -import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; - -import java.lang.reflect.Field; -import java.util.*; - -/** - *

Excel表格下拉选操作

- * 考虑到下拉选过多可能导致Excel打开缓慢的问题，只校验前1000行 - *

- * 即只有前1000行的数据可以用下拉框，超出的自行通过限制数据量的形式，第二次输出 - * - * @author Emil.Zhang - */ -@Slf4j -public class ExcelDownHandler implements SheetWriteHandler { - - /** - * Excel表格中的列名英文 - * 仅为了解析列英文，禁止修改 - */ - private static final String EXCEL_COLUMN_NAME = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - /** - * 单选数据Sheet名 - */ - private static final String OPTIONS_SHEET_NAME = "options"; - /** - * 联动选择数据Sheet名的头 - */ - private static final String LINKED_OPTIONS_SHEET_NAME = "linkedOptions"; - /** - * 下拉可选项 - */ - private final List dropDownOptions; - /** - * 当前单选进度 - */ - private int currentOptionsColumnIndex; - /** - * 当前联动选择进度 - */ - private int currentLinkedOptionsSheetIndex; - private final DictService dictService; - - public ExcelDownHandler(List options) { - this.dropDownOptions = options; - this.currentOptionsColumnIndex = 0; - this.currentLinkedOptionsSheetIndex = 0; - this.dictService = SpringUtils.getBean(DictService.class); - } - - /** - *

开始创建下拉数据

- * 1.通过解析传入的@ExcelProperty同级是否标注有@DropDown选项 - * 如果有且设置了value值，则将其直接置为下拉可选项 - *

- * 2.或者在调用ExcelUtil时指定了可选项，将依据传入的可选项做下拉 - *

- * 3.二者并存，注意调用方式 - */ - @Override - public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) { - Sheet sheet = writeSheetHolder.getSheet(); - // 开始设置下拉框 HSSFWorkbook - DataValidationHelper helper = sheet.getDataValidationHelper(); - Workbook workbook = writeWorkbookHolder.getWorkbook(); - FieldCache fieldCache = ClassUtils.declaredFields(writeWorkbookHolder.getClazz(), writeWorkbookHolder); - for (Map.Entry entry : fieldCache.getSortedFieldMap().entrySet()) { - Integer index = entry.getKey(); - FieldWrapper wrapper = entry.getValue(); - Field field = wrapper.getField(); - // 循环实体中的每个属性 - // 可选的下拉值 - List options = new ArrayList<>(); - if (field.isAnnotationPresent(ExcelDictFormat.class)) { - // 如果指定了@ExcelDictFormat，则使用字典的逻辑 - ExcelDictFormat format = field.getDeclaredAnnotation(ExcelDictFormat.class); - String dictType = format.dictType(); - String converterExp = format.readConverterExp(); - if (StringUtils.isNotBlank(dictType)) { - // 如果传递了字典名，则依据字典建立下拉 - Collection values = Optional.ofNullable(dictService.getAllDictByDictType(dictType)) - .orElseThrow(() -> new ServiceException(String.format("字典 %s 不存在", dictType))) - .values(); - options = new ArrayList<>(values); - } else if (StringUtils.isNotBlank(converterExp)) { - // 如果指定了确切的值，则直接解析确切的值 - List strList = StringUtils.splitList(converterExp, format.separator()); - options = StreamUtils.toList(strList, s -> StringUtils.split(s, "=")[1]); - } - } else if (field.isAnnotationPresent(ExcelEnumFormat.class)) { - // 否则如果指定了@ExcelEnumFormat，则使用枚举的逻辑 - ExcelEnumFormat format = field.getDeclaredAnnotation(ExcelEnumFormat.class); - List values = EnumUtil.getFieldValues(format.enumClass(), format.textField()); - options = StreamUtils.toList(values, String::valueOf); - } - if (ObjectUtil.isNotEmpty(options)) { - // 仅当下拉可选项不为空时执行 - if (options.size() > 20) { - // 这里限制如果可选项大于20，则使用额外表形式 - dropDownWithSheet(helper, workbook, sheet, index, options); - } else { - // 否则使用固定值形式 - dropDownWithSimple(helper, sheet, index, options); - } - } - } - if (CollUtil.isEmpty(dropDownOptions)) { - return; - } - dropDownOptions.forEach(everyOptions -> { - // 如果传递了下拉框选择器参数 - if (!everyOptions.getNextOptions().isEmpty()) { - // 当二级选项不为空时，使用额外关联表的形式 - dropDownLinkedOptions(helper, workbook, sheet, everyOptions); - } else if (everyOptions.getOptions().size() > 10) { - // 当一级选项参数个数大于10，使用额外表的形式 - dropDownWithSheet(helper, workbook, sheet, everyOptions.getIndex(), everyOptions.getOptions()); - } else if (everyOptions.getOptions().size() != 0) { - // 当一级选项个数不为空，使用默认形式 - dropDownWithSimple(helper, sheet, everyOptions.getIndex(), everyOptions.getOptions()); - } - }); - } - - /** - *

简单下拉框

- * 直接将可选项拼接为指定列的数据校验值 - * - * @param celIndex 列index - * @param value 下拉选可选值 - */ - private void dropDownWithSimple(DataValidationHelper helper, Sheet sheet, Integer celIndex, List value) { - if (ObjectUtil.isEmpty(value)) { - return; - } - this.markOptionsToSheet(helper, sheet, celIndex, helper.createExplicitListConstraint(ArrayUtil.toArray(value, String.class))); - } - - /** - *

额外表格形式的级联下拉框

- * - * @param options 额外表格形式存储的下拉可选项 - */ - private void dropDownLinkedOptions(DataValidationHelper helper, Workbook workbook, Sheet sheet, DropDownOptions options) { - String linkedOptionsSheetName = String.format("%s_%d", LINKED_OPTIONS_SHEET_NAME, currentLinkedOptionsSheetIndex); - // 创建联动下拉数据表 - Sheet linkedOptionsDataSheet = workbook.createSheet(WorkbookUtil.createSafeSheetName(linkedOptionsSheetName)); - // 将下拉表隐藏 - workbook.setSheetHidden(workbook.getSheetIndex(linkedOptionsDataSheet), true); - // 完善横向的一级选项数据表 - List firstOptions = options.getOptions(); - Map> secoundOptionsMap = options.getNextOptions(); - - // 创建名称管理器 - Name name = workbook.createName(); - // 设置名称管理器的别名 - name.setNameName(linkedOptionsSheetName); - // 以横向第一行创建一级下拉拼接引用位置 - String firstOptionsFunction = String.format("%s!$%s$1:$%s$1", - linkedOptionsSheetName, - getExcelColumnName(0), - getExcelColumnName(firstOptions.size()) - ); - // 设置名称管理器的引用位置 - name.setRefersToFormula(firstOptionsFunction); - // 设置数据校验为序列模式，引用的是名称管理器中的别名 - this.markOptionsToSheet(helper, sheet, options.getIndex(), helper.createFormulaListConstraint(linkedOptionsSheetName)); - - for (int columIndex = 0; columIndex < firstOptions.size(); columIndex++) { - // 先提取主表中一级下拉的列名 - String firstOptionsColumnName = getExcelColumnName(columIndex); - // 一次循环是每一个一级选项 - int finalI = columIndex; - // 本次循环的一级选项值 - String thisFirstOptionsValue = firstOptions.get(columIndex); - // 创建第一行的数据 - Optional.ofNullable(linkedOptionsDataSheet.getRow(0)) - // 如果不存在则创建第一行 - .orElseGet(() -> linkedOptionsDataSheet.createRow(finalI)) - // 第一行当前列 - .createCell(columIndex) - // 设置值为当前一级选项值 - .setCellValue(thisFirstOptionsValue); - - // 第二行开始，设置第二级别选项参数 - List secondOptions = secoundOptionsMap.get(thisFirstOptionsValue); - if (CollUtil.isEmpty(secondOptions)) { - // 必须保证至少有一个关联选项，否则将导致Excel解析错误 - secondOptions = Collections.singletonList("暂无_0"); - } - - // 以该一级选项值创建子名称管理器 - Name sonName = workbook.createName(); - // 设置名称管理器的别名 - sonName.setNameName(thisFirstOptionsValue); - // 以第二行该列数据拼接引用位置 - String sonFunction = String.format("%s!$%s$2:$%s$%d", - linkedOptionsSheetName, - firstOptionsColumnName, - firstOptionsColumnName, - secondOptions.size() + 1 - ); - // 设置名称管理器的引用位置 - sonName.setRefersToFormula(sonFunction); - // 数据验证为序列模式，引用到每一个主表中的二级选项位置 - // 创建子项的名称管理器，只是为了使得Excel可以识别到数据 - String mainSheetFirstOptionsColumnName = getExcelColumnName(options.getIndex()); - for (int i = 0; i < 100; i++) { - // 以一级选项对应的主体所在位置创建二级下拉 - String secondOptionsFunction = String.format("=INDIRECT(%s%d)", mainSheetFirstOptionsColumnName, i + 1); - // 二级只能主表每一行的每一列添加二级校验 - markLinkedOptionsToSheet(helper, sheet, i, options.getNextIndex(), helper.createFormulaListConstraint(secondOptionsFunction)); - } - - for (int rowIndex = 0; rowIndex < secondOptions.size(); rowIndex++) { - // 从第二行开始填充二级选项 - int finalRowIndex = rowIndex + 1; - int finalColumIndex = columIndex; - - Row row = Optional.ofNullable(linkedOptionsDataSheet.getRow(finalRowIndex)) - // 没有则创建 - .orElseGet(() -> linkedOptionsDataSheet.createRow(finalRowIndex)); - Optional - // 在本级一级选项所在的列 - .ofNullable(row.getCell(finalColumIndex)) - // 不存在则创建 - .orElseGet(() -> row.createCell(finalColumIndex)) - // 设置二级选项值 - .setCellValue(secondOptions.get(rowIndex)); - } - } - - currentLinkedOptionsSheetIndex++; - } - - /** - *

额外表格形式的普通下拉框

- * 由于下拉框可选值数量过多，为提升Excel打开效率，使用额外表格形式做下拉 - * - * @param celIndex 下拉选 - * @param value 下拉选可选值 - */ - private void dropDownWithSheet(DataValidationHelper helper, Workbook workbook, Sheet sheet, Integer celIndex, List value) { - // 创建下拉数据表 - Sheet simpleDataSheet = Optional.ofNullable(workbook.getSheet(WorkbookUtil.createSafeSheetName(OPTIONS_SHEET_NAME))) - .orElseGet(() -> workbook.createSheet(WorkbookUtil.createSafeSheetName(OPTIONS_SHEET_NAME))); - // 将下拉表隐藏 - workbook.setSheetHidden(workbook.getSheetIndex(simpleDataSheet), true); - // 完善纵向的一级选项数据表 - for (int i = 0; i < value.size(); i++) { - int finalI = i; - // 获取每一选项行，如果没有则创建 - Row row = Optional.ofNullable(simpleDataSheet.getRow(i)) - .orElseGet(() -> simpleDataSheet.createRow(finalI)); - // 获取本级选项对应的选项列，如果没有则创建 - Cell cell = Optional.ofNullable(row.getCell(currentOptionsColumnIndex)) - .orElseGet(() -> row.createCell(currentOptionsColumnIndex)); - // 设置值 - cell.setCellValue(value.get(i)); - } - - // 创建名称管理器 - Name name = workbook.createName(); - // 设置名称管理器的别名 - String nameName = String.format("%s_%d", OPTIONS_SHEET_NAME, celIndex); - name.setNameName(nameName); - // 以纵向第一列创建一级下拉拼接引用位置 - String function = String.format("%s!$%s$1:$%s$%d", - OPTIONS_SHEET_NAME, - getExcelColumnName(currentOptionsColumnIndex), - getExcelColumnName(currentOptionsColumnIndex), - value.size()); - // 设置名称管理器的引用位置 - name.setRefersToFormula(function); - // 设置数据校验为序列模式，引用的是名称管理器中的别名 - this.markOptionsToSheet(helper, sheet, celIndex, helper.createFormulaListConstraint(nameName)); - currentOptionsColumnIndex++; - } - - /** - * 挂载下拉的列，仅限一级选项 - */ - private void markOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer celIndex, - DataValidationConstraint constraint) { - // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 - CellRangeAddressList addressList = new CellRangeAddressList(1, 1000, celIndex, celIndex); - markDataValidationToSheet(helper, sheet, constraint, addressList); - } - - /** - * 挂载下拉的列，仅限二级选项 - */ - private void markLinkedOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer rowIndex, - Integer celIndex, DataValidationConstraint constraint) { - // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 - CellRangeAddressList addressList = new CellRangeAddressList(rowIndex, rowIndex, celIndex, celIndex); - markDataValidationToSheet(helper, sheet, constraint, addressList); - } - - /** - * 应用数据校验 - */ - private void markDataValidationToSheet(DataValidationHelper helper, Sheet sheet, - DataValidationConstraint constraint, CellRangeAddressList addressList) { - // 数据有效性对象 - DataValidation dataValidation = helper.createValidation(constraint, addressList); - // 处理Excel兼容性问题 - if (dataValidation instanceof XSSFDataValidation) { - //数据校验 - dataValidation.setSuppressDropDownArrow(true); - //错误提示 - dataValidation.setErrorStyle(DataValidation.ErrorStyle.STOP); - dataValidation.createErrorBox("提示", "此值与单元格定义数据不一致"); - dataValidation.setShowErrorBox(true); - //选定提示 - dataValidation.createPromptBox("填写说明：", "填写内容只能为下拉中数据，其他数据将导致导入失败"); - dataValidation.setShowPromptBox(true); - sheet.addValidationData(dataValidation); - } else { - dataValidation.setSuppressDropDownArrow(false); - } - sheet.addValidationData(dataValidation); - } - - /** - *

依据列index获取列名英文

- * 依据列index转换为Excel中的列名英文 - *

例如第1列，index为0，解析出来为A列

- * 第27列，index为26，解析为AA列 - *

第28列，index为27，解析为AB列

- * - * @param columnIndex 列index - * @return 列index所在得英文名 - */ - private String getExcelColumnName(int columnIndex) { - // 26一循环的次数 - int columnCircleCount = columnIndex / 26; - // 26一循环内的位置 - int thisCircleColumnIndex = columnIndex % 26; - // 26一循环的次数大于0，则视为栏名至少两位 - String columnPrefix = columnCircleCount == 0 - ? StrUtil.EMPTY - : StrUtil.subWithLength(EXCEL_COLUMN_NAME, columnCircleCount - 1, 1); - // 从26一循环内取对应的栏位名 - String columnNext = StrUtil.subWithLength(EXCEL_COLUMN_NAME, thisCircleColumnIndex, 1); - // 将二者拼接即为最终的栏位名 - return columnPrefix + columnNext; - } -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java deleted file mode 100644 index 2d0340f..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.common.excel.core; - -import com.alibaba.excel.read.listener.ReadListener; - -/** - * Excel 导入监听 - * - * @author Lion Li - */ -public interface ExcelListener extends ReadListener { - - ExcelResult getExcelResult(); - -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java deleted file mode 100644 index 0c2a418..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.common.excel.core; - -import java.util.List; - -/** - * excel返回对象 - * - * @author Lion Li - */ -public interface ExcelResult { - - /** - * 对象列表 - */ - List getList(); - - /** - * 错误列表 - */ - List getErrorList(); - - /** - * 导入回执 - */ - String getAnalysis(); -} diff --git a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java deleted file mode 100644 index a6c14ad..0000000 --- a/template/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ /dev/null @@ -1,436 +0,0 @@ -package org.dromara.common.excel.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.resource.ClassPathResource; -import cn.hutool.core.util.IdUtil; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; -import com.alibaba.excel.write.metadata.WriteSheet; -import com.alibaba.excel.write.metadata.fill.FillConfig; -import com.alibaba.excel.write.metadata.fill.FillWrapper; -import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.http.HttpServletResponse; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.*; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * Excel相关处理 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ExcelUtil { - - /** - * 同步导入(适用于小数据量) - * - * @param is 输入流 - * @return 转换后集合 - */ - public static List importExcel(InputStream is, Class clazz) { - return EasyExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync(); - } - - - /** - * 使用校验监听器 异步导入 同步返回 - * - * @param is 输入流 - * @param clazz 对象类型 - * @param isValidate 是否 Validator 检验 默认为是 - * @return 转换后集合 - */ - public static ExcelResult importExcel(InputStream is, Class clazz, boolean isValidate) { - DefaultExcelListener listener = new DefaultExcelListener<>(isValidate); - EasyExcel.read(is, clazz, listener).sheet().doRead(); - return listener.getExcelResult(); - } - - /** - * 使用自定义监听器 异步导入 自定义返回 - * - * @param is 输入流 - * @param clazz 对象类型 - * @param listener 自定义监听器 - * @return 转换后集合 - */ - public static ExcelResult importExcel(InputStream is, Class clazz, ExcelListener listener) { - EasyExcel.read(is, clazz, listener).sheet().doRead(); - return listener.getExcelResult(); - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param response 响应体 - */ - public static void exportExcel(List list, String sheetName, Class clazz, HttpServletResponse response) { - try { - resetResponse(sheetName, response); - ServletOutputStream os = response.getOutputStream(); - exportExcel(list, sheetName, clazz, false, os, null); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param response 响应体 - * @param options 级联下拉选 - */ - public static void exportExcel(List list, String sheetName, Class clazz, HttpServletResponse response, List options) { - try { - resetResponse(sheetName, response); - ServletOutputStream os = response.getOutputStream(); - exportExcel(list, sheetName, clazz, false, os, options); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param merge 是否合并单元格 - * @param response 响应体 - */ - public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, HttpServletResponse response) { - try { - resetResponse(sheetName, response); - ServletOutputStream os = response.getOutputStream(); - exportExcel(list, sheetName, clazz, merge, os, null); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param merge 是否合并单元格 - * @param response 响应体 - * @param options 级联下拉选 - */ - public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, HttpServletResponse response, List options) { - try { - resetResponse(sheetName, response); - ServletOutputStream os = response.getOutputStream(); - exportExcel(list, sheetName, clazz, merge, os, options); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param os 输出流 - */ - public static void exportExcel(List list, String sheetName, Class clazz, OutputStream os) { - exportExcel(list, sheetName, clazz, false, os, null); - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param os 输出流 - * @param options 级联下拉选内容 - */ - public static void exportExcel(List list, String sheetName, Class clazz, OutputStream os, List options) { - exportExcel(list, sheetName, clazz, false, os, options); - } - - /** - * 导出excel - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @param clazz 实体类 - * @param merge 是否合并单元格 - * @param os 输出流 - */ - public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, - OutputStream os, List options) { - ExcelWriterSheetBuilder builder = EasyExcel.write(os, clazz) - .autoCloseStream(false) - // 自动适配 - .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .sheet(sheetName); - if (merge) { - // 合并处理器 - builder.registerWriteHandler(new CellMergeStrategy(list, true)); - } - // 添加下拉框操作 - builder.registerWriteHandler(new ExcelDownHandler(options)); - builder.doWrite(list); - } - - /** - * 单表多数据模板导出 模板格式为 {.属性} - * - * @param filename 文件名 - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param response 响应体 - */ - public static void exportTemplate(List data, String filename, String templatePath, HttpServletResponse response) { - try { - resetResponse(filename, response); - ServletOutputStream os = response.getOutputStream(); - exportTemplate(data, templatePath, os); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 单表多数据模板导出 模板格式为 {.属性} - * - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param os 输出流 - */ - public static void exportTemplate(List data, String templatePath, OutputStream os) { - ClassPathResource templateResource = new ClassPathResource(templatePath); - ExcelWriter excelWriter = EasyExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - if (CollUtil.isEmpty(data)) { - throw new IllegalArgumentException("数据为空"); - } - // 单表多数据导出 模板格式为 {.属性} - for (Object d : data) { - excelWriter.fill(d, writeSheet); - } - excelWriter.finish(); - } - - /** - * 多表多数据模板导出 模板格式为 {key.属性} - * - * @param filename 文件名 - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param response 响应体 - */ - public static void exportTemplateMultiList(Map data, String filename, String templatePath, HttpServletResponse response) { - try { - resetResponse(filename, response); - ServletOutputStream os = response.getOutputStream(); - exportTemplateMultiList(data, templatePath, os); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 多sheet模板导出 模板格式为 {key.属性} - * - * @param filename 文件名 - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param response 响应体 - */ - public static void exportTemplateMultiSheet(List> data, String filename, String templatePath, HttpServletResponse response) { - try { - resetResponse(filename, response); - ServletOutputStream os = response.getOutputStream(); - exportTemplateMultiSheet(data, templatePath, os); - } catch (IOException e) { - throw new RuntimeException("导出Excel异常"); - } - } - - /** - * 多表多数据模板导出 模板格式为 {key.属性} - * - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param os 输出流 - */ - public static void exportTemplateMultiList(Map data, String templatePath, OutputStream os) { - ClassPathResource templateResource = new ClassPathResource(templatePath); - ExcelWriter excelWriter = EasyExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - if (CollUtil.isEmpty(data)) { - throw new IllegalArgumentException("数据为空"); - } - for (Map.Entry map : data.entrySet()) { - // 设置列表后续还有数据 - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - if (map.getValue() instanceof Collection) { - // 多表导出必须使用 FillWrapper - excelWriter.fill(new FillWrapper(map.getKey(), (Collection) map.getValue()), fillConfig, writeSheet); - } else { - excelWriter.fill(map.getValue(), writeSheet); - } - } - excelWriter.finish(); - } - - /** - * 多sheet模板导出 模板格式为 {key.属性} - * - * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 - * 例如: excel/temp.xlsx - * 重点: 模板文件必须放置到启动类对应的 resource 目录下 - * @param data 模板需要的数据 - * @param os 输出流 - */ - public static void exportTemplateMultiSheet(List> data, String templatePath, OutputStream os) { - ClassPathResource templateResource = new ClassPathResource(templatePath); - ExcelWriter excelWriter = EasyExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .build(); - if (CollUtil.isEmpty(data)) { - throw new IllegalArgumentException("数据为空"); - } - for (int i = 0; i < data.size(); i++) { - WriteSheet writeSheet = EasyExcel.writerSheet(i).build(); - for (Map.Entry map : data.get(i).entrySet()) { - // 设置列表后续还有数据 - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - if (map.getValue() instanceof Collection) { - // 多表导出必须使用 FillWrapper - excelWriter.fill(new FillWrapper(map.getKey(), (Collection) map.getValue()), fillConfig, writeSheet); - } else { - excelWriter.fill(map.getValue(), writeSheet); - } - } - } - excelWriter.finish(); - } - - /** - * 重置响应体 - */ - private static void resetResponse(String sheetName, HttpServletResponse response) throws UnsupportedEncodingException { - String filename = encodingFilename(sheetName); - FileUtils.setAttachmentResponseHeader(response, filename); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); - } - - /** - * 解析导出值 0=男,1=女,2=未知 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(StringUtils.SEPARATOR); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); - break; - } - } - } else { - if (itemArray[0].equals(propertyValue)) { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 反向解析值 男=0,女=1,未知=2 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(StringUtils.SEPARATOR); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); - break; - } - } - } else { - if (itemArray[1].equals(propertyValue)) { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 编码文件名 - */ - public static String encodingFilename(String filename) { - return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx"; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-idempotent/pom.xml b/template/ruoyi-common/ruoyi-common-idempotent/pom.xml deleted file mode 100644 index 64418b4..0000000 --- a/template/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-idempotent - - - ruoyi-common-idempotent 幂等功能 - - - - - org.dromara - ruoyi-common-json - - - - org.dromara - ruoyi-common-redis - - - - cn.hutool - hutool-crypto - - - - cn.dev33 - sa-token-core - - - - - diff --git a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java deleted file mode 100644 index 42ae802..0000000 --- a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.common.idempotent.annotation; - -import java.lang.annotation.*; -import java.util.concurrent.TimeUnit; - -/** - * 自定义注解防止表单重复提交 - * - * @author Lion Li - */ -@Inherited -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface RepeatSubmit { - - /** - * 间隔时间(ms)，小于此时间视为重复提交 - */ - int interval() default 5000; - - TimeUnit timeUnit() default TimeUnit.MILLISECONDS; - - /** - * 提示消息 支持国际化 格式为 {code} - */ - String message() default "{repeat.submit.message}"; - -} diff --git a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java deleted file mode 100644 index 5a27e91..0000000 --- a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.dromara.common.idempotent.aspectj; - -import cn.dev33.satoken.SaManager; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.crypto.SecureUtil; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; - -import java.time.Duration; -import java.util.Collection; -import java.util.Map; -import java.util.StringJoiner; - -/** - * 防止重复提交(参考美团GTIS防重系统) - * - * @author Lion Li - */ -@Aspect -public class RepeatSubmitAspect { - - private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); - - @Before("@annotation(repeatSubmit)") - public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { - // 如果注解不为0 则使用注解数值 - long interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval()); - - if (interval < 1000) { - throw new ServiceException("重复提交间隔时间不能小于'1'秒"); - } - HttpServletRequest request = ServletUtils.getRequest(); - String nowParams = argsArrayToString(point.getArgs()); - - // 请求地址（作为存放cache的key值） - String url = request.getRequestURI(); - - // 唯一值（没有消息头则使用请求地址） - String submitKey = StringUtils.trimToEmpty(request.getHeader(SaManager.getConfig().getTokenName())); - - submitKey = SecureUtil.md5(submitKey + ":" + nowParams); - // 唯一标识（指定key + url + 消息头） - String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey; - if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) { - KEY_CACHE.set(cacheRepeatKey); - } else { - String message = repeatSubmit.message(); - if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) { - message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1)); - } - throw new ServiceException(message); - } - } - - /** - * 处理完请求后执行 - * - * @param joinPoint 切点 - */ - @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) { - if (jsonResult instanceof R r) { - try { - // 成功则不删除redis数据 保证在有效时间内无法重复提交 - if (r.getCode() == R.SUCCESS) { - return; - } - RedisUtils.deleteObject(KEY_CACHE.get()); - } finally { - KEY_CACHE.remove(); - } - } - } - - /** - * 拦截异常操作 - * - * @param joinPoint 切点 - * @param e 异常 - */ - @AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) { - RedisUtils.deleteObject(KEY_CACHE.get()); - KEY_CACHE.remove(); - } - - /** - * 参数拼装 - */ - private String argsArrayToString(Object[] paramsArray) { - StringJoiner params = new StringJoiner(" "); - if (ArrayUtil.isEmpty(paramsArray)) { - return params.toString(); - } - for (Object o : paramsArray) { - if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { - params.add(JsonUtils.toJsonString(o)); - } - } - return params.toString(); - } - - /** - * 判断是否需要过滤的对象。 - * - * @param o 对象信息。 - * @return 如果是需要过滤的对象，则返回true；否则返回false。 - */ - @SuppressWarnings("rawtypes") - public boolean isFilterObject(final Object o) { - Class clazz = o.getClass(); - if (clazz.isArray()) { - return MultipartFile.class.isAssignableFrom(clazz.getComponentType()); - } else if (Collection.class.isAssignableFrom(clazz)) { - Collection collection = (Collection) o; - for (Object value : collection) { - return value instanceof MultipartFile; - } - } else if (Map.class.isAssignableFrom(clazz)) { - Map map = (Map) o; - for (Object value : map.values()) { - return value instanceof MultipartFile; - } - } - return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse - || o instanceof BindingResult; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java deleted file mode 100644 index fcb9d03..0000000 --- a/template/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.common.idempotent.config; - -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.connection.RedisConfiguration; - -/** - * 幂等功能配置 - * - * @author Lion Li - */ -@AutoConfiguration(after = RedisConfiguration.class) -public class IdempotentConfig { - - @Bean - public RepeatSubmitAspect repeatSubmitAspect() { - return new RepeatSubmitAspect(); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f2fa958..0000000 --- a/template/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.idempotent.config.IdempotentConfig diff --git a/template/ruoyi-common/ruoyi-common-job/pom.xml b/template/ruoyi-common/ruoyi-common-job/pom.xml deleted file mode 100644 index 3a4a0cb..0000000 --- a/template/ruoyi-common/ruoyi-common-job/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-job - - - ruoyi-common-job 定时任务 - - - - - - org.springframework.boot - spring-boot-autoconfigure - - - - - com.aizuda - snail-job-client-starter - - - com.aizuda - snail-job-client-job-core - - - - org.projectlombok - lombok - - - - org.dromara - ruoyi-common-core - - - - diff --git a/template/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/template/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java deleted file mode 100644 index cba3753..0000000 --- a/template/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.common.job.config; - -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.aizuda.snailjob.client.common.appender.SnailLogbackAppender; -import com.aizuda.snailjob.client.common.event.SnailClientStartingEvent; -import com.aizuda.snailjob.client.starter.EnableSnailJob; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * 启动定时任务 - * - * @author opensnail - * @date 2024-05-17 - */ -@AutoConfiguration -@ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true") -@EnableScheduling -@EnableSnailJob -public class SnailJobConfig { - - @EventListener(SnailClientStartingEvent.class) - public void onStarting(SnailClientStartingEvent event) { - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - SnailLogbackAppender ca = new SnailLogbackAppender<>(); - ca.setName("snail_log_appender"); - ca.start(); - Logger rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME); - rootLogger.addAppender(ca); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3aa1881..0000000 --- a/template/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.job.config.SnailJobConfig diff --git a/template/ruoyi-common/ruoyi-common-json/pom.xml b/template/ruoyi-common/ruoyi-common-json/pom.xml deleted file mode 100644 index 870df5c..0000000 --- a/template/ruoyi-common/ruoyi-common-json/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-json - - - ruoyi-common-json 序列化模块 - - - - - org.dromara - ruoyi-common-core - - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - - diff --git a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java deleted file mode 100644 index 8f5a45d..0000000 --- a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.common.json.config; - -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import org.dromara.common.json.handler.BigNumberSerializer; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.context.annotation.Bean; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.TimeZone; - -/** - * jackson 配置 - * - * @author Lion Li - */ -@Slf4j -@AutoConfiguration(before = JacksonAutoConfiguration.class) -public class JacksonConfig { - - @Bean - public Jackson2ObjectMapperBuilderCustomizer customizer() { - return builder -> { - // 全局配置序列化返回 JSON 处理 - JavaTimeModule javaTimeModule = new JavaTimeModule(); - javaTimeModule.addSerializer(Long.class, BigNumberSerializer.INSTANCE); - javaTimeModule.addSerializer(Long.TYPE, BigNumberSerializer.INSTANCE); - javaTimeModule.addSerializer(BigInteger.class, BigNumberSerializer.INSTANCE); - javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter)); - javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter)); - builder.modules(javaTimeModule); - builder.timeZone(TimeZone.getDefault()); - log.info("初始化 jackson 配置"); - }; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java deleted file mode 100644 index f2a7c2d..0000000 --- a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.common.json.handler; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; -import com.fasterxml.jackson.databind.ser.std.NumberSerializer; - -import java.io.IOException; - -/** - * 超出 JS 最大最小值 处理 - * - * @author Lion Li - */ -@JacksonStdImpl -public class BigNumberSerializer extends NumberSerializer { - - /** - * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来 - */ - private static final long MAX_SAFE_INTEGER = 9007199254740991L; - private static final long MIN_SAFE_INTEGER = -9007199254740991L; - - /** - * 提供实例 - */ - public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class); - - public BigNumberSerializer(Class rawType) { - super(rawType); - } - - @Override - public void serialize(Number value, JsonGenerator gen, SerializerProvider provider) throws IOException { - // 超出范围 序列化位字符串 - if (value.longValue() > MIN_SAFE_INTEGER && value.longValue() < MAX_SAFE_INTEGER) { - super.serialize(value, gen, provider); - } else { - gen.writeString(value.toString()); - } - } -} diff --git a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java deleted file mode 100644 index 65c2faa..0000000 --- a/template/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java +++ /dev/null @@ -1,170 +0,0 @@ -package org.dromara.common.json.utils; - -import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -/** - * JSON 工具类 - * - * @author 芋道源码 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class JsonUtils { - - private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class); - - public static ObjectMapper getObjectMapper() { - return OBJECT_MAPPER; - } - - /** - * 将对象转换为JSON格式的字符串 - * - * @param object 要转换的对象 - * @return JSON格式的字符串，如果对象为null，则返回null - * @throws RuntimeException 如果转换过程中发生JSON处理异常，则抛出运行时异常 - */ - public static String toJsonString(Object object) { - if (ObjectUtil.isNull(object)) { - return null; - } - try { - return OBJECT_MAPPER.writeValueAsString(object); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - /** - * 将JSON格式的字符串转换为指定类型的对象 - * - * @param text JSON格式的字符串 - * @param clazz 要转换的目标对象类型 - * @param 目标对象的泛型类型 - * @return 转换后的对象，如果字符串为空则返回null - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static T parseObject(String text, Class clazz) { - if (StringUtils.isEmpty(text)) { - return null; - } - try { - return OBJECT_MAPPER.readValue(text, clazz); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 将字节数组转换为指定类型的对象 - * - * @param bytes 字节数组 - * @param clazz 要转换的目标对象类型 - * @param 目标对象的泛型类型 - * @return 转换后的对象，如果字节数组为空则返回null - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static T parseObject(byte[] bytes, Class clazz) { - if (ArrayUtil.isEmpty(bytes)) { - return null; - } - try { - return OBJECT_MAPPER.readValue(bytes, clazz); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 将JSON格式的字符串转换为指定类型的对象，支持复杂类型 - * - * @param text JSON格式的字符串 - * @param typeReference 指定类型的TypeReference对象 - * @param 目标对象的泛型类型 - * @return 转换后的对象，如果字符串为空则返回null - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static T parseObject(String text, TypeReference typeReference) { - if (StringUtils.isBlank(text)) { - return null; - } - try { - return OBJECT_MAPPER.readValue(text, typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 将JSON格式的字符串转换为Dict对象 - * - * @param text JSON格式的字符串 - * @return 转换后的Dict对象，如果字符串为空或者不是JSON格式则返回null - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static Dict parseMap(String text) { - if (StringUtils.isBlank(text)) { - return null; - } - try { - return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class)); - } catch (MismatchedInputException e) { - // 类型不匹配说明不是json - return null; - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 将JSON格式的字符串转换为Dict对象的列表 - * - * @param text JSON格式的字符串 - * @return 转换后的Dict对象的列表，如果字符串为空则返回null - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static List parseArrayMap(String text) { - if (StringUtils.isBlank(text)) { - return null; - } - try { - return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 将JSON格式的字符串转换为指定类型对象的列表 - * - * @param text JSON格式的字符串 - * @param clazz 要转换的目标对象类型 - * @param 目标对象的泛型类型 - * @return 转换后的对象的列表，如果字符串为空则返回空列表 - * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常 - */ - public static List parseArray(String text, Class clazz) { - if (StringUtils.isEmpty(text)) { - return new ArrayList<>(); - } - try { - return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, clazz)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1625397..0000000 --- a/template/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.json.config.JacksonConfig diff --git a/template/ruoyi-common/ruoyi-common-log/pom.xml b/template/ruoyi-common/ruoyi-common-log/pom.xml deleted file mode 100644 index 1e2b33b..0000000 --- a/template/ruoyi-common/ruoyi-common-log/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-log - - - ruoyi-common-log 日志记录 - - - - - - org.dromara - ruoyi-common-satoken - - - - org.dromara - ruoyi-common-json - - - - - diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java deleted file mode 100644 index 2dced97..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.log.annotation; - -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.log.enums.OperatorType; - -import java.lang.annotation.*; - -/** - * 自定义操作日志记录注解 - * - * @author ruoyi - */ -@Target({ElementType.PARAMETER, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Log { - /** - * 模块 - */ - String title() default ""; - - /** - * 功能 - */ - BusinessType businessType() default BusinessType.OTHER; - - /** - * 操作人类别 - */ - OperatorType operatorType() default OperatorType.MANAGE; - - /** - * 是否保存请求的参数 - */ - boolean isSaveRequestData() default true; - - /** - * 是否保存响应的参数 - */ - boolean isSaveResponseData() default true; - - - /** - * 排除指定的请求参数 - */ - String[] excludeParamNames() default {}; - -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java deleted file mode 100644 index 4c6c1a4..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ /dev/null @@ -1,220 +0,0 @@ -package org.dromara.common.log.aspect; - -import cn.hutool.core.lang.Dict; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.StopWatch; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessStatus; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.satoken.utils.LoginHelper; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.http.HttpMethod; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Collection; -import java.util.Map; -import java.util.StringJoiner; - -/** - * 操作日志记录处理 - * - * @author Lion Li - */ -@Slf4j -@Aspect -@AutoConfiguration -public class LogAspect { - - /** - * 排除敏感属性字段 - */ - public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; - - - /** - * 计时 key - */ - private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); - - /** - * 处理请求前执行 - */ - @Before(value = "@annotation(controllerLog)") - public void doBefore(JoinPoint joinPoint, Log controllerLog) { - StopWatch stopWatch = new StopWatch(); - KEY_CACHE.set(stopWatch); - stopWatch.start(); - } - - /** - * 处理完请求后执行 - * - * @param joinPoint 切点 - */ - @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { - handleLog(joinPoint, controllerLog, null, jsonResult); - } - - /** - * 拦截异常操作 - * - * @param joinPoint 切点 - * @param e 异常 - */ - @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) { - handleLog(joinPoint, controllerLog, e, null); - } - - protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { - try { - - // *========数据库日志=========*// - OperLogEvent operLog = new OperLogEvent(); - operLog.setTenantId(LoginHelper.getTenantId()); - operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); - // 请求的地址 - String ip = ServletUtils.getClientIP(); - operLog.setOperIp(ip); - operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); - LoginUser loginUser = LoginHelper.getLoginUser(); - operLog.setOperName(loginUser.getUsername()); - operLog.setDeptName(loginUser.getDeptName()); - - if (e != null) { - operLog.setStatus(BusinessStatus.FAIL.ordinal()); - operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); - } - // 设置方法名称 - String className = joinPoint.getTarget().getClass().getName(); - String methodName = joinPoint.getSignature().getName(); - operLog.setMethod(className + "." + methodName + "()"); - // 设置请求方式 - operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); - // 处理设置注解上的参数 - getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); - // 设置消耗时间 - StopWatch stopWatch = KEY_CACHE.get(); - stopWatch.stop(); - operLog.setCostTime(stopWatch.getTime()); - // 发布事件保存数据库 - SpringUtils.context().publishEvent(operLog); - } catch (Exception exp) { - // 记录本地异常日志 - log.error("异常信息:{}", exp.getMessage()); - exp.printStackTrace(); - } finally { - KEY_CACHE.remove(); - } - } - - /** - * 获取注解中对方法的描述信息 用于Controller层注解 - * - * @param log 日志 - * @param operLog 操作日志 - * @throws Exception - */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) throws Exception { - // 设置action动作 - operLog.setBusinessType(log.businessType().ordinal()); - // 设置标题 - operLog.setTitle(log.title()); - // 设置操作人类别 - operLog.setOperatorType(log.operatorType().ordinal()); - // 是否需要保存request，参数和值 - if (log.isSaveRequestData()) { - // 获取参数的信息，传入到数据库中。 - setRequestValue(joinPoint, operLog, log.excludeParamNames()); - } - // 是否需要保存response，参数和值 - if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) { - operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000)); - } - } - - /** - * 获取请求的参数，放到log中 - * - * @param operLog 操作日志 - * @throws Exception 异常 - */ - private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception { - Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); - String requestMethod = operLog.getRequestMethod(); - if (MapUtil.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name())) { - String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); - operLog.setOperParam(StringUtils.substring(params, 0, 2000)); - } else { - MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES); - MapUtil.removeAny(paramsMap, excludeParamNames); - operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 2000)); - } - } - - /** - * 参数拼装 - */ - private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) { - StringJoiner params = new StringJoiner(" "); - if (ArrayUtil.isEmpty(paramsArray)) { - return params.toString(); - } - for (Object o : paramsArray) { - if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { - String str = JsonUtils.toJsonString(o); - Dict dict = JsonUtils.parseMap(str); - if (MapUtil.isNotEmpty(dict)) { - MapUtil.removeAny(dict, EXCLUDE_PROPERTIES); - MapUtil.removeAny(dict, excludeParamNames); - str = JsonUtils.toJsonString(dict); - } - params.add(str); - } - } - return params.toString(); - } - - /** - * 判断是否需要过滤的对象。 - * - * @param o 对象信息。 - * @return 如果是需要过滤的对象，则返回true；否则返回false。 - */ - @SuppressWarnings("rawtypes") - public boolean isFilterObject(final Object o) { - Class clazz = o.getClass(); - if (clazz.isArray()) { - return MultipartFile.class.isAssignableFrom(clazz.getComponentType()); - } else if (Collection.class.isAssignableFrom(clazz)) { - Collection collection = (Collection) o; - for (Object value : collection) { - return value instanceof MultipartFile; - } - } else if (Map.class.isAssignableFrom(clazz)) { - Map map = (Map) o; - for (Object value : map.values()) { - return value instanceof MultipartFile; - } - } - return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse - || o instanceof BindingResult; - } -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java deleted file mode 100644 index d303dc3..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 操作状态 - * - * @author ruoyi - */ -public enum BusinessStatus { - /** - * 成功 - */ - SUCCESS, - - /** - * 失败 - */ - FAIL, -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java deleted file mode 100644 index 2d25ebb..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 业务操作类型 - * - * @author ruoyi - */ -public enum BusinessType { - /** - * 其它 - */ - OTHER, - - /** - * 新增 - */ - INSERT, - - /** - * 修改 - */ - UPDATE, - - /** - * 删除 - */ - DELETE, - - /** - * 授权 - */ - GRANT, - - /** - * 导出 - */ - EXPORT, - - /** - * 导入 - */ - IMPORT, - - /** - * 强退 - */ - FORCE, - - /** - * 生成代码 - */ - GENCODE, - - /** - * 清空数据 - */ - CLEAN, -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java deleted file mode 100644 index de9328b..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 操作人类别 - * - * @author ruoyi - */ -public enum OperatorType { - /** - * 其它 - */ - OTHER, - - /** - * 后台用户 - */ - MANAGE, - - /** - * 手机端用户 - */ - MOBILE -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java deleted file mode 100644 index 938eaad..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.common.log.event; - -import lombok.Data; - -import jakarta.servlet.http.HttpServletRequest; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 登录事件 - * - * @author Lion Li - */ - -@Data -public class LogininforEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 用户账号 - */ - private String username; - - /** - * 登录状态 0成功 1失败 - */ - private String status; - - /** - * 提示消息 - */ - private String message; - - /** - * 请求体 - */ - private HttpServletRequest request; - - /** - * 其他参数 - */ - private Object[] args; - -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java deleted file mode 100644 index 0386192..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.common.log.event; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志事件 - * - * @author Lion Li - */ - -@Data -public class OperLogEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - private Long operId; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 操作模块 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 请求方法 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求url - */ - private String operUrl; - - /** - * 操作地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; -} diff --git a/template/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6893020..0000000 --- a/template/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.log.aspect.LogAspect diff --git a/template/ruoyi-common/ruoyi-common-mail/pom.xml b/template/ruoyi-common/ruoyi-common-mail/pom.xml deleted file mode 100644 index c0e1b2e..0000000 --- a/template/ruoyi-common/ruoyi-common-mail/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-mail - - - ruoyi-common-mail 邮件模块 - - - - - org.dromara - ruoyi-common-core - - - - jakarta.mail - jakarta.mail-api - - - org.eclipse.angus - jakarta.mail - - - - diff --git a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java deleted file mode 100644 index 0ea3007..0000000 --- a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.common.mail.config; - -import cn.hutool.extra.mail.MailAccount; -import org.dromara.common.mail.config.properties.MailProperties; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; - -/** - * JavaMail 配置 - * - * @author Michelle.Chung - */ -@AutoConfiguration -@EnableConfigurationProperties(MailProperties.class) -public class MailConfig { - - @Bean - @ConditionalOnProperty(value = "mail.enabled", havingValue = "true") - public MailAccount mailAccount(MailProperties mailProperties) { - MailAccount account = new MailAccount(); - account.setHost(mailProperties.getHost()); - account.setPort(mailProperties.getPort()); - account.setAuth(mailProperties.getAuth()); - account.setFrom(mailProperties.getFrom()); - account.setUser(mailProperties.getUser()); - account.setPass(mailProperties.getPass()); - account.setSocketFactoryPort(mailProperties.getPort()); - account.setStarttlsEnable(mailProperties.getStarttlsEnable()); - account.setSslEnable(mailProperties.getSslEnable()); - account.setTimeout(mailProperties.getTimeout()); - account.setConnectionTimeout(mailProperties.getConnectionTimeout()); - return account; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java deleted file mode 100644 index d0e78a2..0000000 --- a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.dromara.common.mail.config.properties; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * JavaMail 配置属性 - * - * @author Michelle.Chung - */ -@Data -@ConfigurationProperties(prefix = "mail") -public class MailProperties { - - /** - * 过滤开关 - */ - private Boolean enabled; - - /** - * SMTP服务器域名 - */ - private String host; - - /** - * SMTP服务端口 - */ - private Integer port; - - /** - * 是否需要用户名密码验证 - */ - private Boolean auth; - - /** - * 用户名 - */ - private String user; - - /** - * 密码 - */ - private String pass; - - /** - * 发送方，遵循RFC-822标准 - */ - private String from; - - /** - * 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。它将纯文本连接升级为加密连接（TLS或SSL）， 而不是使用一个单独的加密通信端口。 - */ - private Boolean starttlsEnable; - - /** - * 使用 SSL安全连接 - */ - private Boolean sslEnable; - - /** - * SMTP超时时长，单位毫秒，缺省值不超时 - */ - private Long timeout; - - /** - * Socket连接超时值，单位毫秒，缺省值不超时 - */ - private Long connectionTimeout; -} diff --git a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java deleted file mode 100644 index a28701f..0000000 --- a/template/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java +++ /dev/null @@ -1,469 +0,0 @@ -package org.dromara.common.mail.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.mail.JakartaMail; -import cn.hutool.extra.mail.JakartaUserPassAuthenticator; -import cn.hutool.extra.mail.MailAccount; -import jakarta.mail.Authenticator; -import jakarta.mail.Session; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; - -import java.io.File; -import java.io.InputStream; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -/** - * 邮件工具类 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class MailUtils { - - private static final MailAccount ACCOUNT = SpringUtils.getBean(MailAccount.class); - - /** - * 获取邮件发送实例 - */ - public static MailAccount getMailAccount() { - return ACCOUNT; - } - - /** - * 获取邮件发送实例 (自定义发送人以及授权码) - * - * @param user 发送人 - * @param pass 授权码 - */ - public static MailAccount getMailAccount(String from, String user, String pass) { - ACCOUNT.setFrom(StringUtils.blankToDefault(from, ACCOUNT.getFrom())); - ACCOUNT.setUser(StringUtils.blankToDefault(user, ACCOUNT.getUser())); - ACCOUNT.setPass(StringUtils.blankToDefault(pass, ACCOUNT.getPass())); - return ACCOUNT; - } - - /** - * 使用配置文件中设置的账户发送文本邮件，发送给单个或多个收件人
- * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人 - * @param subject 标题 - * @param content 正文 - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String sendText(String to, String subject, String content, File... files) { - return send(to, subject, content, false, files); - } - - /** - * 使用配置文件中设置的账户发送HTML邮件，发送给单个或多个收件人
- * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人 - * @param subject 标题 - * @param content 正文 - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String sendHtml(String to, String subject, String content, File... files) { - return send(to, subject, content, true, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人
- * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - */ - public static String send(String to, String subject, String content, boolean isHtml, File... files) { - return send(splitAddress(to), subject, content, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人
- * 多个收件人、抄送人、密送人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param cc 抄送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param bcc 密送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - * @since 4.0.3 - */ - public static String send(String to, String cc, String bcc, String subject, String content, boolean isHtml, File... files) { - return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送文本邮件，发送给多人 - * - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param files 附件列表 - * @return message-id - */ - public static String sendText(Collection tos, String subject, String content, File... files) { - return send(tos, subject, content, false, files); - } - - /** - * 使用配置文件中设置的账户发送HTML邮件，发送给多人 - * - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String sendHtml(Collection tos, String subject, String content, File... files) { - return send(tos, subject, content, true, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送给多人 - * - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - */ - public static String send(Collection tos, String subject, String content, boolean isHtml, File... files) { - return send(tos, null, null, subject, content, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送给多人 - * - * @param tos 收件人列表 - * @param ccs 抄送人列表，可以为null或空 - * @param bccs 密送人列表，可以为null或空 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - * @since 4.0.3 - */ - public static String send(Collection tos, Collection ccs, Collection bccs, String subject, String content, boolean isHtml, File... files) { - return send(getMailAccount(), true, tos, ccs, bccs, subject, content, null, isHtml, files); - } - - // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件认证对象 - * @param to 收件人，多个收件人逗号或者分号隔开 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String send(MailAccount mailAccount, String to, String subject, String content, boolean isHtml, File... files) { - return send(mailAccount, splitAddress(to), subject, content, isHtml, files); - } - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件帐户信息 - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - */ - public static String send(MailAccount mailAccount, Collection tos, String subject, String content, boolean isHtml, File... files) { - return send(mailAccount, tos, null, null, subject, content, isHtml, files); - } - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件帐户信息 - * @param tos 收件人列表 - * @param ccs 抄送人列表，可以为null或空 - * @param bccs 密送人列表，可以为null或空 - * @param subject 标题 - * @param content 正文 - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 4.0.3 - */ - public static String send(MailAccount mailAccount, Collection tos, Collection ccs, Collection bccs, String subject, String content, boolean isHtml, File... files) { - return send(mailAccount, false, tos, ccs, bccs, subject, content, null, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送HTML邮件，发送给单个或多个收件人
- * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String sendHtml(String to, String subject, String content, Map imageMap, File... files) { - return send(to, subject, content, imageMap, true, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人
- * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - */ - public static String send(String to, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(splitAddress(to), subject, content, imageMap, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人
- * 多个收件人、抄送人、密送人可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * - * @param to 收件人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param cc 抄送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param bcc 密送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - * @since 4.0.3 - */ - public static String send(String to, String cc, String bcc, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, imageMap, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送HTML邮件，发送给多人 - * - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String sendHtml(Collection tos, String subject, String content, Map imageMap, File... files) { - return send(tos, subject, content, imageMap, true, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送给多人 - * - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - */ - public static String send(Collection tos, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(tos, null, null, subject, content, imageMap, isHtml, files); - } - - /** - * 使用配置文件中设置的账户发送邮件，发送给多人 - * - * @param tos 收件人列表 - * @param ccs 抄送人列表，可以为null或空 - * @param bccs 密送人列表，可以为null或空 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML - * @param files 附件列表 - * @return message-id - * @since 4.0.3 - */ - public static String send(Collection tos, Collection ccs, Collection bccs, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(getMailAccount(), true, tos, ccs, bccs, subject, content, imageMap, isHtml, files); - } - - // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件认证对象 - * @param to 收件人，多个收件人逗号或者分号隔开 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 3.2.0 - */ - public static String send(MailAccount mailAccount, String to, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(mailAccount, splitAddress(to), subject, content, imageMap, isHtml, files); - } - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件帐户信息 - * @param tos 收件人列表 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 4.6.3 - */ - public static String send(MailAccount mailAccount, Collection tos, String subject, String content, Map imageMap, boolean isHtml, File... files) { - return send(mailAccount, tos, null, null, subject, content, imageMap, isHtml, files); - } - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件帐户信息 - * @param tos 收件人列表 - * @param ccs 抄送人列表，可以为null或空 - * @param bccs 密送人列表，可以为null或空 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 4.6.3 - */ - public static String send(MailAccount mailAccount, Collection tos, Collection ccs, Collection bccs, String subject, String content, Map imageMap, - boolean isHtml, File... files) { - return send(mailAccount, false, tos, ccs, bccs, subject, content, imageMap, isHtml, files); - } - - /** - * 根据配置文件，获取邮件客户端会话 - * - * @param mailAccount 邮件账户配置 - * @param isSingleton 是否单例（全局共享会话） - * @return {@link Session} - * @since 5.5.7 - */ - public static Session getSession(MailAccount mailAccount, boolean isSingleton) { - Authenticator authenticator = null; - if (mailAccount.isAuth()) { - authenticator = new JakartaUserPassAuthenticator(mailAccount.getUser(), mailAccount.getPass()); - } - - return isSingleton ? Session.getDefaultInstance(mailAccount.getSmtpProps(), authenticator) // - : Session.getInstance(mailAccount.getSmtpProps(), authenticator); - } - - // ------------------------------------------------------------------------------------------------------------------------ Private method start - - /** - * 发送邮件给多人 - * - * @param mailAccount 邮件帐户信息 - * @param useGlobalSession 是否全局共享Session - * @param tos 收件人列表 - * @param ccs 抄送人列表，可以为null或空 - * @param bccs 密送人列表，可以为null或空 - * @param subject 标题 - * @param content 正文 - * @param imageMap 图片与占位符，占位符格式为cid:${cid} - * @param isHtml 是否为HTML格式 - * @param files 附件列表 - * @return message-id - * @since 4.6.3 - */ - private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection tos, Collection ccs, Collection bccs, String subject, String content, - Map imageMap, boolean isHtml, File... files) { - final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession); - - // 可选抄送人 - if (CollUtil.isNotEmpty(ccs)) { - mail.setCcs(ccs.toArray(new String[0])); - } - // 可选密送人 - if (CollUtil.isNotEmpty(bccs)) { - mail.setBccs(bccs.toArray(new String[0])); - } - - mail.setTos(tos.toArray(new String[0])); - mail.setTitle(subject); - mail.setContent(content); - mail.setHtml(isHtml); - mail.setFiles(files); - - // 图片 - if (MapUtil.isNotEmpty(imageMap)) { - for (Entry entry : imageMap.entrySet()) { - mail.addImage(entry.getKey(), entry.getValue()); - // 关闭流 - IoUtil.close(entry.getValue()); - } - } - - return mail.send(); - } - - /** - * 将多个联系人转为列表，分隔符为逗号或者分号 - * - * @param addresses 多个联系人，如果为空返回null - * @return 联系人列表 - */ - private static List splitAddress(String addresses) { - if (StrUtil.isBlank(addresses)) { - return null; - } - - List result; - if (StrUtil.contains(addresses, CharUtil.COMMA)) { - result = StrUtil.splitTrim(addresses, CharUtil.COMMA); - } else if (StrUtil.contains(addresses, ';')) { - result = StrUtil.splitTrim(addresses, ';'); - } else { - result = CollUtil.newArrayList(addresses); - } - return result; - } - // ------------------------------------------------------------------------------------------------------------------------ Private method end -} diff --git a/template/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/template/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ef0cf11..0000000 --- a/template/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.mail.config.MailConfig diff --git a/template/ruoyi-common/ruoyi-common-mybatis/pom.xml b/template/ruoyi-common/ruoyi-common-mybatis/pom.xml deleted file mode 100644 index a58064a..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-mybatis - - - ruoyi-common-mybatis 数据库服务 - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-satoken - - - - - com.baomidou - dynamic-datasource-spring-boot3-starter - - - - com.baomidou - mybatis-plus-spring-boot3-starter - - - - - p6spy - p6spy - - - - diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java deleted file mode 100644 index 2879b9d..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.common.mybatis.annotation; - -import java.lang.annotation.*; - -/** - * 数据权限注解，用于标记数据权限的占位符关键字和替换值 - *

- * 一个注解只能对应一个模板 - *

- * - * @author Lion Li - * @version 3.5.0 - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface DataColumn { - - /** - * 数据权限模板的占位符关键字，默认为 "deptName" - * - * @return 占位符关键字数组 - */ - String[] key() default "deptName"; - - /** - * 数据权限模板的占位符替换值，默认为 "dept_id" - * - * @return 占位符替换值数组 - */ - String[] value() default "dept_id"; - - /** - * 权限标识符 用于通过菜单权限标识符来获取数据权限 - * 拥有此标识符的角色 将不会拼接此角色的数据过滤sql - * - * @return 权限标识符 - */ - String permission() default ""; -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java deleted file mode 100644 index f5f22d5..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.common.mybatis.annotation; - -import java.lang.annotation.*; - -/** - * 数据权限组注解，用于标记数据权限配置数组 - * - * @author Lion Li - * @version 3.5.0 - */ -@Target({ElementType.METHOD, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface DataPermission { - - /** - * 数据权限配置数组，用于指定数据权限的占位符关键字和替换值 - * - * @return 数据权限配置数组 - */ - DataColumn[] value(); - - /** - * 权限拼接标识符(用于指定连接语句的sql符号) - * 如不填 默认 select 用 OR 其他语句用 AND - * 内容 OR 或者 AND - */ - String joinStr() default ""; - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java deleted file mode 100644 index 0bc5b66..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.dromara.common.mybatis.config; - -import cn.hutool.core.net.NetUtil; -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; -import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; -import org.dromara.common.mybatis.handler.MybatisExceptionHandler; -import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.BeansException; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.PropertySource; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * mybatis-plus配置类(下方注释有插件介绍) - * - * @author Lion Li - */ -@EnableTransactionManagement(proxyTargetClass = true) -@MapperScan("${mybatis-plus.mapperPackage}") -@PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class) -public class MybatisPlusConfig { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 多租户插件 必须放到第一位 - try { - TenantLineInnerInterceptor tenant = SpringUtils.getBean(TenantLineInnerInterceptor.class); - interceptor.addInnerInterceptor(tenant); - } catch (BeansException ignore) { - } - // 数据权限处理 - interceptor.addInnerInterceptor(dataPermissionInterceptor()); - // 分页插件 - interceptor.addInnerInterceptor(paginationInnerInterceptor()); - // 乐观锁插件 - interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); - return interceptor; - } - - /** - * 数据权限拦截器 - */ - public PlusDataPermissionInterceptor dataPermissionInterceptor() { - return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage")); - } - - /** - * 分页插件，自动识别数据库类型 - */ - public PaginationInnerInterceptor paginationInnerInterceptor() { - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - // 分页合理化 - paginationInnerInterceptor.setOverflow(true); - return paginationInnerInterceptor; - } - - /** - * 乐观锁插件 - */ - public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() { - return new OptimisticLockerInnerInterceptor(); - } - - /** - * 元对象字段填充控制器 - */ - @Bean - public MetaObjectHandler metaObjectHandler() { - return new InjectionMetaObjectHandler(); - } - - /** - * 使用网卡信息绑定雪花生成器 - * 防止集群雪花ID重复 - */ - @Bean - public IdentifierGenerator idGenerator() { - return new DefaultIdentifierGenerator(NetUtil.getLocalhost()); - } - - /** - * 异常处理器 - */ - @Bean - public MybatisExceptionHandler mybatisExceptionHandler() { - return new MybatisExceptionHandler(); - } - - /** - * PaginationInnerInterceptor 分页插件，自动识别数据库类型 - * https://baomidou.com/pages/97710a/ - * OptimisticLockerInnerInterceptor 乐观锁插件 - * https://baomidou.com/pages/0d93c0/ - * MetaObjectHandler 元对象字段填充控制器 - * https://baomidou.com/pages/4c6bcf/ - * ISqlInjector sql注入器 - * https://baomidou.com/pages/42ea4a/ - * BlockAttackInnerInterceptor 如果是对全表的删除或更新操作，就会终止该操作 - * https://baomidou.com/pages/f9a237/ - * IllegalSQLInnerInterceptor sql性能规范插件(垃圾SQL拦截) - * IdentifierGenerator 自定义主键策略 - * https://baomidou.com/pages/568eb2/ - * TenantLineInnerInterceptor 多租户插件 - * https://baomidou.com/pages/aef2f2/ - * DynamicTableNameInnerInterceptor 动态表名插件 - * https://baomidou.com/pages/2a45ff/ - */ - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java deleted file mode 100644 index 13a7941..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.common.mybatis.core.domain; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * Entity基类 - * - * @author Lion Li - */ -@Data -public class BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 搜索值 - */ - @JsonIgnore - @TableField(exist = false) - private String searchValue; - - /** - * 创建部门 - */ - @TableField(fill = FieldFill.INSERT) - private Long createDept; - - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - private Long createBy; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long updateBy; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - /** - * 请求参数 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @TableField(exist = false) - private Map params = new HashMap<>(); - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java deleted file mode 100644 index 24557ed..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ /dev/null @@ -1,334 +0,0 @@ -package org.dromara.common.mybatis.core.mapper; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.toolkit.Db; -import org.apache.ibatis.logging.Log; -import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; - -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.function.Function; - -/** - * 自定义 Mapper 接口, 实现 自定义扩展 - * - * @param table 泛型 - * @param vo 泛型 - * @author Lion Li - * @since 2021-05-13 - */ -@SuppressWarnings("unchecked") -public interface BaseMapperPlus extends BaseMapper { - - Log log = LogFactory.getLog(BaseMapperPlus.class); - - /** - * 获取当前实例对象关联的泛型类型 V 的 Class 对象 - * - * @return 返回当前实例对象关联的泛型类型 V 的 Class 对象 - */ - default Class currentVoClass() { - return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[1]; - } - - /** - * 获取当前实例对象关联的泛型类型 T 的 Class 对象 - * - * @return 返回当前实例对象关联的泛型类型 T 的 Class 对象 - */ - default Class currentModelClass() { - return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[0]; - } - - /** - * 使用默认的查询条件查询并返回结果列表 - * - * @return 返回查询结果的列表 - */ - default List selectList() { - return this.selectList(new QueryWrapper<>()); - } - - /** - * 批量插入实体对象集合 - * - * @param entityList 实体对象集合 - * @return 插入操作是否成功的布尔值 - */ - default boolean insertBatch(Collection entityList) { - return Db.saveBatch(entityList); - } - - /** - * 批量根据ID更新实体对象集合 - * - * @param entityList 实体对象集合 - * @return 更新操作是否成功的布尔值 - */ - default boolean updateBatchById(Collection entityList) { - return Db.updateBatchById(entityList); - } - - /** - * 批量插入或更新实体对象集合 - * - * @param entityList 实体对象集合 - * @return 插入或更新操作是否成功的布尔值 - */ - default boolean insertOrUpdateBatch(Collection entityList) { - return Db.saveOrUpdateBatch(entityList); - } - - /** - * 批量插入实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 插入操作是否成功的布尔值 - */ - default boolean insertBatch(Collection entityList, int batchSize) { - return Db.saveBatch(entityList, batchSize); - } - - /** - * 批量根据ID更新实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 更新操作是否成功的布尔值 - */ - default boolean updateBatchById(Collection entityList, int batchSize) { - return Db.updateBatchById(entityList, batchSize); - } - - /** - * 批量插入或更新实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 插入或更新操作是否成功的布尔值 - */ - default boolean insertOrUpdateBatch(Collection entityList, int batchSize) { - return Db.saveOrUpdateBatch(entityList, batchSize); - } - - /** - * 根据ID查询单个VO对象 - * - * @param id 主键ID - * @return 查询到的单个VO对象 - */ - default V selectVoById(Serializable id) { - return selectVoById(id, this.currentVoClass()); - } - - /** - * 根据ID查询单个VO对象并将其转换为指定的VO类 - * - * @param id 主键ID - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的单个VO对象，经过转换为指定的VO类后返回 - */ - default C selectVoById(Serializable id, Class voClass) { - T obj = this.selectById(id); - if (ObjectUtil.isNull(obj)) { - return null; - } - return MapstructUtils.convert(obj, voClass); - } - - /** - * 根据ID集合批量查询VO对象列表 - * - * @param idList 主键ID集合 - * @return 查询到的VO对象列表 - */ - default List selectVoByIds(Collection idList) { - return selectVoByIds(idList, this.currentVoClass()); - } - - /** - * 根据ID集合批量查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param idList 主键ID集合 - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 - */ - default List selectVoByIds(Collection idList, Class voClass) { - List list = this.selectByIds(idList); - if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); - } - return MapstructUtils.convert(list, voClass); - } - - /** - * 根据查询条件Map查询VO对象列表 - * - * @param map 查询条件Map - * @return 查询到的VO对象列表 - */ - default List selectVoByMap(Map map) { - return selectVoByMap(map, this.currentVoClass()); - } - - /** - * 根据查询条件Map查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param map 查询条件Map - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 - */ - default List selectVoByMap(Map map, Class voClass) { - List list = this.selectByMap(map); - if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); - } - return MapstructUtils.convert(list, voClass); - } - - /** - * 根据条件查询单个VO对象 - * - * @param wrapper 查询条件Wrapper - * @return 查询到的单个VO对象 - */ - default V selectVoOne(Wrapper wrapper) { - return selectVoOne(wrapper, this.currentVoClass()); - } - - /** - * 根据条件查询单个VO对象，并根据需要决定是否抛出异常 - * - * @param wrapper 查询条件Wrapper - * @param throwEx 是否抛出异常的标志 - * @return 查询到的单个VO对象 - */ - default V selectVoOne(Wrapper wrapper, boolean throwEx) { - return selectVoOne(wrapper, this.currentVoClass(), throwEx); - } - - /** - * 根据条件查询单个VO对象，并指定返回的VO对象的类型 - * - * @param wrapper 查询条件Wrapper - * @param voClass 返回的VO对象的Class对象 - * @param 返回的VO对象的类型 - * @return 查询到的单个VO对象，经过类型转换为指定的VO类后返回 - */ - default C selectVoOne(Wrapper wrapper, Class voClass) { - return selectVoOne(wrapper, voClass, true); - } - - /** - * 根据条件查询单个实体对象，并将其转换为指定的VO对象 - * - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param throwEx 是否抛出异常的标志 - * @param VO类的类型 - * @return 查询到的单个VO对象，经过转换为指定的VO类后返回 - */ - default C selectVoOne(Wrapper wrapper, Class voClass, boolean throwEx) { - T obj = this.selectOne(wrapper, throwEx); - if (ObjectUtil.isNull(obj)) { - return null; - } - return MapstructUtils.convert(obj, voClass); - } - - /** - * 查询所有VO对象列表 - * - * @return 查询到的VO对象列表 - */ - default List selectVoList() { - return selectVoList(new QueryWrapper<>(), this.currentVoClass()); - } - - /** - * 根据条件查询VO对象列表 - * - * @param wrapper 查询条件Wrapper - * @return 查询到的VO对象列表 - */ - default List selectVoList(Wrapper wrapper) { - return selectVoList(wrapper, this.currentVoClass()); - } - - /** - * 根据条件查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 - */ - default List selectVoList(Wrapper wrapper, Class voClass) { - List list = this.selectList(wrapper); - if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); - } - return MapstructUtils.convert(list, voClass); - } - - /** - * 根据条件分页查询VO对象列表 - * - * @param page 分页信息 - * @param wrapper 查询条件Wrapper - * @return 查询到的VO对象分页列表 - */ - default

> P selectVoPage(IPage page, Wrapper wrapper) { - return selectVoPage(page, wrapper, this.currentVoClass()); - } - - /** - * 根据条件分页查询实体对象列表，并将其转换为指定的VO对象分页列表 - * - * @param page 分页信息 - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @param

VO对象分页列表的类型 - * @return 查询到的VO对象分页列表，经过转换为指定的VO类后返回 - */ - default > P selectVoPage(IPage page, Wrapper wrapper, Class voClass) { - // 根据条件分页查询实体对象列表 - List list = this.selectList(page, wrapper); - // 创建一个新的VO对象分页列表，并设置分页信息 - IPage voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); - if (CollUtil.isEmpty(list)) { - return (P) voPage; - } - voPage.setRecords(MapstructUtils.convert(list, voClass)); - return (P) voPage; - } - - /** - * 根据条件查询符合条件的对象，并将其转换为指定类型的对象列表 - * - * @param wrapper 查询条件Wrapper - * @param mapper 转换函数，用于将查询到的对象转换为指定类型的对象 - * @param 要转换的对象的类型 - * @return 查询到的符合条件的对象列表，经过转换为指定类型的对象后返回 - */ - default List selectObjs(Wrapper wrapper, Function mapper) { - return StreamUtils.toList(this.selectObjs(wrapper), mapper); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java deleted file mode 100644 index 6ca9b27..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.dromara.common.mybatis.core.page; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.Data; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.sql.SqlUtil; - -import java.io.Serial; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * 分页查询实体类 - * - * @author Lion Li - */ -@Data -public class PageQuery implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 分页大小 - */ - private Integer pageSize; - - /** - * 当前页数 - */ - private Integer pageNum; - - /** - * 排序列 - */ - private String orderByColumn; - - /** - * 排序的方向desc或者asc - */ - private String isAsc; - - /** - * 当前记录起始索引 默认值 - */ - public static final int DEFAULT_PAGE_NUM = 1; - - /** - * 每页显示记录数 默认值 默认查全部 - */ - public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; - - /** - * 构建分页对象 - */ - public Page build() { - Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM); - Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE); - if (pageNum <= 0) { - pageNum = DEFAULT_PAGE_NUM; - } - Page page = new Page<>(pageNum, pageSize); - List orderItems = buildOrderItem(); - if (CollUtil.isNotEmpty(orderItems)) { - page.addOrder(orderItems); - } - return page; - } - - /** - * 构建排序 - * - * 支持的用法如下: - * {isAsc:"asc",orderByColumn:"id"} order by id asc - * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc - * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc - * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc - */ - private List buildOrderItem() { - if (StringUtils.isBlank(orderByColumn) || StringUtils.isBlank(isAsc)) { - return null; - } - String orderBy = SqlUtil.escapeOrderBySql(orderByColumn); - orderBy = StringUtils.toUnderScoreCase(orderBy); - - // 兼容前端排序类型 - isAsc = StringUtils.replaceEach(isAsc, new String[]{"ascending", "descending"}, new String[]{"asc", "desc"}); - - String[] orderByArr = orderBy.split(StringUtils.SEPARATOR); - String[] isAscArr = isAsc.split(StringUtils.SEPARATOR); - if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) { - throw new ServiceException("排序参数有误"); - } - - List list = new ArrayList<>(); - // 每个字段各自排序 - for (int i = 0; i < orderByArr.length; i++) { - String orderByStr = orderByArr[i]; - String isAscStr = isAscArr.length == 1 ? isAscArr[0] : isAscArr[i]; - if ("asc".equals(isAscStr)) { - list.add(OrderItem.asc(orderByStr)); - } else if ("desc".equals(isAscStr)) { - list.add(OrderItem.desc(orderByStr)); - } else { - throw new ServiceException("排序参数有误"); - } - } - return list; - } - - public Integer getFirstNum() { - return (pageNum - 1) * pageSize; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java deleted file mode 100644 index 8ecfb54..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.dromara.common.mybatis.core.page; - -import cn.hutool.http.HttpStatus; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 表格分页数据对象 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class TableDataInfo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 总记录数 - */ - private long total; - - /** - * 列表数据 - */ - private List rows; - - /** - * 消息状态码 - */ - private int code; - - /** - * 消息内容 - */ - private String msg; - - /** - * 分页 - * - * @param list 列表数据 - * @param total 总记录数 - */ - public TableDataInfo(List list, long total) { - this.rows = list; - this.total = total; - } - - /** - * 根据分页对象构建表格分页数据对象 - */ - public static TableDataInfo build(IPage page) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(page.getRecords()); - rspData.setTotal(page.getTotal()); - return rspData; - } - - /** - * 根据数据列表构建表格分页数据对象 - */ - public static TableDataInfo build(List list) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(list.size()); - return rspData; - } - - /** - * 构建表格分页数据对象 - */ - public static TableDataInfo build() { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - return rspData; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java deleted file mode 100644 index 5084424..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.dromara.common.mybatis.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; - -/** - * 数据库类型 - * - * @author Lion Li - */ -@Getter -@AllArgsConstructor -public enum DataBaseType { - - /** - * MySQL - */ - MY_SQL("MySQL"), - - /** - * Oracle - */ - ORACLE("Oracle"), - - /** - * PostgreSQL - */ - POSTGRE_SQL("PostgreSQL"), - - /** - * SQL Server - */ - SQL_SERVER("Microsoft SQL Server"); - - /** - * 数据库类型 - */ - private final String type; - - /** - * 根据数据库产品名称查找对应的数据库类型 - * - * @param databaseProductName 数据库产品名称 - * @return 对应的数据库类型枚举值，如果未找到则返回 null - */ - public static DataBaseType find(String databaseProductName) { - if (StringUtils.isBlank(databaseProductName)) { - return null; - } - for (DataBaseType type : values()) { - if (type.getType().equals(databaseProductName)) { - return type; - } - } - return null; - } -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java deleted file mode 100644 index 981bd42..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.dromara.common.mybatis.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.helper.DataPermissionHelper; - -/** - * 数据权限类型枚举 - *

- * 支持使用 SpEL 模板表达式定义 SQL 查询条件 - * 内置数据： - * - {@code user}: 当前登录用户信息，参考 {@link LoginUser} - * 内置服务： - * - {@code sdss}: 系统数据权限服务，参考 ISysDataScopeService - * 如需扩展数据，可以通过 {@link DataPermissionHelper} 进行操作 - * 如需扩展服务，可以通过 ISysDataScopeService 自行编写 - *

- * - * @author Lion Li - * @version 3.5.0 - */ -@Getter -@AllArgsConstructor -public enum DataScopeType { - - /** - * 全部数据权限 - */ - ALL("1", "", ""), - - /** - * 自定数据权限 - */ - CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", " 1 = 0 "), - - /** - * 部门数据权限 - */ - DEPT("3", " #{#deptName} = #{#user.deptId} ", " 1 = 0 "), - - /** - * 部门及以下数据权限 - */ - DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", " 1 = 0 "), - - /** - * 仅本人数据权限 - */ - SELF("5", " #{#userName} = #{#user.userId} ", " 1 = 0 "); - - private final String code; - - /** - * SpEL 模板表达式，用于构建 SQL 查询条件 - */ - private final String sqlTemplate; - - /** - * 如果不满足 {@code sqlTemplate} 的条件，则使用此默认 SQL 表达式 - */ - private final String elseSql; - - /** - * 根据枚举代码查找对应的枚举值 - * - * @param code 枚举代码 - * @return 对应的枚举值，如果未找到则返回 null - */ - public static DataScopeType findCode(String code) { - if (StringUtils.isBlank(code)) { - return null; - } - for (DataScopeType type : values()) { - if (type.getCode().equals(code)) { - return type; - } - } - return null; - } -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java deleted file mode 100644 index 7d44d26..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.dromara.common.mybatis.handler; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpStatus; -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.reflection.MetaObject; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.satoken.utils.LoginHelper; - -import java.util.Date; - -/** - * MP注入处理器 - * - * @author Lion Li - * @date 2021/4/25 - */ -@Slf4j -public class InjectionMetaObjectHandler implements MetaObjectHandler { - - /** - * 插入填充方法，用于在插入数据时自动填充实体对象中的创建时间、更新时间、创建人、更新人等信息 - * - * @param metaObject 元对象，用于获取原始对象并进行填充 - */ - @Override - public void insertFill(MetaObject metaObject) { - try { - if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { - // 获取当前时间作为创建时间和更新时间，如果创建时间不为空，则使用创建时间，否则使用当前时间 - Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) - ? baseEntity.getCreateTime() : new Date(); - baseEntity.setCreateTime(current); - baseEntity.setUpdateTime(current); - - // 如果创建人为空，则填充当前登录用户的信息 - if (ObjectUtil.isNull(baseEntity.getCreateBy())) { - LoginUser loginUser = getLoginUser(); - if (ObjectUtil.isNotNull(loginUser)) { - Long userId = loginUser.getUserId(); - // 填充创建人、更新人和创建部门信息 - baseEntity.setCreateBy(userId); - baseEntity.setUpdateBy(userId); - baseEntity.setCreateDept(ObjectUtil.isNotNull(baseEntity.getCreateDept()) - ? baseEntity.getCreateDept() : loginUser.getDeptId()); - } - } - } else { - Date date = new Date(); - this.strictInsertFill(metaObject, "createTime", Date.class, date); - this.strictInsertFill(metaObject, "updateTime", Date.class, date); - } - } catch (Exception e) { - throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); - } - } - - /** - * 更新填充方法，用于在更新数据时自动填充实体对象中的更新时间和更新人信息 - * - * @param metaObject 元对象，用于获取原始对象并进行填充 - */ - @Override - public void updateFill(MetaObject metaObject) { - try { - if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { - // 获取当前时间作为更新时间，无论原始对象中的更新时间是否为空都填充 - Date current = new Date(); - baseEntity.setUpdateTime(current); - - // 获取当前登录用户的ID，并填充更新人信息 - Long userId = LoginHelper.getUserId(); - if (ObjectUtil.isNotNull(userId)) { - baseEntity.setUpdateBy(userId); - } - } else { - this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); - } - } catch (Exception e) { - throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); - } - } - - /** - * 获取当前登录用户信息 - * - * @return 当前登录用户的信息，如果用户未登录则返回 null - */ - private LoginUser getLoginUser() { - LoginUser loginUser; - try { - loginUser = LoginHelper.getLoginUser(); - } catch (Exception e) { - log.warn("自动注入警告 => 用户未登录"); - return null; - } - return loginUser; - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java deleted file mode 100644 index 518d52d..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.common.mybatis.handler; - -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.mybatis.spring.MyBatisSystemException; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -/** - * Mybatis异常处理器 - * - * @author Lion Li - */ -@Slf4j -@RestControllerAdvice -public class MybatisExceptionHandler { - - /** - * 主键或UNIQUE索引，数据重复异常 - */ - @ExceptionHandler(DuplicateKeyException.class) - public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); - return R.fail("数据库中已存在该记录，请联系管理员确认"); - } - - /** - * Mybatis系统异常 通用处理 - */ - @ExceptionHandler(MyBatisSystemException.class) - public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - String message = e.getMessage(); - if (StringUtils.contains("CannotFindDataSourceException", message)) { - log.error("请求地址'{}', 未找到数据源", requestURI); - return R.fail("未找到数据源，请联系管理员确认"); - } - log.error("请求地址'{}', Mybatis系统异常", requestURI, e); - return R.fail(message); - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java deleted file mode 100644 index ab7e0f6..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ /dev/null @@ -1,274 +0,0 @@ -package org.dromara.common.mybatis.handler; - -import cn.hutool.core.annotation.AnnotationUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; -import net.sf.jsqlparser.JSQLParserException; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import org.apache.ibatis.io.Resources; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.enums.DataScopeType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.expression.BeanFactoryResolver; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.ClassMetadata; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.expression.BeanResolver; -import org.springframework.expression.ExpressionParser; -import org.springframework.expression.ParserContext; -import org.springframework.expression.common.TemplateParserContext; -import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.util.ClassUtils; - -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; - -/** - * 数据权限过滤 - * - * @author Lion Li - * @version 3.5.0 - */ -@Slf4j -public class PlusDataPermissionHandler { - - /** - * 方法或类(名称) 与 注解的映射关系缓存 - */ - private final Map dataPermissionCacheMap = new ConcurrentHashMap<>(); - - /** - * spel 解析器 - */ - private final ExpressionParser parser = new SpelExpressionParser(); - private final ParserContext parserContext = new TemplateParserContext(); - /** - * bean解析器 用于处理 spel 表达式中对 bean 的调用 - */ - private final BeanResolver beanResolver = new BeanFactoryResolver(SpringUtils.getBeanFactory()); - - /** - * 构造方法，扫描指定包下的 Mapper 类并初始化缓存 - * - * @param mapperPackage Mapper 类所在的包路径 - */ - public PlusDataPermissionHandler(String mapperPackage) { - scanMapperClasses(mapperPackage); - } - - /** - * 获取数据过滤条件的 SQL 片段 - * - * @param where 原始的查询条件表达式 - * @param mappedStatementId Mapper 方法的 ID - * @param isSelect 是否为查询语句 - * @return 数据过滤条件的 SQL 片段 - */ - public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) { - // 获取数据权限配置 - DataPermission dataPermission = getDataPermission(mappedStatementId); - // 获取当前登录用户信息 - LoginUser currentUser = DataPermissionHelper.getVariable("user"); - if (ObjectUtil.isNull(currentUser)) { - currentUser = LoginHelper.getLoginUser(); - DataPermissionHelper.setVariable("user", currentUser); - } - // 如果是超级管理员或租户管理员，则不过滤数据 - if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) { - return where; - } - // 构造数据过滤条件的 SQL 片段 - String dataFilterSql = buildDataFilter(dataPermission, isSelect); - if (StringUtils.isBlank(dataFilterSql)) { - return where; - } - try { - Expression expression = CCJSqlParserUtil.parseExpression(dataFilterSql); - // 数据权限使用单独的括号 防止与其他条件冲突 - ParenthesedExpressionList parenthesis = new ParenthesedExpressionList<>(expression); - if (ObjectUtil.isNotNull(where)) { - return new AndExpression(where, parenthesis); - } else { - return parenthesis; - } - } catch (JSQLParserException e) { - throw new ServiceException("数据权限解析异常 => " + e.getMessage()); - } - } - - /** - * 构建数据过滤条件的 SQL 语句 - * - * @param dataPermission 数据权限注解 - * @param isSelect 标志当前操作是否为查询操作，查询操作和更新或删除操作在处理过滤条件时会有不同的处理方式 - * @return 构建的数据过滤条件的 SQL 语句 - * @throws ServiceException 如果角色的数据范围异常或者 key 与 value 的长度不匹配，则抛出 ServiceException 异常 - */ - private String buildDataFilter(DataPermission dataPermission, boolean isSelect) { - // 更新或删除需满足所有条件 - String joinStr = isSelect ? " OR " : " AND "; - if (StringUtils.isNotBlank(dataPermission.joinStr())) { - joinStr = " " + dataPermission.joinStr() + " "; - } - LoginUser user = DataPermissionHelper.getVariable("user"); - StandardEvaluationContext context = new StandardEvaluationContext(); - context.setBeanResolver(beanResolver); - DataPermissionHelper.getContext().forEach(context::setVariable); - Set conditions = new HashSet<>(); - for (RoleDTO role : user.getRoles()) { - user.setRoleId(role.getRoleId()); - // 获取角色权限泛型 - DataScopeType type = DataScopeType.findCode(role.getDataScope()); - if (ObjectUtil.isNull(type)) { - throw new ServiceException("角色数据范围异常 => " + role.getDataScope()); - } - // 全部数据权限直接返回 - if (type == DataScopeType.ALL) { - return ""; - } - boolean isSuccess = false; - for (DataColumn dataColumn : dataPermission.value()) { - if (dataColumn.key().length != dataColumn.value().length) { - throw new ServiceException("角色数据范围异常 => key与value长度不匹配"); - } - // 不包含 key 变量 则不处理 - if (!StringUtils.containsAny(type.getSqlTemplate(), - Arrays.stream(dataColumn.key()).map(key -> "#" + key).toArray(String[]::new) - )) { - continue; - } - // 包含权限标识符 这直接跳过 - if (StringUtils.isNotBlank(dataColumn.permission()) && - CollUtil.contains(user.getMenuPermission(), dataColumn.permission()) - ) { - isSuccess = true; - continue; - } - // 设置注解变量 key 为表达式变量 value 为变量值 - for (int i = 0; i < dataColumn.key().length; i++) { - context.setVariable(dataColumn.key()[i], dataColumn.value()[i]); - } - - // 解析sql模板并填充 - String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class); - conditions.add(joinStr + sql); - isSuccess = true; - } - // 未处理成功则填充兜底方案 - if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) { - conditions.add(joinStr + type.getElseSql()); - } - } - - if (CollUtil.isNotEmpty(conditions)) { - String sql = StreamUtils.join(conditions, Function.identity(), ""); - return sql.substring(joinStr.length()); - } - return ""; - } - - /** - * 扫描指定包下的 Mapper 类，并查找其中带有特定注解的方法或类 - * - * @param mapperPackage Mapper 类所在的包路径 - */ - private void scanMapperClasses(String mapperPackage) { - // 创建资源解析器和元数据读取工厂 - PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory(); - // 将 Mapper 包路径按分隔符拆分为数组 - String[] packagePatternArray = StringUtils.splitPreserveAllTokens(mapperPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); - String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX; - try { - for (String packagePattern : packagePatternArray) { - // 将包路径转换为资源路径 - String path = ClassUtils.convertClassNameToResourcePath(packagePattern); - // 获取指定路径下的所有 .class 文件资源 - Resource[] resources = resolver.getResources(classpath + path + "/*.class"); - for (Resource resource : resources) { - // 获取资源的类元数据 - ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata(); - // 获取资源对应的类对象 - Class clazz = Resources.classForName(classMetadata.getClassName()); - // 查找类中的特定注解 - findAnnotation(clazz); - } - } - } catch (Exception e) { - log.error("初始化数据安全缓存时出错:{}", e.getMessage()); - } - } - - /** - * 在指定的类中查找特定的注解 DataPermission，并将带有这个注解的方法或类存储到 dataPermissionCacheMap 中 - * - * @param clazz 要查找的类 - */ - private void findAnnotation(Class clazz) { - DataPermission dataPermission; - for (Method method : clazz.getMethods()) { - if (method.isDefault() || method.isVarArgs()) { - continue; - } - String mappedStatementId = clazz.getName() + "." + method.getName(); - if (AnnotationUtil.hasAnnotation(method, DataPermission.class)) { - dataPermission = AnnotationUtil.getAnnotation(method, DataPermission.class); - dataPermissionCacheMap.put(mappedStatementId, dataPermission); - } - } - if (AnnotationUtil.hasAnnotation(clazz, DataPermission.class)) { - dataPermission = AnnotationUtil.getAnnotation(clazz, DataPermission.class); - dataPermissionCacheMap.put(clazz.getName(), dataPermission); - } - } - - /** - * 根据映射语句 ID 或类名获取对应的 DataPermission 注解对象 - * - * @param mapperId 映射语句 ID - * @return DataPermission 注解对象，如果不存在则返回 null - */ - public DataPermission getDataPermission(String mapperId) { - // 检查缓存中是否包含映射语句 ID 对应的 DataPermission 注解对象 - if (dataPermissionCacheMap.containsKey(mapperId)) { - return dataPermissionCacheMap.get(mapperId); - } - // 如果缓存中不包含映射语句 ID 对应的 DataPermission 注解对象，则尝试使用类名作为键查找 - String clazzName = mapperId.substring(0, mapperId.lastIndexOf(".")); - if (dataPermissionCacheMap.containsKey(clazzName)) { - return dataPermissionCacheMap.get(clazzName); - } - return null; - } - - /** - * 检查给定的映射语句 ID 是否有效，即是否能够找到对应的 DataPermission 注解对象 - * - * @param mapperId 映射语句 ID - * @return 如果找到对应的 DataPermission 注解对象，则返回 false；否则返回 true - */ - public boolean invalid(String mapperId) { - return getDataPermission(mapperId) == null; - } -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java deleted file mode 100644 index cd43c68..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.dromara.common.mybatis.helper; - -import cn.hutool.core.convert.Convert; -import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.enums.DataBaseType; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -/** - * 数据库助手 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class DataBaseHelper { - - private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class); - - /** - * 获取当前数据库类型 - */ - public static DataBaseType getDataBaseType() { - DataSource dataSource = DS.determineDataSource(); - try (Connection conn = dataSource.getConnection()) { - DatabaseMetaData metaData = conn.getMetaData(); - String databaseProductName = metaData.getDatabaseProductName(); - return DataBaseType.find(databaseProductName); - } catch (SQLException e) { - throw new ServiceException(e.getMessage()); - } - } - - public static boolean isMySql() { - return DataBaseType.MY_SQL == getDataBaseType(); - } - - public static boolean isOracle() { - return DataBaseType.ORACLE == getDataBaseType(); - } - - public static boolean isPostgerSql() { - return DataBaseType.POSTGRE_SQL == getDataBaseType(); - } - - public static boolean isSqlServer() { - return DataBaseType.SQL_SERVER == getDataBaseType(); - } - - public static String findInSet(Object var1, String var2) { - DataBaseType dataBasyType = getDataBaseType(); - String var = Convert.toStr(var1); - if (dataBasyType == DataBaseType.SQL_SERVER) { - // charindex(',100,' , ',0,100,101,') <> 0 - return "charindex(',%s,' , ','+%s+',') <> 0".formatted(var, var2); - } else if (dataBasyType == DataBaseType.POSTGRE_SQL) { - // (select strpos(',0,100,101,' , ',100,')) <> 0 - return "(select strpos(','||%s||',' , ',%s,')) <> 0".formatted(var2, var); - } else if (dataBasyType == DataBaseType.ORACLE) { - // instr(',0,100,101,' , ',100,') <> 0 - return "instr(','||%s||',' , ',%s,') <> 0".formatted(var2, var); - } - // find_in_set(100 , '0,100,101') - return "find_in_set('%s' , %s) <> 0".formatted(var, var2); - } - - /** - * 获取当前加载的数据库名 - */ - public static List getDataSourceNameList() { - return new ArrayList<>(DS.getDataSources().keySet()); - } -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java deleted file mode 100644 index 932f173..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.dromara.common.mybatis.helper; - -import cn.dev33.satoken.context.SaHolder; -import cn.dev33.satoken.context.model.SaStorage; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; -import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; - -import java.util.HashMap; -import java.util.Map; -import java.util.Stack; -import java.util.function.Supplier; - -/** - * 数据权限助手 - * - * @author Lion Li - * @version 3.5.0 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@SuppressWarnings("unchecked cast") -public class DataPermissionHelper { - - private static final String DATA_PERMISSION_KEY = "data:permission"; - - private static final ThreadLocal> REENTRANT_IGNORE = ThreadLocal.withInitial(Stack::new); - - /** - * 从上下文中获取指定键的变量值，并将其转换为指定的类型 - * - * @param key 变量的键 - * @param 变量值的类型 - * @return 指定键的变量值，如果不存在则返回 null - */ - public static T getVariable(String key) { - Map context = getContext(); - return (T) context.get(key); - } - - /** - * 向上下文中设置指定键的变量值 - * - * @param key 要设置的变量的键 - * @param value 要设置的变量值 - */ - public static void setVariable(String key, Object value) { - Map context = getContext(); - context.put(key, value); - } - - /** - * 获取数据权限上下文 - * - * @return 存储在SaStorage中的Map对象，用于存储数据权限相关的上下文信息 - * @throws NullPointerException 如果数据权限上下文类型异常，则抛出NullPointerException - */ - public static Map getContext() { - SaStorage saStorage = SaHolder.getStorage(); - Object attribute = saStorage.get(DATA_PERMISSION_KEY); - if (ObjectUtil.isNull(attribute)) { - saStorage.set(DATA_PERMISSION_KEY, new HashMap<>()); - attribute = saStorage.get(DATA_PERMISSION_KEY); - } - if (attribute instanceof Map map) { - return map; - } - throw new NullPointerException("data permission context type exception"); - } - - private static IgnoreStrategy getIgnoreStrategy() { - Object ignoreStrategyLocal = ReflectUtils.getStaticFieldValue(ReflectUtils.getField(InterceptorIgnoreHelper.class, "IGNORE_STRATEGY_LOCAL")); - if (ignoreStrategyLocal instanceof ThreadLocal IGNORE_STRATEGY_LOCAL) { - if (IGNORE_STRATEGY_LOCAL.get() instanceof IgnoreStrategy ignoreStrategy) { - return ignoreStrategy; - } - } - return null; - } - - /** - * 开启忽略数据权限(开启后需手动调用 {@link #disableIgnore()} 关闭) - */ - public static void enableIgnore() { - IgnoreStrategy ignoreStrategy = getIgnoreStrategy(); - if (ObjectUtil.isNull(ignoreStrategy)) { - InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().dataPermission(true).build()); - } else { - ignoreStrategy.setDataPermission(true); - } - Stack reentrantStack = REENTRANT_IGNORE.get(); - reentrantStack.push(reentrantStack.size() + 1); - } - - /** - * 关闭忽略数据权限 - */ - public static void disableIgnore() { - IgnoreStrategy ignoreStrategy = getIgnoreStrategy(); - if (ObjectUtil.isNotNull(ignoreStrategy)) { - boolean noOtherIgnoreStrategy = !Boolean.TRUE.equals(ignoreStrategy.getDynamicTableName()) - && !Boolean.TRUE.equals(ignoreStrategy.getBlockAttack()) - && !Boolean.TRUE.equals(ignoreStrategy.getIllegalSql()) - && !Boolean.TRUE.equals(ignoreStrategy.getTenantLine()) - && CollectionUtil.isEmpty(ignoreStrategy.getOthers()); - Stack reentrantStack = REENTRANT_IGNORE.get(); - boolean empty = reentrantStack.isEmpty() || reentrantStack.pop() == 1; - if (noOtherIgnoreStrategy && empty) { - InterceptorIgnoreHelper.clearIgnoreStrategy(); - } else if (empty) { - ignoreStrategy.setDataPermission(false); - } - - } - } - - /** - * 在忽略数据权限中执行 - * - * @param handle 处理执行方法 - */ - public static void ignore(Runnable handle) { - enableIgnore(); - try { - handle.run(); - } finally { - disableIgnore(); - } - } - - /** - * 在忽略数据权限中执行 - * - * @param handle 处理执行方法 - */ - public static T ignore(Supplier handle) { - enableIgnore(); - try { - return handle.get(); - } finally { - disableIgnore(); - } - } - -} diff --git a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java deleted file mode 100644 index 85a4d0a..0000000 --- a/template/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ /dev/null @@ -1,181 +0,0 @@ -package org.dromara.common.mybatis.interceptor; - -import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; -import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler; -import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import lombok.extern.slf4j.Slf4j; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.schema.Table; -import net.sf.jsqlparser.statement.delete.Delete; -import net.sf.jsqlparser.statement.select.PlainSelect; -import net.sf.jsqlparser.statement.select.Select; -import net.sf.jsqlparser.statement.select.SetOperationList; -import net.sf.jsqlparser.statement.update.Update; -import org.apache.ibatis.executor.Executor; -import org.apache.ibatis.executor.statement.StatementHandler; -import org.apache.ibatis.mapping.BoundSql; -import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.mapping.SqlCommandType; -import org.apache.ibatis.session.ResultHandler; -import org.apache.ibatis.session.RowBounds; -import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.List; - -/** - * 数据权限拦截器 - * - * @author Lion Li - * @version 3.5.0 - */ -@Slf4j -public class PlusDataPermissionInterceptor extends BaseMultiTableInnerInterceptor implements InnerInterceptor { - - private final PlusDataPermissionHandler dataPermissionHandler; - - /** - * 构造函数，初始化 PlusDataPermissionHandler 实例 - * - * @param mapperPackage 扫描的映射器包 - */ - public PlusDataPermissionInterceptor(String mapperPackage) { - this.dataPermissionHandler = new PlusDataPermissionHandler(mapperPackage); - } - - /** - * 在执行查询之前，检查并处理数据权限相关逻辑 - * - * @param executor MyBatis 执行器对象 - * @param ms 映射语句对象 - * @param parameter 方法参数 - * @param rowBounds 分页对象 - * @param resultHandler 结果处理器 - * @param boundSql 绑定的 SQL 对象 - * @throws SQLException 如果发生 SQL 异常 - */ - @Override - public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { - // 检查是否需要忽略数据权限处理 - if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) { - return; - } - // 检查是否缺少有效的数据权限注解 - if (dataPermissionHandler.invalid(ms.getId())) { - return; - } - // 解析 sql 分配对应方法 - PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql); - mpBs.sql(parserSingle(mpBs.sql(), ms.getId())); - } - - /** - * 在准备 SQL 语句之前，检查并处理更新和删除操作的数据权限相关逻辑 - * - * @param sh MyBatis StatementHandler 对象 - * @param connection 数据库连接对象 - * @param transactionTimeout 事务超时时间 - */ - @Override - public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { - PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh); - MappedStatement ms = mpSh.mappedStatement(); - // 获取 SQL 命令类型（增、删、改、查） - SqlCommandType sct = ms.getSqlCommandType(); - - // 只处理更新和删除操作的 SQL 语句 - if (sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) { - if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) { - return; - } - // 检查是否缺少有效的数据权限注解 - if (dataPermissionHandler.invalid(ms.getId())) { - return; - } - PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql(); - mpBs.sql(parserMulti(mpBs.sql(), ms.getId())); - } - } - - /** - * 处理 SELECT 查询语句中的 WHERE 条件 - * - * @param select SELECT 查询对象 - * @param index 查询语句的索引 - * @param sql 查询语句 - * @param obj WHERE 条件参数 - */ - @Override - protected void processSelect(Select select, int index, String sql, Object obj) { - if (select instanceof PlainSelect) { - this.setWhere((PlainSelect) select, (String) obj); - } else if (select instanceof SetOperationList setOperationList) { - List - SELECT * FROM test_demo ${ew.customSqlSegment} - - - diff --git a/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml deleted file mode 100644 index d7975ec..0000000 --- a/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md deleted file mode 100644 index c938b1e..0000000 --- a/template/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md +++ /dev/null @@ -1,3 +0,0 @@ -java包使用 `.` 分割 resource 目录使用 `/` 分割 -
-此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/template/ruoyi-modules/ruoyi-generator/pom.xml b/template/ruoyi-modules/ruoyi-generator/pom.xml deleted file mode 100644 index 4906029..0000000 --- a/template/ruoyi-modules/ruoyi-generator/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-generator - - - generator 代码生成 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-log - - - - - org.apache.velocity - velocity-engine-core - - - - org.anyline - anyline-environment-spring-data-jdbc - ${anyline.version} - - - - org.anyline - anyline-data-jdbc-mysql - ${anyline.version} - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java deleted file mode 100644 index b29f8c9..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.generator.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -/** - * 读取代码生成相关配置 - * - * @author ruoyi - */ -@Component -@ConfigurationProperties(prefix = "gen") -@PropertySource(value = {"classpath:generator.yml"}, encoding = "UTF-8") -public class GenConfig { - - /** - * 作者 - */ - public static String author; - - /** - * 生成包路径 - */ - public static String packageName; - - /** - * 自动去除表前缀，默认是false - */ - public static boolean autoRemovePre; - - /** - * 表前缀(类名不会包含表前缀) - */ - public static String tablePrefix; - - public static String getAuthor() { - return author; - } - - @Value("${author}") - public void setAuthor(String author) { - GenConfig.author = author; - } - - public static String getPackageName() { - return packageName; - } - - @Value("${packageName}") - public void setPackageName(String packageName) { - GenConfig.packageName = packageName; - } - - public static boolean getAutoRemovePre() { - return autoRemovePre; - } - - @Value("${autoRemovePre}") - public void setAutoRemovePre(boolean autoRemovePre) { - GenConfig.autoRemovePre = autoRemovePre; - } - - public static String getTablePrefix() { - return tablePrefix; - } - - @Value("${tablePrefix}") - public void setTablePrefix(String tablePrefix) { - GenConfig.tablePrefix = tablePrefix; - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java deleted file mode 100644 index 8c0f352..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.generator.config; - -import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import lombok.extern.slf4j.Slf4j; -import org.anyline.data.datasource.DataSourceMonitor; -import org.anyline.data.runtime.DataRuntime; -import org.anyline.util.ConfigTable; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.datasource.DataSourceUtils; -import org.springframework.stereotype.Component; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.util.HashMap; -import java.util.Map; - -/** - * anyline 适配 动态数据源改造 - * - * @author Lion Li - */ -@Slf4j -@Component -public class MyBatisDataSourceMonitor implements DataSourceMonitor { - - public MyBatisDataSourceMonitor() { - // 调整执行模式为自定义 - ConfigTable.KEEP_ADAPTER = 2; - // 禁用缓存 - ConfigTable.METADATA_CACHE_SCOPE = 0; - } - - private final Map features = new HashMap<>(); - - /** - * 数据源特征 用来定准 adapter 包含数据库或JDBC协议关键字
- * 一般会通过 产品名_url 合成 如果返回null 上层方法会通过driver_产品名_url合成 - * - * @param datasource 数据源 - * @return String 返回null由上层自动提取 - */ - @Override - public String feature(DataRuntime runtime, Object datasource) { - String feature = null; - if (datasource instanceof JdbcTemplate jdbc) { - DataSource ds = jdbc.getDataSource(); - if (ds instanceof DynamicRoutingDataSource) { - String key = DynamicDataSourceContextHolder.peek(); - feature = features.get(key); - if (null == feature) { - Connection con = null; - try { - con = DataSourceUtils.getConnection(ds); - DatabaseMetaData meta = con.getMetaData(); - String url = meta.getURL(); - feature = meta.getDatabaseProductName().toLowerCase().replace(" ", "") + "_" + url; - features.put(key, feature); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - if (null != con && !DataSourceUtils.isConnectionTransactional(con, ds)) { - DataSourceUtils.releaseConnection(con, ds); - } - } - } - } - } - return feature; - } - - /** - * 数据源唯一标识 如果不实现则默认feature - * @param datasource 数据源 - * @return String 返回null由上层自动提取 - */ - @Override - public String key(DataRuntime runtime, Object datasource) { - if(datasource instanceof JdbcTemplate jdbc){ - DataSource ds = jdbc.getDataSource(); - if(ds instanceof DynamicRoutingDataSource){ - return DynamicDataSourceContextHolder.peek(); - } - } - return runtime.getKey(); - } - - /** - * ConfigTable.KEEP_ADAPTER=2 : 根据当前接口判断是否保持同一个数据源绑定同一个adapter
- * DynamicRoutingDataSource类型的返回false,因为同一个DynamicRoutingDataSource可能对应多类数据库, 如果项目中只有一种数据库 应该直接返回true - * - * @param datasource 数据源 - * @return boolean - */ - @Override - public boolean keepAdapter(DataRuntime runtime, Object datasource) { - if (datasource instanceof JdbcTemplate jdbc) { - DataSource ds = jdbc.getDataSource(); - return !(ds instanceof DynamicRoutingDataSource); - } - return true; - } - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java deleted file mode 100644 index b9888fb..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ /dev/null @@ -1,186 +0,0 @@ -package org.dromara.generator.constant; - -/** - * 代码生成通用常量 - * - * @author ruoyi - */ -public interface GenConstants { - /** - * 单表（增删改查） - */ - String TPL_CRUD = "crud"; - - /** - * 树表（增删改查） - */ - String TPL_TREE = "tree"; - - /** - * 树编码字段 - */ - String TREE_CODE = "treeCode"; - - /** - * 树父编码字段 - */ - String TREE_PARENT_CODE = "treeParentCode"; - - /** - * 树名称字段 - */ - String TREE_NAME = "treeName"; - - /** - * 上级菜单ID字段 - */ - String PARENT_MENU_ID = "parentMenuId"; - - /** - * 上级菜单名称字段 - */ - String PARENT_MENU_NAME = "parentMenuName"; - - /** - * 数据库字符串类型 - */ - String[] COLUMNTYPE_STR = {"char", "varchar", "enum", "set", "nchar", "nvarchar", "varchar2", "nvarchar2"}; - - /** - * 数据库文本类型 - */ - String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext", "binary", "varbinary", "blob", - "ntext", "image", "bytea"}; - - /** - * 数据库时间类型 - */ - String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp", "year", "interval", - "smalldatetime", "datetime2", "datetimeoffset", "timestamptz"}; - - /** - * 数据库数字类型 - */ - String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "int2", "int4", "int8", "number", "integer", - "bit", "bigint", "float", "float4", "float8", "double", "decimal", "numeric", "real", "double precision", - "smallserial", "serial", "bigserial", "money", "smallmoney"}; - - /** - * BO对象 不需要添加字段 - */ - String[] COLUMNNAME_NOT_ADD = {"create_dept", "create_by", "create_time", "del_flag", "update_by", - "update_time", "version", "tenant_id"}; - - /** - * BO对象 不需要编辑字段 - */ - String[] COLUMNNAME_NOT_EDIT = {"create_dept", "create_by", "create_time", "del_flag", "update_by", - "update_time", "version", "tenant_id"}; - - /** - * VO对象 不需要返回字段 - */ - String[] COLUMNNAME_NOT_LIST = {"create_dept", "create_by", "create_time", "del_flag", "update_by", - "update_time", "version", "tenant_id"}; - - /** - * BO对象 不需要查询字段 - */ - String[] COLUMNNAME_NOT_QUERY = {"id", "create_dept", "create_by", "create_time", "del_flag", "update_by", - "update_time", "remark", "version", "tenant_id"}; - - /** - * Entity基类字段 - */ - String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime", "tenantId"}; - - /** - * 文本框 - */ - String HTML_INPUT = "input"; - - /** - * 文本域 - */ - String HTML_TEXTAREA = "textarea"; - - /** - * 下拉框 - */ - String HTML_SELECT = "select"; - - /** - * 单选框 - */ - String HTML_RADIO = "radio"; - - /** - * 复选框 - */ - String HTML_CHECKBOX = "checkbox"; - - /** - * 日期控件 - */ - String HTML_DATETIME = "datetime"; - - /** - * 图片上传控件 - */ - String HTML_IMAGE_UPLOAD = "imageUpload"; - - /** - * 文件上传控件 - */ - String HTML_FILE_UPLOAD = "fileUpload"; - - /** - * 富文本控件 - */ - String HTML_EDITOR = "editor"; - - /** - * 字符串类型 - */ - String TYPE_STRING = "String"; - - /** - * 整型 - */ - String TYPE_INTEGER = "Integer"; - - /** - * 长整型 - */ - String TYPE_LONG = "Long"; - - /** - * 浮点型 - */ - String TYPE_DOUBLE = "Double"; - - /** - * 高精度计算类型 - */ - String TYPE_BIGDECIMAL = "BigDecimal"; - - /** - * 时间类型 - */ - String TYPE_DATE = "Date"; - - /** - * 模糊查询 - */ - String QUERY_LIKE = "LIKE"; - - /** - * 相等查询 - */ - String QUERY_EQ = "EQ"; - - /** - * 需要 - */ - String REQUIRE = "1"; -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java deleted file mode 100644 index e3d4c08..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ /dev/null @@ -1,217 +0,0 @@ -package org.dromara.generator.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.service.IGenTableService; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 代码生成 操作处理 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/tool/gen") -public class GenController extends BaseController { - - private final IGenTableService genTableService; - - /** - * 查询代码生成列表 - */ - @SaCheckPermission("tool:gen:list") - @GetMapping("/list") - public TableDataInfo genList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageGenTableList(genTable, pageQuery); - } - - /** - * 修改代码生成业务 - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:query") - @GetMapping(value = "/{tableId}") - public R> getInfo(@PathVariable Long tableId) { - GenTable table = genTableService.selectGenTableById(tableId); - List tables = genTableService.selectGenTableAll(); - List list = genTableService.selectGenTableColumnListByTableId(tableId); - Map map = new HashMap<>(3); - map.put("info", table); - map.put("rows", list); - map.put("tables", tables); - return R.ok(map); - } - - /** - * 查询数据库列表 - */ - @SaCheckPermission("tool:gen:list") - @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageDbTableList(genTable, pageQuery); - } - - /** - * 查询数据表字段列表 - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:list") - @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(@PathVariable("tableId") Long tableId) { - TableDataInfo dataInfo = new TableDataInfo<>(); - List list = genTableService.selectGenTableColumnListByTableId(tableId); - dataInfo.setRows(list); - dataInfo.setTotal(list.size()); - return dataInfo; - } - - /** - * 导入表结构（保存） - * - * @param tables 表名串 - */ - @SaCheckPermission("tool:gen:import") - @Log(title = "代码生成", businessType = BusinessType.IMPORT) - @PostMapping("/importTable") - public R importTableSave(String tables, String dataName) { - String[] tableNames = Convert.toStrArray(tables); - // 查询表信息 - List tableList = genTableService.selectDbTableListByNames(tableNames, dataName); - genTableService.importGenTable(tableList, dataName); - return R.ok(); - } - - /** - * 修改保存代码生成业务 - */ - @SaCheckPermission("tool:gen:edit") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @PutMapping - public R editSave(@Validated @RequestBody GenTable genTable) { - genTableService.validateEdit(genTable); - genTableService.updateGenTable(genTable); - return R.ok(); - } - - /** - * 删除代码生成 - * - * @param tableIds 表ID串 - */ - @SaCheckPermission("tool:gen:remove") - @Log(title = "代码生成", businessType = BusinessType.DELETE) - @DeleteMapping("/{tableIds}") - public R remove(@PathVariable Long[] tableIds) { - genTableService.deleteGenTableByIds(tableIds); - return R.ok(); - } - - /** - * 预览代码 - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:preview") - @GetMapping("/preview/{tableId}") - public R> preview(@PathVariable("tableId") Long tableId) throws IOException { - Map dataMap = genTableService.previewCode(tableId); - return R.ok(dataMap); - } - - /** - * 生成代码（下载方式） - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/download/{tableId}") - public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException { - byte[] data = genTableService.downloadCode(tableId); - genCode(response, data); - } - - /** - * 生成代码（自定义路径） - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/genCode/{tableId}") - public R genCode(@PathVariable("tableId") Long tableId) { - genTableService.generatorCode(tableId); - return R.ok(); - } - - /** - * 同步数据库 - * - * @param tableId 表ID - */ - @SaCheckPermission("tool:gen:edit") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @GetMapping("/synchDb/{tableId}") - public R synchDb(@PathVariable("tableId") Long tableId) { - genTableService.synchDb(tableId); - return R.ok(); - } - - /** - * 批量生成代码 - * - * @param tableIdStr 表ID串 - */ - @SaCheckPermission("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tableIdStr) throws IOException { - String[] tableIds = Convert.toStrArray(tableIdStr); - byte[] data = genTableService.downloadCode(tableIds); - genCode(response, data); - } - - /** - * 生成zip文件 - */ - private void genCode(HttpServletResponse response, byte[] data) throws IOException { - response.reset(); - response.addHeader("Access-Control-Allow-Origin", "*"); - response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - IoUtil.write(response.getOutputStream(), false, data); - } - - /** - * 查询数据源名称列表 - */ - @SaCheckPermission("tool:gen:list") - @GetMapping(value = "/getDataNames") - public R getCurrentDataSourceNameList(){ - return R.ok(DataBaseHelper.getDataSourceNameList()); - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java deleted file mode 100644 index f2d7257..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ /dev/null @@ -1,196 +0,0 @@ -package org.dromara.generator.domain; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.generator.constant.GenConstants; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * 业务表 gen_table - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("gen_table") -public class GenTable extends BaseEntity { - - /** - * 编号 - */ - @TableId(value = "table_id") - private Long tableId; - - /** - * 数据源名称 - */ - @NotBlank(message = "数据源名称不能为空") - private String dataName; - - /** - * 表名称 - */ - @NotBlank(message = "表名称不能为空") - private String tableName; - - /** - * 表描述 - */ - @NotBlank(message = "表描述不能为空") - private String tableComment; - - /** - * 关联父表的表名 - */ - private String subTableName; - - /** - * 本表关联父表的外键名 - */ - private String subTableFkName; - - /** - * 实体类名称(首字母大写) - */ - @NotBlank(message = "实体类名称不能为空") - private String className; - - /** - * 使用的模板（crud单表操作 tree树表操作 sub主子表操作） - */ - private String tplCategory; - - /** - * 生成包路径 - */ - @NotBlank(message = "生成包路径不能为空") - private String packageName; - - /** - * 生成模块名 - */ - @NotBlank(message = "生成模块名不能为空") - private String moduleName; - - /** - * 生成业务名 - */ - @NotBlank(message = "生成业务名不能为空") - private String businessName; - - /** - * 生成功能名 - */ - @NotBlank(message = "生成功能名不能为空") - private String functionName; - - /** - * 生成作者 - */ - @NotBlank(message = "作者不能为空") - private String functionAuthor; - - /** - * 生成代码方式（0zip压缩包 1自定义路径） - */ - private String genType; - - /** - * 生成路径（不填默认项目路径） - */ - @TableField(updateStrategy = FieldStrategy.NOT_EMPTY) - private String genPath; - - /** - * 主键信息 - */ - @TableField(exist = false) - private GenTableColumn pkColumn; - - /** - * 表列信息 - */ - @Valid - @TableField(exist = false) - private List columns; - - /** - * 其它生成选项 - */ - private String options; - - /** - * 备注 - */ - private String remark; - - /** - * 树编码字段 - */ - @TableField(exist = false) - private String treeCode; - - /** - * 树父编码字段 - */ - @TableField(exist = false) - private String treeParentCode; - - /** - * 树名称字段 - */ - @TableField(exist = false) - private String treeName; - - /* - * 菜单id列表 - */ - @TableField(exist = false) - private List menuIds; - - /** - * 上级菜单ID字段 - */ - @TableField(exist = false) - private Long parentMenuId; - - /** - * 上级菜单名称字段 - */ - @TableField(exist = false) - private String parentMenuName; - - public boolean isTree() { - return isTree(this.tplCategory); - } - - public static boolean isTree(String tplCategory) { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); - } - - public boolean isCrud() { - return isCrud(this.tplCategory); - } - - public static boolean isCrud(String tplCategory) { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); - } - - public boolean isSuperColumn(String javaField) { - return isSuperColumn(this.tplCategory, javaField); - } - - public static boolean isSuperColumn(String tplCategory, String javaField) { - return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java deleted file mode 100644 index e1560b4..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java +++ /dev/null @@ -1,222 +0,0 @@ -package org.dromara.generator.domain; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.ibatis.type.JdbcType; - -import jakarta.validation.constraints.NotBlank; - -/** - * 代码生成业务字段表 gen_table_column - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("gen_table_column") -public class GenTableColumn extends BaseEntity { - - /** - * 编号 - */ - @TableId(value = "column_id") - private Long columnId; - - /** - * 归属表编号 - */ - private Long tableId; - - /** - * 列名称 - */ - private String columnName; - - /** - * 列描述 - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String columnComment; - - /** - * 列类型 - */ - private String columnType; - - /** - * JAVA类型 - */ - private String javaType; - - /** - * JAVA字段名 - */ - @NotBlank(message = "Java属性不能为空") - private String javaField; - - /** - * 是否主键（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isPk; - - /** - * 是否自增（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isIncrement; - - /** - * 是否必填（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isRequired; - - /** - * 是否为插入字段（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isInsert; - - /** - * 是否编辑字段（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isEdit; - - /** - * 是否列表字段（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isList; - - /** - * 是否查询字段（1是） - */ - @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) - private String isQuery; - - /** - * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） - */ - private String queryType; - - /** - * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） - */ - private String htmlType; - - /** - * 字典类型 - */ - private String dictType; - - /** - * 排序 - */ - private Integer sort; - - public String getCapJavaField() { - return StringUtils.capitalize(javaField); - } - - public boolean isPk() { - return isPk(this.isPk); - } - - public boolean isPk(String isPk) { - return isPk != null && StringUtils.equals("1", isPk); - } - - public boolean isIncrement() { - return isIncrement(this.isIncrement); - } - - public boolean isIncrement(String isIncrement) { - return isIncrement != null && StringUtils.equals("1", isIncrement); - } - - public boolean isRequired() { - return isRequired(this.isRequired); - } - - public boolean isRequired(String isRequired) { - return isRequired != null && StringUtils.equals("1", isRequired); - } - - public boolean isInsert() { - return isInsert(this.isInsert); - } - - public boolean isInsert(String isInsert) { - return isInsert != null && StringUtils.equals("1", isInsert); - } - - public boolean isEdit() { - return isInsert(this.isEdit); - } - - public boolean isEdit(String isEdit) { - return isEdit != null && StringUtils.equals("1", isEdit); - } - - public boolean isList() { - return isList(this.isList); - } - - public boolean isList(String isList) { - return isList != null && StringUtils.equals("1", isList); - } - - public boolean isQuery() { - return isQuery(this.isQuery); - } - - public boolean isQuery(String isQuery) { - return isQuery != null && StringUtils.equals("1", isQuery); - } - - public boolean isSuperColumn() { - return isSuperColumn(this.javaField); - } - - public static boolean isSuperColumn(String javaField) { - return StringUtils.equalsAnyIgnoreCase(javaField, - // BaseEntity - "createBy", "createTime", "updateBy", "updateTime", - // TreeEntity - "parentName", "parentId"); - } - - public boolean isUsableColumn() { - return isUsableColumn(javaField); - } - - public static boolean isUsableColumn(String javaField) { - // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 - return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); - } - - public String readConverterExp() { - String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); - StringBuffer sb = new StringBuffer(); - if (StringUtils.isNotEmpty(remarks)) { - for (String value : remarks.split(" ")) { - if (StringUtils.isNotEmpty(value)) { - Object startStr = value.subSequence(0, 1); - String endStr = value.substring(1); - sb.append(StringUtils.EMPTY).append(startStr).append("=").append(endStr).append(StringUtils.SEPARATOR); - } - } - return sb.deleteCharAt(sb.length() - 1).toString(); - } else { - return this.columnComment; - } - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java deleted file mode 100644 index ed8ed20..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.generator.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTableColumn; - -/** - * 业务字段 数据层 - * - * @author Lion Li - */ -@InterceptorIgnore(dataPermission = "true", tenantLine = "true") -public interface GenTableColumnMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java deleted file mode 100644 index 1798b4b..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.generator.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTable; - -import java.util.List; - -/** - * 业务 数据层 - * - * @author Lion Li - */ -@InterceptorIgnore(dataPermission = "true", tenantLine = "true") -public interface GenTableMapper extends BaseMapperPlus { - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - List selectGenTableAll(); - - /** - * 查询表ID业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - GenTable selectGenTableById(Long id); - - /** - * 查询表名称业务信息 - * - * @param tableName 表名称 - * @return 业务信息 - */ - GenTable selectGenTableByName(String tableName); - - /** - * 查询指定数据源下的所有表名列表 - * - * @param dataName 数据源名称，用于选择不同的数据源 - * @return 当前数据库中的表名列表 - * - * @DS("") 使用默认数据源执行查询操作 - */ - @DS("") - List selectTableNameList(String dataName); -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java deleted file mode 100644 index bb8b444..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ /dev/null @@ -1,587 +0,0 @@ -package org.dromara.generator.service; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.dynamic.datasource.annotation.DSTransactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.anyline.metadata.Column; -import org.anyline.metadata.Table; -import org.anyline.proxy.ServiceProxy; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.mapper.GenTableColumnMapper; -import org.dromara.generator.mapper.GenTableMapper; -import org.dromara.generator.util.GenUtils; -import org.dromara.generator.util.VelocityInitializer; -import org.dromara.generator.util.VelocityUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * 业务 服务层实现 - * - * @author Lion Li - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class GenTableServiceImpl implements IGenTableService { - - private final GenTableMapper baseMapper; - private final GenTableColumnMapper genTableColumnMapper; - private final IdentifierGenerator identifierGenerator; - - private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"}; - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - @Override - public List selectGenTableColumnListByTableId(Long tableId) { - return genTableColumnMapper.selectList(new LambdaQueryWrapper() - .eq(GenTableColumn::getTableId, tableId) - .orderByAsc(GenTableColumn::getSort)); - } - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - @Override - public GenTable selectGenTableById(Long id) { - GenTable genTable = baseMapper.selectGenTableById(id); - setTableFromOptions(genTable); - return genTable; - } - - @Override - public TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { - Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); - return TableDataInfo.build(page); - } - - private QueryWrapper buildGenTableQueryWrapper(GenTable genTable) { - Map params = genTable.getParams(); - QueryWrapper wrapper = Wrappers.query(); - wrapper - .eq(StringUtils.isNotEmpty(genTable.getDataName()), "data_name", genTable.getDataName()) - .like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName())) - .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment())) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "create_time", params.get("beginTime"), params.get("endTime")); - return wrapper; - } - - /** - * 查询数据库列表 - * - * @param genTable 包含查询条件的GenTable对象 - * @param pageQuery 包含分页信息的PageQuery对象 - * @return 包含分页结果的TableDataInfo对象 - */ - @DS("#genTable.dataName") - @Override - public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) { - // 获取查询条件 - String tableName = genTable.getTableName(); - String tableComment = genTable.getTableComment(); - - LinkedHashMap> tablesMap = ServiceProxy.metadata().tables(); - if (CollUtil.isEmpty(tablesMap)) { - return TableDataInfo.build(); - } - List tableNames = baseMapper.selectTableNameList(genTable.getDataName()); - String[] tableArrays; - if (CollUtil.isNotEmpty(tableNames)) { - tableArrays = tableNames.toArray(new String[0]); - } else { - tableArrays = new String[0]; - } - // 过滤并转换表格数据 - List tables = tablesMap.values().stream() - .filter(x -> !startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE)) - .filter(x -> { - if (CollUtil.isEmpty(tableNames)) { - return true; - } - return !StringUtils.equalsAnyIgnoreCase(x.getName(), tableArrays); - }) - .filter(x -> { - boolean nameMatches = true; - boolean commentMatches = true; - // 进行表名称的模糊查询 - if (StringUtils.isNotBlank(tableName)) { - nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName); - } - // 进行表描述的模糊查询 - if (StringUtils.isNotBlank(tableComment)) { - commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment); - } - // 同时匹配名称和描述 - return nameMatches && commentMatches; - }) - .map(x -> { - GenTable gen = new GenTable(); - gen.setTableName(x.getName()); - gen.setTableComment(x.getComment()); - gen.setCreateTime(x.getCreateTime()); - gen.setUpdateTime(x.getUpdateTime()); - return gen; - }).toList(); - - IPage page = pageQuery.build(); - page.setTotal(tables.size()); - // 手动分页 set数据 - page.setRecords(CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables)); - return TableDataInfo.build(page); - } - - public static boolean startWithAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { - // 判断是否是以指定字符串开头 - for (CharSequence searchCharSequence : searchCharSequences) { - if (StringUtils.startsWithIgnoreCase(cs, searchCharSequence)) { - return true; - } - } - return false; - } - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @param dataName 数据源名称 - * @return 数据库表集合 - */ - @DS("#dataName") - @Override - public List selectDbTableListByNames(String[] tableNames, String dataName) { - Set tableNameSet = new HashSet<>(List.of(tableNames)); - LinkedHashMap> tablesMap = ServiceProxy.metadata().tables(); - - if (CollUtil.isEmpty(tablesMap)) { - return new ArrayList<>(); - } - - List> tableList = tablesMap.values().stream() - .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE)) - .filter(x -> tableNameSet.contains(x.getName())).toList(); - - if (CollUtil.isEmpty(tableList)) { - return new ArrayList<>(); - } - return tableList.stream().map(x -> { - GenTable gen = new GenTable(); - gen.setDataName(dataName); - gen.setTableName(x.getName()); - gen.setTableComment(x.getComment()); - gen.setCreateTime(x.getCreateTime()); - gen.setUpdateTime(x.getUpdateTime()); - return gen; - }).toList(); - } - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - @Override - public List selectGenTableAll() { - return baseMapper.selectGenTableAll(); - } - - /** - * 修改业务 - * - * @param genTable 业务信息 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenTable(GenTable genTable) { - String options = JsonUtils.toJsonString(genTable.getParams()); - genTable.setOptions(options); - int row = baseMapper.updateById(genTable); - if (row > 0) { - for (GenTableColumn cenTableColumn : genTable.getColumns()) { - genTableColumnMapper.updateById(cenTableColumn); - } - } - } - - /** - * 删除业务对象 - * - * @param tableIds 需要删除的数据ID - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteGenTableByIds(Long[] tableIds) { - List ids = Arrays.asList(tableIds); - baseMapper.deleteByIds(ids); - genTableColumnMapper.delete(new LambdaQueryWrapper().in(GenTableColumn::getTableId, ids)); - } - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - * @param dataName 数据源名称 - */ - @DSTransactional - @Override - public void importGenTable(List tableList, String dataName) { - Long operId = LoginHelper.getUserId(); - try { - for (GenTable table : tableList) { - String tableName = table.getTableName(); - GenUtils.initTable(table, operId); - table.setDataName(dataName); - int row = baseMapper.insert(table); - if (row > 0) { - // 保存列信息 - List genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName); - List saveColumns = new ArrayList<>(); - for (GenTableColumn column : genTableColumns) { - GenUtils.initColumnField(column, table); - saveColumns.add(column); - } - if (CollUtil.isNotEmpty(saveColumns)) { - genTableColumnMapper.insertBatch(saveColumns); - } - } - } - } catch (Exception e) { - throw new ServiceException("导入失败：" + e.getMessage()); - } - } - - /** - * 根据表名称查询列信息 - * - * @param tableName 表名称 - * @param dataName 数据源名称 - * @return 列信息 - */ - @DS("#dataName") - @Override - public List selectDbTableColumnsByName(String tableName, String dataName) { - LinkedHashMap columns = ServiceProxy.metadata().columns(tableName); - List tableColumns = new ArrayList<>(); - columns.forEach((columnName, column) -> { - GenTableColumn tableColumn = new GenTableColumn(); - tableColumn.setIsPk(String.valueOf(column.isPrimaryKey())); - tableColumn.setColumnName(column.getName()); - tableColumn.setColumnComment(column.getComment()); - tableColumn.setColumnType(column.getTypeName().toLowerCase()); - tableColumn.setSort(column.getPosition()); - tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0"); - tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1"); - tableColumns.add(tableColumn); - }); - return tableColumns; - } - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - @Override - public Map previewCode(Long tableId) { - Map dataMap = new LinkedHashMap<>(); - // 查询表信息 - GenTable table = baseMapper.selectGenTableById(tableId); - List menuIds = new ArrayList<>(); - for (int i = 0; i < 6; i++) { - menuIds.add(identifierGenerator.nextId(null).longValue()); - } - table.setMenuIds(menuIds); - // 设置主键列信息 - setPkColumn(table); - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - dataMap.put(template, sw.toString()); - } - return dataMap; - } - - /** - * 生成代码（下载方式） - * - * @param tableId 表名称 - * @return 数据 - */ - @Override - public byte[] downloadCode(Long tableId) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - generatorCode(tableId, zip); - IoUtil.close(zip); - return outputStream.toByteArray(); - } - - /** - * 生成代码（自定义路径） - * - * @param tableId 表名称 - */ - @Override - public void generatorCode(Long tableId) { - // 查询表信息 - GenTable table = baseMapper.selectGenTableById(tableId); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) { - if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try { - String path = getGenPath(table, template); - FileUtils.writeUtf8String(sw.toString(), path); - } catch (Exception e) { - throw new ServiceException("渲染模板失败，表名：" + table.getTableName()); - } - } - } - } - - /** - * 同步数据库 - * - * @param tableId 表名称 - */ - @DSTransactional - @Override - public void synchDb(Long tableId) { - GenTable table = baseMapper.selectGenTableById(tableId); - List tableColumns = table.getColumns(); - Map tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName); - - List dbTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(table.getTableName(), table.getDataName()); - if (CollUtil.isEmpty(dbTableColumns)) { - throw new ServiceException("同步数据失败，原表结构不存在"); - } - List dbTableColumnNames = StreamUtils.toList(dbTableColumns, GenTableColumn::getColumnName); - - List saveColumns = new ArrayList<>(); - dbTableColumns.forEach(column -> { - GenUtils.initColumnField(column, table); - if (tableColumnMap.containsKey(column.getColumnName())) { - GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); - column.setColumnId(prevColumn.getColumnId()); - if (column.isList()) { - // 如果是列表，继续保留查询方式/字典类型选项 - column.setDictType(prevColumn.getDictType()); - column.setQueryType(prevColumn.getQueryType()); - } - if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() - && (column.isInsert() || column.isEdit()) - && ((column.isUsableColumn()) || (!column.isSuperColumn()))) { - // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项 - column.setIsRequired(prevColumn.getIsRequired()); - column.setHtmlType(prevColumn.getHtmlType()); - } - } - saveColumns.add(column); - }); - if (CollUtil.isNotEmpty(saveColumns)) { - genTableColumnMapper.insertOrUpdateBatch(saveColumns); - } - List delColumns = StreamUtils.filter(tableColumns, column -> !dbTableColumnNames.contains(column.getColumnName())); - if (CollUtil.isNotEmpty(delColumns)) { - List ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId); - if (CollUtil.isNotEmpty(ids)) { - genTableColumnMapper.deleteByIds(ids); - } - } - } - - /** - * 批量生成代码（下载方式） - * - * @param tableIds 表ID数组 - * @return 数据 - */ - @Override - public byte[] downloadCode(String[] tableIds) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableId : tableIds) { - generatorCode(Long.parseLong(tableId), zip); - } - IoUtil.close(zip); - return outputStream.toByteArray(); - } - - /** - * 查询表信息并生成代码 - */ - private void generatorCode(Long tableId, ZipOutputStream zip) { - // 查询表信息 - GenTable table = baseMapper.selectGenTableById(tableId); - List menuIds = new ArrayList<>(); - for (int i = 0; i < 6; i++) { - menuIds.add(identifierGenerator.nextId(null).longValue()); - } - table.setMenuIds(menuIds); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try { - // 添加到zip - zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); - IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString()); - IoUtil.close(sw); - zip.flush(); - zip.closeEntry(); - } catch (IOException e) { - log.error("渲染模板失败，表名：" + table.getTableName(), e); - } - } - } - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - @Override - public void validateEdit(GenTable genTable) { - if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { - String options = JsonUtils.toJsonString(genTable.getParams()); - Dict paramsObj = JsonUtils.parseMap(options); - if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) { - throw new ServiceException("树编码字段不能为空"); - } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) { - throw new ServiceException("树父编码字段不能为空"); - } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) { - throw new ServiceException("树名称字段不能为空"); - } - } - } - - /** - * 设置主键列信息 - * - * @param table 业务表信息 - */ - public void setPkColumn(GenTable table) { - for (GenTableColumn column : table.getColumns()) { - if (column.isPk()) { - table.setPkColumn(column); - break; - } - } - if (ObjectUtil.isNull(table.getPkColumn())) { - table.setPkColumn(table.getColumns().get(0)); - } - - } - - /** - * 设置代码生成其他选项值 - * - * @param genTable 设置后的生成对象 - */ - public void setTableFromOptions(GenTable genTable) { - Dict paramsObj = JsonUtils.parseMap(genTable.getOptions()); - if (ObjectUtil.isNotNull(paramsObj)) { - String treeCode = paramsObj.getStr(GenConstants.TREE_CODE); - String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE); - String treeName = paramsObj.getStr(GenConstants.TREE_NAME); - Long parentMenuId = paramsObj.getLong(GenConstants.PARENT_MENU_ID); - String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME); - - genTable.setTreeCode(treeCode); - genTable.setTreeParentCode(treeParentCode); - genTable.setTreeName(treeName); - genTable.setParentMenuId(parentMenuId); - genTable.setParentMenuName(parentMenuName); - } - } - - /** - * 获取代码生成地址 - * - * @param table 业务表信息 - * @param template 模板文件路径 - * @return 生成地址 - */ - public static String getGenPath(GenTable table, String template) { - String genPath = table.getGenPath(); - if (StringUtils.equals(genPath, "/")) { - return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); - } - return genPath + File.separator + VelocityUtils.getFileName(template, table); - } -} - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java deleted file mode 100644 index b2c20c5..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.dromara.generator.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; - -import java.util.List; -import java.util.Map; - -/** - * 业务 服务层 - * - * @author Lion Li - */ -public interface IGenTableService { - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - List selectGenTableColumnListByTableId(Long tableId); - - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery); - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery); - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @param dataName 数据源名称 - * @return 数据库表集合 - */ - List selectDbTableListByNames(String[] tableNames, String dataName); - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - List selectGenTableAll(); - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - GenTable selectGenTableById(Long id); - - /** - * 修改业务 - * - * @param genTable 业务信息 - */ - void updateGenTable(GenTable genTable); - - /** - * 删除业务信息 - * - * @param tableIds 需要删除的表数据ID - */ - void deleteGenTableByIds(Long[] tableIds); - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - * @param dataName 数据源名称 - */ - void importGenTable(List tableList, String dataName); - - /** - * 根据表名称查询列信息 - * - * @param tableName 表名称 - * @param dataName 数据源名称 - * @return 列信息 - */ - List selectDbTableColumnsByName(String tableName, String dataName); - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - Map previewCode(Long tableId); - - /** - * 生成代码（下载方式） - * - * @param tableId 表名称 - * @return 数据 - */ - byte[] downloadCode(Long tableId); - - /** - * 生成代码（自定义路径） - * - * @param tableId 表名称 - */ - void generatorCode(Long tableId); - - /** - * 同步数据库 - * - * @param tableId 表名称 - */ - void synchDb(Long tableId); - - /** - * 批量生成代码（下载方式） - * - * @param tableIds 表ID数组 - * @return 数据 - */ - byte[] downloadCode(String[] tableIds); - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - void validateEdit(GenTable genTable); -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java deleted file mode 100644 index 2e6b37b..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ /dev/null @@ -1,231 +0,0 @@ -package org.dromara.generator.util; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.RegExUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.GenConfig; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; - -import java.util.Arrays; - -/** - * 代码生成器 工具类 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class GenUtils { - - /** - * 初始化表信息 - */ - public static void initTable(GenTable genTable, Long operId) { - genTable.setClassName(convertClassName(genTable.getTableName())); - genTable.setPackageName(GenConfig.getPackageName()); - genTable.setModuleName(getModuleName(GenConfig.getPackageName())); - genTable.setBusinessName(getBusinessName(genTable.getTableName())); - genTable.setFunctionName(replaceText(genTable.getTableComment())); - genTable.setFunctionAuthor(GenConfig.getAuthor()); - genTable.setCreateBy(operId); - } - - /** - * 初始化列属性字段 - */ - public static void initColumnField(GenTableColumn column, GenTable table) { - String dataType = getDbType(column.getColumnType()); - String columnName = column.getColumnName(); - column.setTableId(table.getTableId()); - column.setCreateBy(table.getCreateBy()); - // 设置java字段名 - column.setJavaField(StringUtils.toCamelCase(columnName)); - // 设置默认类型 - column.setJavaType(GenConstants.TYPE_STRING); - column.setQueryType(GenConstants.QUERY_EQ); - - if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) { - // 字符串长度超过500设置为文本域 - Integer columnLength = getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) { - column.setHtmlType(GenConstants.HTML_INPUT); - - // 如果是浮点型 统一用BigDecimal - String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), StringUtils.SEPARATOR); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { - column.setJavaType(GenConstants.TYPE_BIGDECIMAL); - } - // 如果是整形 - else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); - } - // 长整形 - else { - column.setJavaType(GenConstants.TYPE_LONG); - } - } - - // BO对象 默认插入勾选 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) { - column.setIsInsert(GenConstants.REQUIRE); - } - // BO对象 默认编辑勾选 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) { - column.setIsEdit(GenConstants.REQUIRE); - } - // BO对象 默认是否必填勾选 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) { - column.setIsRequired(GenConstants.REQUIRE); - } - // VO对象 默认返回勾选 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) { - column.setIsList(GenConstants.REQUIRE); - } - // BO对象 默认查询勾选 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) { - column.setIsQuery(GenConstants.REQUIRE); - } - - // 查询字段类型 - if (StringUtils.endsWithIgnoreCase(columnName, "name")) { - column.setQueryType(GenConstants.QUERY_LIKE); - } - // 状态字段设置单选框 - if (StringUtils.endsWithIgnoreCase(columnName, "status")) { - column.setHtmlType(GenConstants.HTML_RADIO); - } - // 类型&性别字段设置下拉框 - else if (StringUtils.endsWithIgnoreCase(columnName, "type") - || StringUtils.endsWithIgnoreCase(columnName, "sex")) { - column.setHtmlType(GenConstants.HTML_SELECT); - } - // 图片字段设置图片上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "image")) { - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } - // 文件字段设置文件上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "file")) { - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } - // 内容字段设置富文本控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "content")) { - column.setHtmlType(GenConstants.HTML_EDITOR); - } - } - - /** - * 校验数组是否包含指定值 - * - * @param arr 数组 - * @param targetValue 值 - * @return 是否包含 - */ - public static boolean arraysContains(String[] arr, String targetValue) { - return Arrays.asList(arr).contains(targetValue); - } - - /** - * 获取模块名 - * - * @param packageName 包名 - * @return 模块名 - */ - public static String getModuleName(String packageName) { - int lastIndex = packageName.lastIndexOf("."); - int nameLength = packageName.length(); - return StringUtils.substring(packageName, lastIndex + 1, nameLength); - } - - /** - * 获取业务名 - * - * @param tableName 表名 - * @return 业务名 - */ - public static String getBusinessName(String tableName) { - int firstIndex = tableName.indexOf("_"); - int nameLength = tableName.length(); - String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength); - businessName = StringUtils.toCamelCase(businessName); - return businessName; - } - - /** - * 表名转换成Java类名 - * - * @param tableName 表名称 - * @return 类名 - */ - public static String convertClassName(String tableName) { - boolean autoRemovePre = GenConfig.getAutoRemovePre(); - String tablePrefix = GenConfig.getTablePrefix(); - if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { - String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR); - tableName = replaceFirst(tableName, searchList); - } - return StringUtils.convertToCamelCase(tableName); - } - - /** - * 批量替换前缀 - * - * @param replacementm 替换值 - * @param searchList 替换列表 - */ - public static String replaceFirst(String replacementm, String[] searchList) { - String text = replacementm; - for (String searchString : searchList) { - if (replacementm.startsWith(searchString)) { - text = replacementm.replaceFirst(searchString, StringUtils.EMPTY); - break; - } - } - return text; - } - - /** - * 关键字替换 - * - * @param text 需要被替换的名字 - * @return 替换后的名字 - */ - public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); - } - - /** - * 获取数据库类型字段 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static String getDbType(String columnType) { - if (StringUtils.indexOf(columnType, "(") > 0) { - return StringUtils.substringBefore(columnType, "("); - } else { - return columnType; - } - } - - /** - * 获取字段长度 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static Integer getColumnLength(String columnType) { - if (StringUtils.indexOf(columnType, "(") > 0) { - String length = StringUtils.substringBetween(columnType, "(", ")"); - return Integer.valueOf(length); - } else { - return 0; - } - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java deleted file mode 100644 index 09e0121..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.generator.util; - -import org.dromara.common.core.constant.Constants; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.velocity.app.Velocity; - -import java.util.Properties; - -/** - * VelocityEngine工厂 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class VelocityInitializer { - - /** - * 初始化vm方法 - */ - public static void initVelocity() { - Properties p = new Properties(); - try { - // 加载classpath目录下的vm文件 - p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - // 定义字符集 - p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); - // 初始化Velocity引擎，指定配置Properties - Velocity.init(p); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java deleted file mode 100644 index 6e111e3..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ /dev/null @@ -1,341 +0,0 @@ -package org.dromara.generator.util; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Dict; -import org.dromara.generator.constant.GenConstants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.velocity.VelocityContext; - -import java.util.*; - -/** - * 模板处理工具类 - * - * @author ruoyi - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class VelocityUtils { - - /** - * 项目空间路径 - */ - private static final String PROJECT_PATH = "main/java"; - - /** - * mybatis空间路径 - */ - private static final String MYBATIS_PATH = "main/resources/mapper"; - - /** - * 默认上级菜单，系统工具 - */ - private static final String DEFAULT_PARENT_MENU_ID = "3"; - - /** - * 设置模板变量信息 - * - * @return 模板列表 - */ - public static VelocityContext prepareContext(GenTable genTable) { - String moduleName = genTable.getModuleName(); - String businessName = genTable.getBusinessName(); - String packageName = genTable.getPackageName(); - String tplCategory = genTable.getTplCategory(); - String functionName = genTable.getFunctionName(); - - VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("tplCategory", genTable.getTplCategory()); - velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); - velocityContext.put("ClassName", genTable.getClassName()); - velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); - velocityContext.put("moduleName", genTable.getModuleName()); - velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); - velocityContext.put("businessName", genTable.getBusinessName()); - velocityContext.put("basePackage", getPackagePrefix(packageName)); - velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getFunctionAuthor()); - velocityContext.put("datetime", DateUtils.getDate()); - velocityContext.put("pkColumn", genTable.getPkColumn()); - velocityContext.put("importList", getImportList(genTable)); - velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); - velocityContext.put("columns", genTable.getColumns()); - velocityContext.put("table", genTable); - velocityContext.put("dicts", getDicts(genTable)); - setMenuVelocityContext(velocityContext, genTable); - if (GenConstants.TPL_TREE.equals(tplCategory)) { - setTreeVelocityContext(velocityContext, genTable); - } - return velocityContext; - } - - public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { - String options = genTable.getOptions(); - Dict paramsObj = JsonUtils.parseMap(options); - String parentMenuId = getParentMenuId(paramsObj); - context.put("parentMenuId", parentMenuId); - } - - public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { - String options = genTable.getOptions(); - Dict paramsObj = JsonUtils.parseMap(options); - String treeCode = getTreecode(paramsObj); - String treeParentCode = getTreeParentCode(paramsObj); - String treeName = getTreeName(paramsObj); - - context.put("treeCode", treeCode); - context.put("treeParentCode", treeParentCode); - context.put("treeName", treeName); - context.put("expandColumn", getExpandColumn(genTable)); - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { - context.put("tree_parent_code", paramsObj.get(GenConstants.TREE_PARENT_CODE)); - } - if (paramsObj.containsKey(GenConstants.TREE_NAME)) { - context.put("tree_name", paramsObj.get(GenConstants.TREE_NAME)); - } - } - - /** - * 获取模板信息 - * - * @return 模板列表 - */ - public static List getTemplateList(String tplCategory) { - List templates = new ArrayList<>(); - templates.add("vm/java/domain.java.vm"); - templates.add("vm/java/vo.java.vm"); - templates.add("vm/java/bo.java.vm"); - templates.add("vm/java/mapper.java.vm"); - templates.add("vm/java/service.java.vm"); - templates.add("vm/java/serviceImpl.java.vm"); - templates.add("vm/java/controller.java.vm"); - templates.add("vm/xml/mapper.xml.vm"); - if (DataBaseHelper.isOracle()) { - templates.add("vm/sql/oracle/sql.vm"); - } else if (DataBaseHelper.isPostgerSql()) { - templates.add("vm/sql/postgres/sql.vm"); - } else if (DataBaseHelper.isSqlServer()) { - templates.add("vm/sql/sqlserver/sql.vm"); - } else { - templates.add("vm/sql/sql.vm"); - } - templates.add("vm/ts/api.ts.vm"); - templates.add("vm/ts/types.ts.vm"); - if (GenConstants.TPL_CRUD.equals(tplCategory)) { - templates.add("vm/vue/index.vue.vm"); - } else if (GenConstants.TPL_TREE.equals(tplCategory)) { - templates.add("vm/vue/index-tree.vue.vm"); - } - return templates; - } - - /** - * 获取文件名 - */ - public static String getFileName(String template, GenTable genTable) { - // 文件名称 - String fileName = ""; - // 包路径 - String packageName = genTable.getPackageName(); - // 模块名 - String moduleName = genTable.getModuleName(); - // 大写类名 - String className = genTable.getClassName(); - // 业务名称 - String businessName = genTable.getBusinessName(); - - String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); - String mybatisPath = MYBATIS_PATH + "/" + moduleName; - String vuePath = "vue"; - - if (template.contains("domain.java.vm")) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); - } - if (template.contains("vo.java.vm")) { - fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className); - } - if (template.contains("bo.java.vm")) { - fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className); - } - if (template.contains("mapper.java.vm")) { - fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } else if (template.contains("service.java.vm")) { - fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); - } else if (template.contains("serviceImpl.java.vm")) { - fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); - } else if (template.contains("controller.java.vm")) { - fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); - } else if (template.contains("mapper.xml.vm")) { - fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); - } else if (template.contains("sql.vm")) { - fileName = businessName + "Menu.sql"; - } else if (template.contains("api.ts.vm")) { - fileName = StringUtils.format("{}/api/{}/{}/index.ts", vuePath, moduleName, businessName); - } else if (template.contains("types.ts.vm")) { - fileName = StringUtils.format("{}/api/{}/{}/types.ts", vuePath, moduleName, businessName); - } else if (template.contains("index.vue.vm")) { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } else if (template.contains("index-tree.vue.vm")) { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - return fileName; - } - - /** - * 获取包前缀 - * - * @param packageName 包名称 - * @return 包前缀名称 - */ - public static String getPackagePrefix(String packageName) { - int lastIndex = packageName.lastIndexOf("."); - return StringUtils.substring(packageName, 0, lastIndex); - } - - /** - * 根据列类型获取导入包 - * - * @param genTable 业务表对象 - * @return 返回需要导入的包列表 - */ - public static HashSet getImportList(GenTable genTable) { - List columns = genTable.getColumns(); - HashSet importList = new HashSet<>(); - for (GenTableColumn column : columns) { - if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) { - importList.add("java.util.Date"); - importList.add("com.fasterxml.jackson.annotation.JsonFormat"); - } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { - importList.add("java.math.BigDecimal"); - } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { - importList.add("org.dromara.common.translation.annotation.Translation"); - importList.add("org.dromara.common.translation.constant.TransConstant"); - } - } - return importList; - } - - /** - * 根据列类型获取字典组 - * - * @param genTable 业务表对象 - * @return 返回字典组 - */ - public static String getDicts(GenTable genTable) { - List columns = genTable.getColumns(); - Set dicts = new HashSet<>(); - addDicts(dicts, columns); - return StringUtils.join(dicts, ", "); - } - - /** - * 添加字典列表 - * - * @param dicts 字典列表 - * @param columns 列集合 - */ - public static void addDicts(Set dicts, List columns) { - for (GenTableColumn column : columns) { - if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( - column.getHtmlType(), - new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) { - dicts.add("'" + column.getDictType() + "'"); - } - } - } - - /** - * 获取权限前缀 - * - * @param moduleName 模块名称 - * @param businessName 业务名称 - * @return 返回权限前缀 - */ - public static String getPermissionPrefix(String moduleName, String businessName) { - return StringUtils.format("{}:{}", moduleName, businessName); - } - - /** - * 获取上级菜单ID字段 - * - * @param paramsObj 生成其他选项 - * @return 上级菜单ID字段 - */ - public static String getParentMenuId(Dict paramsObj) { - if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) - && StringUtils.isNotEmpty(paramsObj.getStr(GenConstants.PARENT_MENU_ID))) { - return paramsObj.getStr(GenConstants.PARENT_MENU_ID); - } - return DEFAULT_PARENT_MENU_ID; - } - - /** - * 获取树编码 - * - * @param paramsObj 生成其他选项 - * @return 树编码 - */ - public static String getTreecode(Map paramsObj) { - if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) { - return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE))); - } - return StringUtils.EMPTY; - } - - /** - * 获取树父编码 - * - * @param paramsObj 生成其他选项 - * @return 树父编码 - */ - public static String getTreeParentCode(Dict paramsObj) { - if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { - return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_PARENT_CODE)); - } - return StringUtils.EMPTY; - } - - /** - * 获取树名称 - * - * @param paramsObj 生成其他选项 - * @return 树名称 - */ - public static String getTreeName(Dict paramsObj) { - if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) { - return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_NAME)); - } - return StringUtils.EMPTY; - } - - /** - * 获取需要在哪一列上面显示展开按钮 - * - * @param genTable 业务表对象 - * @return 展开按钮列序号 - */ - public static int getExpandColumn(GenTable genTable) { - String options = genTable.getOptions(); - Dict paramsObj = JsonUtils.parseMap(options); - String treeName = paramsObj.getStr(GenConstants.TREE_NAME); - int num = 0; - for (GenTableColumn column : genTable.getColumns()) { - if (column.isList()) { - num++; - String columnName = column.getColumnName(); - if (columnName.equals(treeName)) { - break; - } - } - } - return num; - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/template/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml deleted file mode 100644 index d779d97..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml +++ /dev/null @@ -1,10 +0,0 @@ -# 代码生成 -gen: - # 作者 - author: Lion Li - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: org.dromara.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index fc1c610..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml deleted file mode 100644 index 78aa852..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - SELECT t.table_id, t.data_name, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, - c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort - FROM gen_table t - LEFT JOIN gen_table_column c ON t.table_id = c.table_id - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md deleted file mode 100644 index c938b1e..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md +++ /dev/null @@ -1,3 +0,0 @@ -java包使用 `.` 分割 resource 目录使用 `/` 分割 -
-此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm deleted file mode 100644 index 511d37c..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ /dev/null @@ -1,50 +0,0 @@ -package ${packageName}.domain.bo; - -import ${packageName}.domain.${ClassName}; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -#foreach ($import in $importList) -import ${import}; -#end - -/** - * ${functionName}业务对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) -public class ${ClassName}Bo extends BaseEntity { - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) - /** - * $column.columnComment - */ -#if($column.insert && $column.edit) -#set($Group="AddGroup.class, EditGroup.class") -#elseif($column.insert) -#set($Group="AddGroup.class") -#elseif($column.edit) -#set($Group="EditGroup.class") -#end -#if($column.required) -#if($column.javaType == 'String') - @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) -#else - @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) -#end -#end - private $column.javaType $column.javaField; - -#end -#end - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index 6438971..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ /dev/null @@ -1,115 +0,0 @@ -package ${packageName}.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import ${packageName}.domain.vo.${ClassName}Vo; -import ${packageName}.domain.bo.${ClassName}Bo; -import ${packageName}.service.I${ClassName}Service; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -#elseif($table.tree) -#end - -/** - * ${functionName} - * - * @author ${author} - * @date ${datetime} - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/${moduleName}/${businessName}") -public class ${ClassName}Controller extends BaseController { - - private final I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @SaCheckPermission("${permissionPrefix}:list") - @GetMapping("/list") -#if($table.crud) - public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) { - return ${className}Service.queryPageList(bo, pageQuery); - } -#elseif($table.tree) - public R> list(${ClassName}Bo bo) { - List<${ClassName}Vo> list = ${className}Service.queryList(bo); - return R.ok(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @SaCheckPermission("${permissionPrefix}:export") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(${ClassName}Bo bo, HttpServletResponse response) { - List<${ClassName}Vo> list = ${className}Service.queryList(bo); - ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response); - } - - /** - * 获取${functionName}详细信息 - * - * @param ${pkColumn.javaField} 主键 - */ - @SaCheckPermission("${permissionPrefix}:query") - @GetMapping("/{${pkColumn.javaField}}") - public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空") - @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) { - return R.ok(${className}Service.queryById(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @SaCheckPermission("${permissionPrefix}:add") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) { - return toAjax(${className}Service.insertByBo(bo)); - } - - /** - * 修改${functionName} - */ - @SaCheckPermission("${permissionPrefix}:edit") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) { - return toAjax(${className}Service.updateByBo(bo)); - } - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField}s 主键串 - */ - @SaCheckPermission("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { - return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true)); - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm deleted file mode 100644 index 205fb73..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ /dev/null @@ -1,60 +0,0 @@ -package ${packageName}.domain; - -#foreach ($column in $columns) -#if($column.javaField=='tenantId') -#set($IsTenant=1) -#end -#end -#if($IsTenant==1) -import org.dromara.common.tenant.core.TenantEntity; -#else -import org.dromara.common.mybatis.core.domain.BaseEntity; -#end -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -#foreach ($import in $importList) -import ${import}; -#end - -import java.io.Serial; - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($IsTenant==1) -#set($Entity="TenantEntity") -#else -#set($Entity="BaseEntity") -#end -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("${tableName}") -public class ${ClassName} extends ${Entity} { - - @Serial - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) - /** - * $column.columnComment - */ -#if($column.javaField=='delFlag') - @TableLogic -#end -#if($column.javaField=='version') - @Version -#end -#if($column.isPk==1) - @TableId(value = "$column.columnName") -#end - private $column.javaType $column.javaField; - -#end -#end - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm deleted file mode 100644 index 0922401..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ /dev/null @@ -1,15 +0,0 @@ -package ${packageName}.mapper; - -import ${packageName}.domain.${ClassName}; -import ${packageName}.domain.vo.${ClassName}Vo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> { - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm deleted file mode 100644 index 4db9030..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ /dev/null @@ -1,72 +0,0 @@ -package ${packageName}.service; - -import ${packageName}.domain.vo.${ClassName}Vo; -import ${packageName}.domain.bo.${ClassName}Bo; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -#end - -import java.util.Collection; -import java.util.List; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service { - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} 主键 - * @return ${functionName} - */ - ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}); - -#if($table.crud) - /** - * 分页查询${functionName}列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return ${functionName}分页列表 - */ - TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); -#end - - /** - * 查询符合条件的${functionName}列表 - * - * @param bo 查询条件 - * @return ${functionName}列表 - */ - List<${ClassName}Vo> queryList(${ClassName}Bo bo); - - /** - * 新增${functionName} - * - * @param bo ${functionName} - * @return 是否新增成功 - */ - Boolean insertByBo(${ClassName}Bo bo); - - /** - * 修改${functionName} - * - * @param bo ${functionName} - * @return 是否修改成功 - */ - Boolean updateByBo(${ClassName}Bo bo); - - /** - * 校验并批量删除${functionName}信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid); -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm deleted file mode 100644 index 67690ca..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,154 +0,0 @@ -package ${packageName}.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -#end -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import ${packageName}.domain.bo.${ClassName}Bo; -import ${packageName}.domain.vo.${ClassName}Vo; -import ${packageName}.domain.${ClassName}; -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.service.I${ClassName}Service; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@RequiredArgsConstructor -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service { - - private final ${ClassName}Mapper baseMapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} 主键 - * @return ${functionName} - */ - @Override - public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ - return baseMapper.selectVoById(${pkColumn.javaField}); - } - -#if($table.crud) - /** - * 分页查询${functionName}列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return ${functionName}分页列表 - */ - @Override - public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { - LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); - Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } -#end - - /** - * 查询符合条件的${functionName}列表 - * - * @param bo 查询条件 - * @return ${functionName}列表 - */ - @Override - public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { - LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); -#foreach($column in $columns) -#if($column.query) -#set($queryType=$column.queryType) -#set($javaField=$column.javaField) -#set($javaType=$column.javaType) -#set($columnName=$column.columnName) -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#set($mpMethod=$column.queryType.toLowerCase()) -#if($queryType != 'BETWEEN') -#if($javaType == 'String') -#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') -#else -#set($condition='bo.get'+$AttrName+'() != null') -#end - lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()); -#else - lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null, - ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")); -#end -#end -#end - return lqw; - } - - /** - * 新增${functionName} - * - * @param bo ${functionName} - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(${ClassName}Bo bo) { - ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; -#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) - if (flag) { - bo.set$pk(add.get$pk()); - } - return flag; - } - - /** - * 修改${functionName} - * - * @param bo ${functionName} - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(${ClassName}Bo bo) { - ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(${ClassName} entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除${functionName}信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm deleted file mode 100644 index 5591f97..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ /dev/null @@ -1,66 +0,0 @@ -package ${packageName}.domain.vo; - -#foreach ($import in $importList) -import ${import}; -#end -import ${packageName}.domain.${ClassName}; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - - -/** - * ${functionName}视图对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = ${ClassName}.class) -public class ${ClassName}Vo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if($column.list) - /** - * $column.columnComment - */ -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if(${column.dictType} && ${column.dictType} != '') - @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "${column.dictType}") -#elseif($parentheseIndex != -1) - @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") -#else - @ExcelProperty(value = "${comment}") -#end - private $column.javaType $column.javaField; - -#if($column.htmlType == "imageUpload") - /** - * ${column.columnComment}Url - */ - @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "${column.javaField}") - private String ${column.javaField}Url; -#end -#end -#end - -} diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm deleted file mode 100644 index f6638be..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm +++ /dev/null @@ -1,19 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate, null, null, '${functionName}菜单'); - --- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, sysdate, null, null, ''); diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm deleted file mode 100644 index 0923392..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm +++ /dev/null @@ -1,20 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, now(), null, null, '${functionName}菜单'); - --- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, now(), null, null, ''); - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm deleted file mode 100644 index 01824c2..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ /dev/null @@ -1,19 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate(), null, null, '${functionName}菜单'); - --- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, sysdate(), null, null, ''); diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm deleted file mode 100644 index bdf166e..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm +++ /dev/null @@ -1,19 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, getdate(), null, null, '${functionName}菜单'); - --- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, getdate(), null, null, ''); diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm deleted file mode 100644 index 3aa4a5f..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types'; - -/** - * 查询${functionName}列表 - * @param query - * @returns {*} - */ - -export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }); -}; - -/** - * 查询${functionName}详细 - * @param ${pkColumn.javaField} - */ -export const get${BusinessName} = (${pkColumn.javaField}: string | number): AxiosPromise<${BusinessName}VO> => { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }); -}; - -/** - * 新增${functionName} - * @param data - */ -export const add${BusinessName} = (data: ${BusinessName}Form) => { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }); -}; - -/** - * 修改${functionName} - * @param data - */ -export const update${BusinessName} = (data: ${BusinessName}Form) => { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }); -}; - -/** - * 删除${functionName} - * @param ${pkColumn.javaField} - */ -export const del${BusinessName} = (${pkColumn.javaField}: string | number | Array) => { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }); -}; diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm deleted file mode 100644 index 35a468e..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm +++ /dev/null @@ -1,64 +0,0 @@ -export interface ${BusinessName}VO { -#foreach ($column in $columns) -#if($column.list) - /** - * $column.columnComment - */ - $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; - #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; - #elseif($column.javaType == 'Boolean') boolean; - #else string; - #end -#if($column.htmlType == "imageUpload") - /** - * ${column.columnComment}Url - */ - ${column.javaField}Url: string; -#end -#end -#end -#if ($table.tree) - /** - * 子对象 - */ - children: ${BusinessName}VO[]; -#end -} - -export interface ${BusinessName}Form extends BaseEntity { -#foreach ($column in $columns) -#if($column.insert || $column.edit) - /** - * $column.columnComment - */ - $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; - #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; - #elseif($column.javaType == 'Boolean') boolean; - #else string; - #end -#end -#end -} - -export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{ - -#foreach ($column in $columns) -#if($column.query) - /** - * $column.columnComment - */ - $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; - #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; - #elseif($column.javaType == 'Boolean') boolean; - #else string; - #end -#end -#end - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm deleted file mode 100644 index caf3472..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ /dev/null @@ -1,498 +0,0 @@ - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm deleted file mode 100644 index a92d19a..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ /dev/null @@ -1,459 +0,0 @@ - - - diff --git a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm deleted file mode 100644 index 9fb48d9..0000000 --- a/template/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-job/pom.xml b/template/ruoyi-modules/ruoyi-job/pom.xml deleted file mode 100644 index 2431a1c..0000000 --- a/template/ruoyi-modules/ruoyi-job/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - jar - ruoyi-job - - - 任务调度 - - - - - - - org.dromara - ruoyi-common-json - - - - org.dromara - ruoyi-common-job - - - - - - diff --git a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java deleted file mode 100644 index 2f118b0..0000000 --- a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.job; diff --git a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java deleted file mode 100644 index 5bea9da..0000000 --- a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.job.snailjob; - -import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; -import com.aizuda.snailjob.client.job.core.dto.JobArgs; -import com.aizuda.snailjob.client.model.ExecuteResult; -import com.aizuda.snailjob.common.core.util.JsonUtil; -import com.aizuda.snailjob.common.log.SnailJobLog; -import org.springframework.stereotype.Component; - -/** - * @author opensnail - * @date 2024-05-17 - */ -@Component -@JobExecutor(name = "testJobExecutor") -public class TestAnnoJobExecutor { - - public ExecuteResult jobExecute(JobArgs jobArgs) { - SnailJobLog.LOCAL.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs)); - SnailJobLog.REMOTE.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs)); - return ExecuteResult.success("测试成功"); - } -} diff --git a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java deleted file mode 100644 index 6f7c21f..0000000 --- a/template/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.dromara.job.snailjob; - -import com.aizuda.snailjob.client.job.core.dto.JobArgs; -import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; -import com.aizuda.snailjob.client.model.ExecuteResult; -import org.springframework.stereotype.Component; - -/** - * @author opensnail - * @date 2024-05-17 - */ -@Component -public class TestClassJobExecutor extends AbstractJobExecutor { - - @Override - protected ExecuteResult doJobExecute(JobArgs jobArgs) { - return ExecuteResult.success("TestJobExecutor测试成功"); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/pom.xml b/template/ruoyi-modules/ruoyi-system/pom.xml deleted file mode 100644 index 0fc6d55..0000000 --- a/template/ruoyi-modules/ruoyi-system/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-system - - - system系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-sse - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java deleted file mode 100644 index 6b7499a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.dromara.system.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.vo.CacheListInfoVo; -import lombok.RequiredArgsConstructor; -import org.redisson.spring.data.connection.RedissonConnectionFactory; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.*; - -/** - * 缓存监控 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/cache") -public class CacheController { - - private final RedissonConnectionFactory connectionFactory; - - /** - * 获取缓存监控列表 - */ - @SaCheckPermission("monitor:cache:list") - @GetMapping() - public R getInfo() throws Exception { - RedisConnection connection = connectionFactory.getConnection(); - Properties commandStats = connection.commands().info("commandstats"); - - List> pieList = new ArrayList<>(); - if (commandStats != null) { - commandStats.stringPropertyNames().forEach(key -> { - Map data = new HashMap<>(2); - String property = commandStats.getProperty(key); - data.put("name", StringUtils.removeStart(key, "cmdstat_")); - data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); - pieList.add(data); - }); - } - - CacheListInfoVo infoVo = new CacheListInfoVo(); - infoVo.setInfo(connection.commands().info()); - infoVo.setDbSize(connection.commands().dbSize()); - infoVo.setCommandStats(pieList); - return R.ok(infoVo); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java deleted file mode 100644 index 98ac2d5..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.dromara.system.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.service.ISysLogininforService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 系统访问记录 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController { - - private final ISysLogininforService logininforService; - - /** - * 获取系统访问记录列表 - */ - @SaCheckPermission("monitor:logininfor:list") - @GetMapping("/list") - public TableDataInfo list(SysLogininforBo logininfor, PageQuery pageQuery) { - return logininforService.selectPageLogininforList(logininfor, pageQuery); - } - - /** - * 导出系统访问记录列表 - */ - @Log(title = "登录日志", businessType = BusinessType.EXPORT) - @SaCheckPermission("monitor:logininfor:export") - @PostMapping("/export") - public void export(SysLogininforBo logininfor, HttpServletResponse response) { - List list = logininforService.selectLogininforList(logininfor); - ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response); - } - - /** - * 批量删除登录日志 - * @param infoIds 日志ids - */ - @SaCheckPermission("monitor:logininfor:remove") - @Log(title = "登录日志", businessType = BusinessType.DELETE) - @DeleteMapping("/{infoIds}") - public R remove(@PathVariable Long[] infoIds) { - return toAjax(logininforService.deleteLogininforByIds(infoIds)); - } - - /** - * 清理系统访问记录 - */ - @SaCheckPermission("monitor:logininfor:remove") - @Log(title = "登录日志", businessType = BusinessType.CLEAN) - @DeleteMapping("/clean") - public R clean() { - logininforService.cleanLogininfor(); - return R.ok(); - } - - @SaCheckPermission("monitor:logininfor:unlock") - @Log(title = "账户解锁", businessType = BusinessType.OTHER) - @GetMapping("/unlock/{userName}") - public R unlock(@PathVariable("userName") String userName) { - String loginName = CacheConstants.PWD_ERR_CNT_KEY + userName; - if (RedisUtils.hasKey(loginName)) { - RedisUtils.deleteObject(loginName); - } - return R.ok(); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java deleted file mode 100644 index 575aba6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.system.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.service.ISysOperLogService; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 操作日志记录 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController { - - private final ISysOperLogService operLogService; - - /** - * 获取操作日志记录列表 - */ - @SaCheckPermission("monitor:operlog:list") - @GetMapping("/list") - public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { - return operLogService.selectPageOperLogList(operLog, pageQuery); - } - - /** - * 导出操作日志记录列表 - */ - @Log(title = "操作日志", businessType = BusinessType.EXPORT) - @SaCheckPermission("monitor:operlog:export") - @PostMapping("/export") - public void export(SysOperLogBo operLog, HttpServletResponse response) { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response); - } - - /** - * 批量删除操作日志记录 - * @param operIds 日志ids - */ - @Log(title = "操作日志", businessType = BusinessType.DELETE) - @SaCheckPermission("monitor:operlog:remove") - @DeleteMapping("/{operIds}") - public R remove(@PathVariable Long[] operIds) { - return toAjax(operLogService.deleteOperLogByIds(operIds)); - } - - /** - * 清理操作日志记录 - */ - @Log(title = "操作日志", businessType = BusinessType.CLEAN) - @SaCheckPermission("monitor:operlog:remove") - @DeleteMapping("/clean") - public R clean() { - operLogService.cleanOperLog(); - return R.ok(); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java deleted file mode 100644 index 9b08c2d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.dromara.system.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.exception.NotLoginException; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserOnline; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 在线用户监控 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController { - - /** - * 获取在线用户监控列表 - * - * @param ipaddr IP地址 - * @param userName 用户名 - */ - @SaCheckPermission("monitor:online:list") - @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) { - // 获取所有未过期的 token - List keys = StpUtil.searchTokenValue("", 0, -1, false); - List userOnlineDTOList = new ArrayList<>(); - for (String key : keys) { - String token = StringUtils.substringAfterLast(key, ":"); - // 如果已经过期则跳过 - if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { - continue; - } - userOnlineDTOList.add(RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)); - } - if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { - userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> - StringUtils.equals(ipaddr, userOnline.getIpaddr()) && - StringUtils.equals(userName, userOnline.getUserName()) - ); - } else if (StringUtils.isNotEmpty(ipaddr)) { - userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> - StringUtils.equals(ipaddr, userOnline.getIpaddr()) - ); - } else if (StringUtils.isNotEmpty(userName)) { - userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> - StringUtils.equals(userName, userOnline.getUserName()) - ); - } - Collections.reverse(userOnlineDTOList); - userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); - } - - /** - * 强退用户 - * - * @param tokenId token值 - */ - @SaCheckPermission("monitor:online:forceLogout") - @Log(title = "在线用户", businessType = BusinessType.FORCE) - @DeleteMapping("/{tokenId}") - public R forceLogout(@PathVariable String tokenId) { - try { - StpUtil.kickoutByTokenValue(tokenId); - } catch (NotLoginException ignored) { - } - return R.ok(); - } - - /** - * 获取当前用户登录在线设备 - */ - @GetMapping() - public TableDataInfo getInfo() { - // 获取指定账号 id 的 token 集合 - List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); - List userOnlineDTOList = tokenIds.stream() - .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1) - .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)) - .collect(Collectors.toList()); - //复制和处理 SysUserOnline 对象列表 - Collections.reverse(userOnlineDTOList); - userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); - } - - /** - * 强退当前在线设备 - * - * @param tokenId token值 - */ - @Log(title = "在线设备", businessType = BusinessType.FORCE) - @PostMapping("/{tokenId}") - public R remove(@PathVariable("tokenId") String tokenId) { - try { - // 获取指定账号 id 的 token 集合 - List keys = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); - keys.stream() - .filter(key -> key.equals(tokenId)) - .findFirst() - .ifPresent(key -> StpUtil.kickoutByTokenValue(tokenId)); - } catch (NotLoginException ignored) { - } - return R.ok(); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java deleted file mode 100644 index 13be4a4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.controller.system; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.service.ISysClientService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 客户端管理 - * - * @author Michelle.Chung - * @date 2023-06-18 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/client") -public class SysClientController extends BaseController { - - private final ISysClientService sysClientService; - - /** - * 查询客户端管理列表 - */ - @SaCheckPermission("system:client:list") - @GetMapping("/list") - public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { - return sysClientService.queryPageList(bo, pageQuery); - } - - /** - * 导出客户端管理列表 - */ - @SaCheckPermission("system:client:export") - @Log(title = "客户端管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysClientBo bo, HttpServletResponse response) { - List list = sysClientService.queryList(bo); - ExcelUtil.exportExcel(list, "客户端管理", SysClientVo.class, response); - } - - /** - * 获取客户端管理详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("system:client:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(sysClientService.queryById(id)); - } - - /** - * 新增客户端管理 - */ - @SaCheckPermission("system:client:add") - @Log(title = "客户端管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) { - return toAjax(sysClientService.insertByBo(bo)); - } - - /** - * 修改客户端管理 - */ - @SaCheckPermission("system:client:edit") - @Log(title = "客户端管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) { - return toAjax(sysClientService.updateByBo(bo)); - } - - /** - * 状态修改 - */ - @SaCheckPermission("system:client:edit") - @Log(title = "客户端管理", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysClientBo bo) { - return toAjax(sysClientService.updateUserStatus(bo.getClientId(), bo.getStatus())); - } - - /** - * 删除客户端管理 - * - * @param ids 主键串 - */ - @SaCheckPermission("system:client:remove") - @Log(title = "客户端管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(sysClientService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java deleted file mode 100644 index c73c386..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.service.ISysConfigService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 参数配置 信息操作处理 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/config") -public class SysConfigController extends BaseController { - - private final ISysConfigService configService; - - /** - * 获取参数配置列表 - */ - @SaCheckPermission("system:config:list") - @GetMapping("/list") - public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { - return configService.selectPageConfigList(config, pageQuery); - } - - /** - * 导出参数配置列表 - */ - @Log(title = "参数管理", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:config:export") - @PostMapping("/export") - public void export(SysConfigBo config, HttpServletResponse response) { - List list = configService.selectConfigList(config); - ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response); - } - - /** - * 根据参数编号获取详细信息 - * - * @param configId 参数ID - */ - @SaCheckPermission("system:config:query") - @GetMapping(value = "/{configId}") - public R getInfo(@PathVariable Long configId) { - return R.ok(configService.selectConfigById(configId)); - } - - /** - * 根据参数键名查询参数值 - * - * @param configKey 参数Key - */ - @GetMapping(value = "/configKey/{configKey}") - public R getConfigKey(@PathVariable String configKey) { - return R.ok("操作成功", configService.selectConfigByKey(configKey)); - } - - /** - * 新增参数配置 - */ - @SaCheckPermission("system:config:add") - @Log(title = "参数管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysConfigBo config) { - if (!configService.checkConfigKeyUnique(config)) { - return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - configService.insertConfig(config); - return R.ok(); - } - - /** - * 修改参数配置 - */ - @SaCheckPermission("system:config:edit") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysConfigBo config) { - if (!configService.checkConfigKeyUnique(config)) { - return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - configService.updateConfig(config); - return R.ok(); - } - - /** - * 根据参数键名修改参数配置 - */ - @SaCheckPermission("system:config:edit") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PutMapping("/updateByKey") - public R updateByKey(@RequestBody SysConfigBo config) { - configService.updateConfig(config); - return R.ok(); - } - - /** - * 删除参数配置 - * - * @param configIds 参数ID串 - */ - @SaCheckPermission("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{configIds}") - public R remove(@PathVariable Long[] configIds) { - configService.deleteConfigByIds(configIds); - return R.ok(); - } - - /** - * 刷新参数缓存 - */ - @SaCheckPermission("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.CLEAN) - @DeleteMapping("/refreshCache") - public R refreshCache() { - configService.resetConfigCache(); - return R.ok(); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java deleted file mode 100644 index 968bbe9..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.convert.Convert; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 部门信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/dept") -public class SysDeptController extends BaseController { - - private final ISysDeptService deptService; - private final ISysPostService postService; - - /** - * 获取部门列表 - */ - @SaCheckPermission("system:dept:list") - @GetMapping("/list") - public R> list(SysDeptBo dept) { - List depts = deptService.selectDeptList(dept); - return R.ok(depts); - } - - /** - * 查询部门列表（排除节点） - * - * @param deptId 部门ID - */ - @SaCheckPermission("system:dept:list") - @GetMapping("/list/exclude/{deptId}") - public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { - List depts = deptService.selectDeptList(new SysDeptBo()); - depts.removeIf(d -> d.getDeptId().equals(deptId) - || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); - return R.ok(depts); - } - - /** - * 根据部门编号获取详细信息 - * - * @param deptId 部门ID - */ - @SaCheckPermission("system:dept:query") - @GetMapping(value = "/{deptId}") - public R getInfo(@PathVariable Long deptId) { - deptService.checkDeptDataScope(deptId); - return R.ok(deptService.selectDeptById(deptId)); - } - - /** - * 新增部门 - */ - @SaCheckPermission("system:dept:add") - @Log(title = "部门管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysDeptBo dept) { - if (!deptService.checkDeptNameUnique(dept)) { - return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } - return toAjax(deptService.insertDept(dept)); - } - - /** - * 修改部门 - */ - @SaCheckPermission("system:dept:edit") - @Log(title = "部门管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysDeptBo dept) { - Long deptId = dept.getDeptId(); - deptService.checkDeptDataScope(deptId); - if (!deptService.checkDeptNameUnique(dept)) { - return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } else if (dept.getParentId().equals(deptId)) { - return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); - } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())) { - if (deptService.selectNormalChildrenDeptById(deptId) > 0) { - return R.fail("该部门包含未停用的子部门!"); - } else if (deptService.checkDeptExistUser(deptId)) { - return R.fail("该部门下存在已分配用户，不能禁用!"); - } - } - return toAjax(deptService.updateDept(dept)); - } - - /** - * 删除部门 - * - * @param deptId 部门ID - */ - @SaCheckPermission("system:dept:remove") - @Log(title = "部门管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{deptId}") - public R remove(@PathVariable Long deptId) { - if (deptService.hasChildByDeptId(deptId)) { - return R.warn("存在下级部门,不允许删除"); - } - if (deptService.checkDeptExistUser(deptId)) { - return R.warn("部门存在用户,不允许删除"); - } - if (postService.countPostByDeptId(deptId) > 0) { - return R.warn("部门存在岗位,不允许删除"); - } - deptService.checkDeptDataScope(deptId); - return toAjax(deptService.deleteDeptById(deptId)); - } - - /** - * 获取部门选择框列表 - * - * @param deptIds 部门ID串 - */ - @SaCheckPermission("system:dept:query") - @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] deptIds) { - return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java deleted file mode 100644 index 5752751..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import jakarta.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - * 数据字典信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController { - - private final ISysDictDataService dictDataService; - private final ISysDictTypeService dictTypeService; - - /** - * 查询字典数据列表 - */ - @SaCheckPermission("system:dict:list") - @GetMapping("/list") - public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { - return dictDataService.selectPageDictDataList(dictData, pageQuery); - } - - /** - * 导出字典数据列表 - */ - @Log(title = "字典数据", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:dict:export") - @PostMapping("/export") - public void export(SysDictDataBo dictData, HttpServletResponse response) { - List list = dictDataService.selectDictDataList(dictData); - ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response); - } - - /** - * 查询字典数据详细 - * - * @param dictCode 字典code - */ - @SaCheckPermission("system:dict:query") - @GetMapping(value = "/{dictCode}") - public R getInfo(@PathVariable Long dictCode) { - return R.ok(dictDataService.selectDictDataById(dictCode)); - } - - /** - * 根据字典类型查询字典数据信息 - * - * @param dictType 字典类型 - */ - @GetMapping(value = "/type/{dictType}") - public R> dictType(@PathVariable String dictType) { - List data = dictTypeService.selectDictDataByType(dictType); - if (ObjectUtil.isNull(data)) { - data = new ArrayList<>(); - } - return R.ok(data); - } - - /** - * 新增字典类型 - */ - @SaCheckPermission("system:dict:add") - @Log(title = "字典数据", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysDictDataBo dict) { - if (!dictDataService.checkDictDataUnique(dict)) { - return R.fail("新增字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); - } - dictDataService.insertDictData(dict); - return R.ok(); - } - - /** - * 修改保存字典类型 - */ - @SaCheckPermission("system:dict:edit") - @Log(title = "字典数据", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysDictDataBo dict) { - if (!dictDataService.checkDictDataUnique(dict)) { - return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); - } - dictDataService.updateDictData(dict); - return R.ok(); - } - - /** - * 删除字典类型 - * - * @param dictCodes 字典code串 - */ - @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @DeleteMapping("/{dictCodes}") - public R remove(@PathVariable Long[] dictCodes) { - dictDataService.deleteDictDataByIds(dictCodes); - return R.ok(); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java deleted file mode 100644 index 67c1f51..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.service.ISysDictTypeService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 数据字典信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController { - - private final ISysDictTypeService dictTypeService; - - /** - * 查询字典类型列表 - */ - @SaCheckPermission("system:dict:list") - @GetMapping("/list") - public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { - return dictTypeService.selectPageDictTypeList(dictType, pageQuery); - } - - /** - * 导出字典类型列表 - */ - @Log(title = "字典类型", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:dict:export") - @PostMapping("/export") - public void export(SysDictTypeBo dictType, HttpServletResponse response) { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response); - } - - /** - * 查询字典类型详细 - * - * @param dictId 字典ID - */ - @SaCheckPermission("system:dict:query") - @GetMapping(value = "/{dictId}") - public R getInfo(@PathVariable Long dictId) { - return R.ok(dictTypeService.selectDictTypeById(dictId)); - } - - /** - * 新增字典类型 - */ - @SaCheckPermission("system:dict:add") - @Log(title = "字典类型", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysDictTypeBo dict) { - if (!dictTypeService.checkDictTypeUnique(dict)) { - return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dictTypeService.insertDictType(dict); - return R.ok(); - } - - /** - * 修改字典类型 - */ - @SaCheckPermission("system:dict:edit") - @Log(title = "字典类型", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysDictTypeBo dict) { - if (!dictTypeService.checkDictTypeUnique(dict)) { - return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dictTypeService.updateDictType(dict); - return R.ok(); - } - - /** - * 删除字典类型 - * - * @param dictIds 字典ID串 - */ - @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @DeleteMapping("/{dictIds}") - public R remove(@PathVariable Long[] dictIds) { - dictTypeService.deleteDictTypeByIds(dictIds); - return R.ok(); - } - - /** - * 刷新字典缓存 - */ - @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.CLEAN) - @DeleteMapping("/refreshCache") - public R refreshCache() { - dictTypeService.resetDictCache(); - return R.ok(); - } - - /** - * 获取字典选择框列表 - */ - @GetMapping("/optionselect") - public R> optionselect() { - List dictTypes = dictTypeService.selectDictTypeAll(); - return R.ok(dictTypes); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java deleted file mode 100644 index e5daa0e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.lang.tree.Tree; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MenuTreeSelectVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.service.ISysMenuService; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 菜单信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/menu") -public class SysMenuController extends BaseController { - - private final ISysMenuService menuService; - - /** - * 获取路由信息 - * - * @return 路由信息 - */ - @GetMapping("/getRouters") - public R> getRouters() { - List menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId()); - return R.ok(menuService.buildMenus(menus)); - } - - /** - * 获取菜单列表 - */ - @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY - }, mode = SaMode.OR) - @SaCheckPermission("system:menu:list") - @GetMapping("/list") - public R> list(SysMenuBo menu) { - List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); - return R.ok(menus); - } - - /** - * 根据菜单编号获取详细信息 - * - * @param menuId 菜单ID - */ - @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY - }, mode = SaMode.OR) - @SaCheckPermission("system:menu:query") - @GetMapping(value = "/{menuId}") - public R getInfo(@PathVariable Long menuId) { - return R.ok(menuService.selectMenuById(menuId)); - } - - /** - * 获取菜单下拉树列表 - */ - @SaCheckPermission("system:menu:query") - @GetMapping("/treeselect") - public R>> treeselect(SysMenuBo menu) { - List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); - return R.ok(menuService.buildMenuTreeSelect(menus)); - } - - /** - * 加载对应角色菜单列表树 - * - * @param roleId 角色ID - */ - @SaCheckPermission("system:menu:query") - @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { - List menus = menuService.selectMenuList(LoginHelper.getUserId()); - MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); - selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId)); - selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); - return R.ok(selectVo); - } - - /** - * 加载对应租户套餐菜单列表树 - * - * @param packageId 租户套餐ID - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:query") - @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}") - public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { - List menus = menuService.selectMenuList(LoginHelper.getUserId()); - MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); - selectVo.setCheckedKeys(menuService.selectMenuListByPackageId(packageId)); - selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); - return R.ok(selectVo); - } - - /** - * 新增菜单 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:add") - @Log(title = "菜单管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysMenuBo menu) { - if (!menuService.checkMenuNameUnique(menu)) { - return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { - return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); - } - return toAjax(menuService.insertMenu(menu)); - } - - /** - * 修改菜单 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:edit") - @Log(title = "菜单管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysMenuBo menu) { - if (!menuService.checkMenuNameUnique(menu)) { - return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { - return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); - } else if (menu.getMenuId().equals(menu.getParentId())) { - return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); - } - return toAjax(menuService.updateMenu(menu)); - } - - /** - * 删除菜单 - * - * @param menuId 菜单ID - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:remove") - @Log(title = "菜单管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{menuId}") - public R remove(@PathVariable("menuId") Long menuId) { - if (menuService.hasChildByMenuId(menuId)) { - return R.warn("存在子菜单,不允许删除"); - } - if (menuService.checkMenuExistRole(menuId)) { - return R.warn("菜单已分配,不允许删除"); - } - return toAjax(menuService.deleteMenuById(menuId)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java deleted file mode 100644 index 5d65137..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.DictService; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.service.ISysNoticeService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 公告 信息操作处理 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/notice") -public class SysNoticeController extends BaseController { - - private final ISysNoticeService noticeService; - private final DictService dictService; - - /** - * 获取通知公告列表 - */ - @SaCheckPermission("system:notice:list") - @GetMapping("/list") - public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { - return noticeService.selectPageNoticeList(notice, pageQuery); - } - - /** - * 根据通知公告编号获取详细信息 - * - * @param noticeId 公告ID - */ - @SaCheckPermission("system:notice:query") - @GetMapping(value = "/{noticeId}") - public R getInfo(@PathVariable Long noticeId) { - return R.ok(noticeService.selectNoticeById(noticeId)); - } - - /** - * 新增通知公告 - */ - @SaCheckPermission("system:notice:add") - @Log(title = "通知公告", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysNoticeBo notice) { - int rows = noticeService.insertNotice(notice); - if (rows <= 0) { - return R.fail(); - } - String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType()); - SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle()); - return R.ok(); - } - - /** - * 修改通知公告 - */ - @SaCheckPermission("system:notice:edit") - @Log(title = "通知公告", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysNoticeBo notice) { - return toAjax(noticeService.updateNotice(notice)); - } - - /** - * 删除通知公告 - * - * @param noticeIds 公告ID串 - */ - @SaCheckPermission("system:notice:remove") - @Log(title = "通知公告", businessType = BusinessType.DELETE) - @DeleteMapping("/{noticeIds}") - public R remove(@PathVariable Long[] noticeIds) { - return toAjax(noticeService.deleteNoticeByIds(noticeIds)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java deleted file mode 100644 index 24ddaff..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.service.ISysOssConfigService; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 对象存储配置 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/resource/oss/config") -public class SysOssConfigController extends BaseController { - - private final ISysOssConfigService ossConfigService; - - /** - * 查询对象存储配置列表 - */ - @SaCheckPermission("system:ossConfig:list") - @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { - return ossConfigService.queryPageList(bo, pageQuery); - } - - /** - * 获取对象存储配置详细信息 - * - * @param ossConfigId OSS配置ID - */ - @SaCheckPermission("system:ossConfig:list") - @GetMapping("/{ossConfigId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long ossConfigId) { - return R.ok(ossConfigService.queryById(ossConfigId)); - } - - /** - * 新增对象存储配置 - */ - @SaCheckPermission("system:ossConfig:add") - @Log(title = "对象存储配置", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(ossConfigService.insertByBo(bo)); - } - - /** - * 修改对象存储配置 - */ - @SaCheckPermission("system:ossConfig:edit") - @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(ossConfigService.updateByBo(bo)); - } - - /** - * 删除对象存储配置 - * - * @param ossConfigIds OSS配置ID串 - */ - @SaCheckPermission("system:ossConfig:remove") - @Log(title = "对象存储配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ossConfigIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ossConfigIds) { - return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); - } - - /** - * 状态修改 - */ - @SaCheckPermission("system:ossConfig:edit") - @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysOssConfigBo bo) { - return toAjax(ossConfigService.updateOssConfigStatus(bo)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java deleted file mode 100644 index 73ada3b..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.dromara.system.controller.system; - - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssUploadVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.service.ISysOssService; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import lombok.RequiredArgsConstructor; -import org.springframework.http.MediaType; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -/** - * 文件上传 控制层 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/resource/oss") -public class SysOssController extends BaseController { - - private final ISysOssService ossService; - - /** - * 查询OSS对象存储列表 - */ - @SaCheckPermission("system:oss:list") - @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { - return ossService.queryPageList(bo, pageQuery); - } - - /** - * 查询OSS对象基于id串 - * - * @param ossIds OSS对象ID串 - */ - @SaCheckPermission("system:oss:list") - @GetMapping("/listByIds/{ossIds}") - public R> listByIds(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ossIds) { - List list = ossService.listByIds(Arrays.asList(ossIds)); - return R.ok(list); - } - - /** - * 上传OSS对象存储 - * - * @param file 文件 - */ - @SaCheckPermission("system:oss:upload") - @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) - @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart("file") MultipartFile file) { - if (ObjectUtil.isNull(file)) { - return R.fail("上传文件不能为空"); - } - SysOssVo oss = ossService.upload(file); - SysOssUploadVo uploadVo = new SysOssUploadVo(); - uploadVo.setUrl(oss.getUrl()); - uploadVo.setFileName(oss.getOriginalName()); - uploadVo.setOssId(oss.getOssId().toString()); - return R.ok(uploadVo); - } - - /** - * 下载OSS对象 - * - * @param ossId OSS对象ID - */ - @SaCheckPermission("system:oss:download") - @GetMapping("/download/{ossId}") - public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { - ossService.download(ossId, response); - } - - /** - * 删除OSS对象存储 - * - * @param ossIds OSS对象ID串 - */ - @SaCheckPermission("system:oss:remove") - @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) - @DeleteMapping("/{ossIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ossIds) { - return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java deleted file mode 100644 index 782bcfc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.service.ISysPostService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * 岗位信息操作处理 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/post") -public class SysPostController extends BaseController { - - private final ISysPostService postService; - - /** - * 获取岗位列表 - */ - @SaCheckPermission("system:post:list") - @GetMapping("/list") - public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { - return postService.selectPagePostList(post, pageQuery); - } - - /** - * 导出岗位列表 - */ - @Log(title = "岗位管理", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:post:export") - @PostMapping("/export") - public void export(SysPostBo post, HttpServletResponse response) { - List list = postService.selectPostList(post); - ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response); - } - - /** - * 根据岗位编号获取详细信息 - * - * @param postId 岗位ID - */ - @SaCheckPermission("system:post:query") - @GetMapping(value = "/{postId}") - public R getInfo(@PathVariable Long postId) { - return R.ok(postService.selectPostById(postId)); - } - - /** - * 新增岗位 - */ - @SaCheckPermission("system:post:add") - @Log(title = "岗位管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysPostBo post) { - if (!postService.checkPostNameUnique(post)) { - return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } else if (!postService.checkPostCodeUnique(post)) { - return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } - return toAjax(postService.insertPost(post)); - } - - /** - * 修改岗位 - */ - @SaCheckPermission("system:post:edit") - @Log(title = "岗位管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysPostBo post) { - if (!postService.checkPostNameUnique(post)) { - return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } else if (!postService.checkPostCodeUnique(post)) { - return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } else if (UserConstants.POST_DISABLE.equals(post.getStatus()) - && postService.countUserPostById(post.getPostId()) > 0) { - return R.fail("该岗位下存在已分配用户，不能禁用!"); - } - return toAjax(postService.updatePost(post)); - } - - /** - * 删除岗位 - * - * @param postIds 岗位ID串 - */ - @SaCheckPermission("system:post:remove") - @Log(title = "岗位管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{postIds}") - public R remove(@PathVariable Long[] postIds) { - return toAjax(postService.deletePostByIds(postIds)); - } - - /** - * 获取岗位选择框列表 - * - * @param postIds 岗位ID串 - * @param deptId 部门id - */ - @SaCheckPermission("system:post:query") - @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { - List list = new ArrayList<>(); - if (ObjectUtil.isNotNull(deptId)) { - SysPostBo post = new SysPostBo(); - post.setDeptId(deptId); - list = postService.selectPostList(post); - } else if (postIds != null) { - list = postService.selectPostByIds(List.of(postIds)); - } - return R.ok(list); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java deleted file mode 100644 index 893b381..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.io.FileUtil; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.MimeTypeUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; -import org.dromara.system.domain.bo.SysUserProfileBo; -import org.dromara.system.domain.vo.AvatarVo; -import org.dromara.system.domain.vo.ProfileVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysOssService; -import org.dromara.system.service.ISysUserService; -import org.springframework.http.MediaType; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Arrays; - -/** - * 个人信息 业务处理 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController { - - private final ISysUserService userService; - private final ISysOssService ossService; - - /** - * 个人信息 - */ - @GetMapping - public R profile() { - SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); - ProfileVo profileVo = new ProfileVo(); - profileVo.setUser(user); - profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId())); - profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId())); - return R.ok(profileVo); - } - - /** - * 修改用户信息 - */ - @RepeatSubmit - @Log(title = "个人信息", businessType = BusinessType.UPDATE) - @PutMapping - public R updateProfile(@Validated @RequestBody SysUserProfileBo profile) { - SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class); - user.setUserId(LoginHelper.getUserId()); - String username = LoginHelper.getUsername(); - if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { - return R.fail("修改用户'" + username + "'失败，手机号码已存在"); - } - if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { - return R.fail("修改用户'" + username + "'失败，邮箱账号已存在"); - } - int rows = DataPermissionHelper.ignore(() -> userService.updateUserProfile(user)); - if (rows > 0) { - return R.ok(); - } - return R.fail("修改个人信息异常，请联系管理员"); - } - - /** - * 重置密码 - * - * @param bo 新旧密码 - */ - @RepeatSubmit - @ApiEncrypt - @Log(title = "个人信息", businessType = BusinessType.UPDATE) - @PutMapping("/updatePwd") - public R updatePwd(@Validated @RequestBody SysUserPasswordBo bo) { - SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); - String password = user.getPassword(); - if (!BCrypt.checkpw(bo.getOldPassword(), password)) { - return R.fail("修改密码失败，旧密码错误"); - } - if (BCrypt.checkpw(bo.getNewPassword(), password)) { - return R.fail("新密码不能与旧密码相同"); - } - - if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())) > 0) { - return R.ok(); - } - return R.fail("修改密码异常，请联系管理员"); - } - - /** - * 头像上传 - * - * @param avatarfile 用户头像 - */ - @RepeatSubmit - @Log(title = "用户头像", businessType = BusinessType.UPDATE) - @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R avatar(@RequestPart("avatarfile") MultipartFile avatarfile) { - if (!avatarfile.isEmpty()) { - String extension = FileUtil.extName(avatarfile.getOriginalFilename()); - if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { - return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); - } - SysOssVo oss = ossService.upload(avatarfile); - String avatar = oss.getUrl(); - if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) { - AvatarVo avatarVo = new AvatarVo(); - avatarVo.setImgUrl(avatar); - return R.ok(avatarVo); - } - } - return R.fail("上传图片异常，请联系管理员"); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java deleted file mode 100644 index d4a9dc8..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ /dev/null @@ -1,229 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.DeptTreeSelectVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 角色信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/role") -public class SysRoleController extends BaseController { - - private final ISysRoleService roleService; - private final ISysUserService userService; - private final ISysDeptService deptService; - - /** - * 获取角色信息列表 - */ - @SaCheckPermission("system:role:list") - @GetMapping("/list") - public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { - return roleService.selectPageRoleList(role, pageQuery); - } - - /** - * 导出角色信息列表 - */ - @Log(title = "角色管理", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:role:export") - @PostMapping("/export") - public void export(SysRoleBo role, HttpServletResponse response) { - List list = roleService.selectRoleList(role); - ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response); - } - - /** - * 根据角色编号获取详细信息 - * - * @param roleId 角色ID - */ - @SaCheckPermission("system:role:query") - @GetMapping(value = "/{roleId}") - public R getInfo(@PathVariable Long roleId) { - roleService.checkRoleDataScope(roleId); - return R.ok(roleService.selectRoleById(roleId)); - } - - /** - * 新增角色 - */ - @SaCheckPermission("system:role:add") - @Log(title = "角色管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysRoleBo role) { - roleService.checkRoleAllowed(role); - if (!roleService.checkRoleNameUnique(role)) { - return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } else if (!roleService.checkRoleKeyUnique(role)) { - return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); - } - return toAjax(roleService.insertRole(role)); - - } - - /** - * 修改保存角色 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysRoleBo role) { - roleService.checkRoleAllowed(role); - roleService.checkRoleDataScope(role.getRoleId()); - if (!roleService.checkRoleNameUnique(role)) { - return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } else if (!roleService.checkRoleKeyUnique(role)) { - return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); - } - - if (roleService.updateRole(role) > 0) { - roleService.cleanOnlineUserByRole(role.getRoleId()); - return R.ok(); - } - return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); - } - - /** - * 修改保存数据权限 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PutMapping("/dataScope") - public R dataScope(@RequestBody SysRoleBo role) { - roleService.checkRoleAllowed(role); - roleService.checkRoleDataScope(role.getRoleId()); - return toAjax(roleService.authDataScope(role)); - } - - /** - * 状态修改 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysRoleBo role) { - roleService.checkRoleAllowed(role); - roleService.checkRoleDataScope(role.getRoleId()); - return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus())); - } - - /** - * 删除角色 - * - * @param roleIds 角色ID串 - */ - @SaCheckPermission("system:role:remove") - @Log(title = "角色管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{roleIds}") - public R remove(@PathVariable Long[] roleIds) { - return toAjax(roleService.deleteRoleByIds(roleIds)); - } - - /** - * 获取角色选择框列表 - * - * @param roleIds 角色ID串 - */ - @SaCheckPermission("system:role:query") - @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] roleIds) { - return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); - } - - /** - * 查询已分配用户角色列表 - */ - @SaCheckPermission("system:role:list") - @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectAllocatedList(user, pageQuery); - } - - /** - * 查询未分配用户角色列表 - */ - @SaCheckPermission("system:role:list") - @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectUnallocatedList(user, pageQuery); - } - - /** - * 取消授权用户 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PutMapping("/authUser/cancel") - public R cancelAuthUser(@RequestBody SysUserRole userRole) { - return toAjax(roleService.deleteAuthUser(userRole)); - } - - /** - * 批量取消授权用户 - * - * @param roleId 角色ID - * @param userIds 用户ID串 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PutMapping("/authUser/cancelAll") - public R cancelAuthUserAll(Long roleId, Long[] userIds) { - return toAjax(roleService.deleteAuthUsers(roleId, userIds)); - } - - /** - * 批量选择用户授权 - * - * @param roleId 角色ID - * @param userIds 用户ID串 - */ - @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PutMapping("/authUser/selectAll") - public R selectAuthUserAll(Long roleId, Long[] userIds) { - roleService.checkRoleDataScope(roleId); - return toAjax(roleService.insertAuthUsers(roleId, userIds)); - } - - /** - * 获取对应角色部门树列表 - * - * @param roleId 角色ID - */ - @SaCheckPermission("system:role:list") - @GetMapping(value = "/deptTree/{roleId}") - public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { - DeptTreeSelectVo selectVo = new DeptTreeSelectVo(); - selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId)); - selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo())); - return R.ok(selectVo); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java deleted file mode 100644 index b0281cf..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.dromara.system.controller.system; - -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.service.ISysSocialService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 社会化关系 - * - * @author thiszhc - * @date 2023-06-16 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/social") -public class SysSocialController extends BaseController { - - private final ISysSocialService socialUserService; - - /** - * 查询社会化关系列表 - */ - @GetMapping("/list") - public R> list() { - return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId())); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java deleted file mode 100644 index 10c6777..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ /dev/null @@ -1,193 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import com.baomidou.lock.annotation.Lock4j; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysTenantService; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 租户管理 - * - * @author Michelle.Chung - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/tenant") -@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysTenantController extends BaseController { - - private final ISysTenantService tenantService; - - /** - * 查询租户列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:list") - @GetMapping("/list") - public TableDataInfo list(SysTenantBo bo, PageQuery pageQuery) { - return tenantService.queryPageList(bo, pageQuery); - } - - /** - * 导出租户列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:export") - @Log(title = "租户", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysTenantBo bo, HttpServletResponse response) { - List list = tenantService.queryList(bo); - ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response); - } - - /** - * 获取租户详细信息 - * - * @param id 主键 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(tenantService.queryById(id)); - } - - /** - * 新增租户 - */ - @ApiEncrypt - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:add") - @Log(title = "租户", businessType = BusinessType.INSERT) - @Lock4j - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { - if (!tenantService.checkCompanyNameUnique(bo)) { - return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); - } - return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo))); - } - - /** - * 修改租户 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { - tenantService.checkTenantAllowed(bo.getTenantId()); - if (!tenantService.checkCompanyNameUnique(bo)) { - return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); - } - return toAjax(tenantService.updateByBo(bo)); - } - - /** - * 状态修改 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysTenantBo bo) { - tenantService.checkTenantAllowed(bo.getTenantId()); - return toAjax(tenantService.updateTenantStatus(bo)); - } - - /** - * 删除租户 - * - * @param ids 主键串 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:remove") - @Log(title = "租户", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true)); - } - - /** - * 动态切换租户 - * - * @param tenantId 租户ID - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @GetMapping("/dynamic/{tenantId}") - public R dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) { - TenantHelper.setDynamic(tenantId, true); - return R.ok(); - } - - /** - * 清除动态租户 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @GetMapping("/dynamic/clear") - public R dynamicClear() { - TenantHelper.clearDynamic(); - return R.ok(); - } - - - /** - * 同步租户套餐 - * - * @param tenantId 租户id - * @param packageId 套餐id - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @GetMapping("/syncTenantPackage") - public R syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, - @NotNull(message = "套餐ID不能为空") Long packageId) { - return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId))); - } - - /** - * 同步租户字典 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @Log(title = "同步租户字典", businessType = BusinessType.INSERT) - @GetMapping("/syncTenantDict") - public R syncTenantDict() { - if (!TenantHelper.isEnable()) { - return R.fail("当前未开启租户模式"); - } - tenantService.syncTenantDict(); - return R.ok("同步租户字典成功"); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java deleted file mode 100644 index 4bfe597..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.service.ISysTenantPackageService; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 租户套餐管理 - * - * @author Michelle.Chung - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/tenant/package") -@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysTenantPackageController extends BaseController { - - private final ISysTenantPackageService tenantPackageService; - - /** - * 查询租户套餐列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:list") - @GetMapping("/list") - public TableDataInfo list(SysTenantPackageBo bo, PageQuery pageQuery) { - return tenantPackageService.queryPageList(bo, pageQuery); - } - - /** - * 查询租户套餐下拉选列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:list") - @GetMapping("/selectList") - public R> selectList() { - return R.ok(tenantPackageService.selectList()); - } - - /** - * 导出租户套餐列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:export") - @Log(title = "租户套餐", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysTenantPackageBo bo, HttpServletResponse response) { - List list = tenantPackageService.queryList(bo); - ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response); - } - - /** - * 获取租户套餐详细信息 - * - * @param packageId 主键 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:query") - @GetMapping("/{packageId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long packageId) { - return R.ok(tenantPackageService.queryById(packageId)); - } - - /** - * 新增租户套餐 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:add") - @Log(title = "租户套餐", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) { - if (!tenantPackageService.checkPackageNameUnique(bo)) { - return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); - } - return toAjax(tenantPackageService.insertByBo(bo)); - } - - /** - * 修改租户套餐 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:edit") - @Log(title = "租户套餐", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) { - if (!tenantPackageService.checkPackageNameUnique(bo)) { - return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); - } - return toAjax(tenantPackageService.updateByBo(bo)); - } - - /** - * 状态修改 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:edit") - @Log(title = "租户套餐", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysTenantPackageBo bo) { - return toAjax(tenantPackageService.updatePackageStatus(bo)); - } - - /** - * 删除租户套餐 - * - * @param packageIds 主键串 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:remove") - @Log(title = "租户套餐", businessType = BusinessType.DELETE) - @DeleteMapping("/{packageIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] packageIds) { - return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java deleted file mode 100644 index 36104d6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ /dev/null @@ -1,300 +0,0 @@ -package org.dromara.system.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.lang.tree.Tree; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.*; -import org.springframework.http.MediaType; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.List; - -/** - * 用户信息 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/user") -public class SysUserController extends BaseController { - - private final ISysUserService userService; - private final ISysRoleService roleService; - private final ISysPostService postService; - private final ISysDeptService deptService; - private final ISysTenantService tenantService; - - /** - * 获取用户列表 - */ - @SaCheckPermission("system:user:list") - @GetMapping("/list") - public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { - return userService.selectPageUserList(user, pageQuery); - } - - /** - * 导出用户列表 - */ - @Log(title = "用户管理", businessType = BusinessType.EXPORT) - @SaCheckPermission("system:user:export") - @PostMapping("/export") - public void export(SysUserBo user, HttpServletResponse response) { - List list = userService.selectUserExportList(user); - ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response); - } - - /** - * 导入数据 - * - * @param file 导入文件 - * @param updateSupport 是否更新已存在数据 - */ - @Log(title = "用户管理", businessType = BusinessType.IMPORT) - @SaCheckPermission("system:user:import") - @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { - ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); - return R.ok(result.getAnalysis()); - } - - /** - * 获取导入模板 - */ - @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) { - ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response); - } - - /** - * 获取用户信息 - * - * @return 用户信息 - */ - @GetMapping("/getInfo") - public R getInfo() { - UserInfoVo userInfoVo = new UserInfoVo(); - LoginUser loginUser = LoginHelper.getLoginUser(); - if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { - // 超级管理员 如果重新加载用户信息需清除动态租户 - TenantHelper.clearDynamic(); - } - SysUserVo user = userService.selectUserById(loginUser.getUserId()); - if (ObjectUtil.isNull(user)) { - return R.fail("没有权限访问用户数据!"); - } - userInfoVo.setUser(user); - userInfoVo.setPermissions(loginUser.getMenuPermission()); - userInfoVo.setRoles(loginUser.getRolePermission()); - return R.ok(userInfoVo); - } - - /** - * 根据用户编号获取详细信息 - * - * @param userId 用户ID - */ - @SaCheckPermission("system:user:query") - @GetMapping(value = {"/", "/{userId}"}) - public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { - userService.checkUserDataScope(userId); - SysUserInfoVo userInfoVo = new SysUserInfoVo(); - SysRoleBo roleBo = new SysRoleBo(); - roleBo.setStatus(UserConstants.ROLE_NORMAL); - List roles = roleService.selectRoleList(roleBo); - userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); - if (ObjectUtil.isNotNull(userId)) { - SysUserVo sysUser = userService.selectUserById(userId); - userInfoVo.setUser(sysUser); - userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); - Long deptId = sysUser.getDeptId(); - if (ObjectUtil.isNotNull(deptId)) { - SysPostBo postBo = new SysPostBo(); - postBo.setDeptId(deptId); - userInfoVo.setPosts(postService.selectPostList(postBo)); - userInfoVo.setPostIds(postService.selectPostListByUserId(userId)); - } - } - return R.ok(userInfoVo); - } - - /** - * 新增用户 - */ - @SaCheckPermission("system:user:add") - @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping - public R add(@Validated @RequestBody SysUserBo user) { - deptService.checkDeptDataScope(user.getDeptId()); - if (!userService.checkUserNameUnique(user)) { - return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { - return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); - } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { - return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - if (TenantHelper.isEnable()) { - if (!tenantService.checkAccountBalance(TenantHelper.getTenantId())) { - return R.fail("当前租户下用户名额不足，请联系管理员"); - } - } - user.setPassword(BCrypt.hashpw(user.getPassword())); - return toAjax(userService.insertUser(user)); - } - - /** - * 修改用户 - */ - @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@Validated @RequestBody SysUserBo user) { - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - deptService.checkDeptDataScope(user.getDeptId()); - if (!userService.checkUserNameUnique(user)) { - return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { - return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { - return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - return toAjax(userService.updateUser(user)); - } - - /** - * 删除用户 - * - * @param userIds 角色ID串 - */ - @SaCheckPermission("system:user:remove") - @Log(title = "用户管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{userIds}") - public R remove(@PathVariable Long[] userIds) { - if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) { - return R.fail("当前用户不能删除"); - } - return toAjax(userService.deleteUserByIds(userIds)); - } - - /** - * 根据用户ID串批量获取用户基础信息 - * - * @param userIds 用户ID串 - * @param deptId 部门ID - */ - @SaCheckPermission("system:user:query") - @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] userIds, - @RequestParam(required = false) Long deptId) { - return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId)); - } - - /** - * 重置密码 - */ - @ApiEncrypt - @SaCheckPermission("system:user:resetPwd") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/resetPwd") - public R resetPwd(@RequestBody SysUserBo user) { - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - user.setPassword(BCrypt.hashpw(user.getPassword())); - return toAjax(userService.resetUserPwd(user.getUserId(), user.getPassword())); - } - - /** - * 状态修改 - */ - @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysUserBo user) { - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus())); - } - - /** - * 根据用户编号获取授权角色 - * - * @param userId 用户ID - */ - @SaCheckPermission("system:user:query") - @GetMapping("/authRole/{userId}") - public R authRole(@PathVariable Long userId) { - userService.checkUserDataScope(userId); - SysUserVo user = userService.selectUserById(userId); - List roles = roleService.selectRolesAuthByUserId(userId); - SysUserInfoVo userInfoVo = new SysUserInfoVo(); - userInfoVo.setUser(user); - userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); - return R.ok(userInfoVo); - } - - /** - * 用户授权角色 - * - * @param userId 用户Id - * @param roleIds 角色ID串 - */ - @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.GRANT) - @PutMapping("/authRole") - public R insertAuthRole(Long userId, Long[] roleIds) { - userService.checkUserDataScope(userId); - userService.insertUserAuth(userId, roleIds); - return R.ok(); - } - - /** - * 获取部门树列表 - */ - @SaCheckPermission("system:user:list") - @GetMapping("/deptTree") - public R>> deptTree(SysDeptBo dept) { - return R.ok(deptService.selectDeptTreeList(dept)); - } - - /** - * 获取部门下的所有用户信息 - */ - @SaCheckPermission("system:user:list") - @GetMapping("/list/dept/{deptId}") - public R> listByDept(@PathVariable @NotNull Long deptId) { - return R.ok(userService.selectUserListByDept(deptId)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java deleted file mode 100644 index e398a20..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.system.domain; - -import org.dromara.common.core.utils.StringUtils; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 缓存信息 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class SysCache { - - /** - * 缓存名称 - */ - private String cacheName = ""; - - /** - * 缓存键名 - */ - private String cacheKey = ""; - - /** - * 缓存内容 - */ - private String cacheValue = ""; - - /** - * 备注 - */ - private String remark = ""; - - public SysCache(String cacheName, String remark) { - this.cacheName = cacheName; - this.remark = remark; - } - - public SysCache(String cacheName, String cacheKey, String cacheValue) { - this.cacheName = StringUtils.replace(cacheName, ":", ""); - this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); - this.cacheValue = cacheValue; - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java deleted file mode 100644 index 0f681be..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.dromara.system.domain; - -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 授权管理对象 sys_client - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_client") -public class SysClient extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "id") - private Long id; - - /** - * 客户端id - */ - private String clientId; - - /** - * 客户端key - */ - private String clientKey; - - /** - * 客户端秘钥 - */ - private String clientSecret; - - /** - * 授权类型 - */ - private String grantType; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * token活跃超时时间 - */ - private Long activeTimeout; - - /** - * token固定超时时间 - */ - private Long timeout; - - /** - * 状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java deleted file mode 100644 index 6fcb88f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 参数配置表 sys_config - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_config") -public class SysConfig extends TenantEntity { - - /** - * 参数主键 - */ - @TableId(value = "config_id") - private Long configId; - - /** - * 参数名称 - */ - private String configName; - - /** - * 参数键名 - */ - private String configKey; - - /** - * 参数键值 - */ - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - private String configType; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java deleted file mode 100644 index 48ca682..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; - -import java.io.Serial; - -/** - * 部门表 sys_dept - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_dept") -public class SysDept extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 部门ID - */ - @TableId(value = "dept_id") - private Long deptId; - - /** - * 父部门ID - */ - private Long parentId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 部门类别编码 - */ - private String deptCategory; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 负责人 - */ - private Long leader; - - /** - * 联系电话 - */ - private String phone; - - /** - * 邮箱 - */ - private String email; - - /** - * 部门状态:0正常,1停用 - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - - /** - * 祖级列表 - */ - private String ancestors; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java deleted file mode 100644 index 6884fc2..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典数据表 sys_dict_data - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_dict_data") -public class SysDictData extends TenantEntity { - - /** - * 字典编码 - */ - @TableId(value = "dict_code") - private Long dictCode; - - /** - * 字典排序 - */ - private Integer dictSort; - - /** - * 字典标签 - */ - private String dictLabel; - - /** - * 字典键值 - */ - private String dictValue; - - /** - * 字典类型 - */ - private String dictType; - - /** - * 样式属性（其他样式扩展） - */ - private String cssClass; - - /** - * 表格字典样式 - */ - private String listClass; - - /** - * 是否默认（Y是 N否） - */ - private String isDefault; - - /** - * 备注 - */ - private String remark; - - public boolean getDefault() { - return UserConstants.YES.equals(this.isDefault); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java deleted file mode 100644 index 955af85..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典类型表 sys_dict_type - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_dict_type") -public class SysDictType extends TenantEntity { - - /** - * 字典主键 - */ - @TableId(value = "dict_id") - private Long dictId; - - /** - * 字典名称 - */ - private String dictName; - - /** - * 字典类型 - */ - private String dictType; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java deleted file mode 100644 index c57dc0a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 系统访问记录表 sys_logininfor - * - * @author Lion Li - */ - -@Data -@TableName("sys_logininfor") -public class SysLogininfor implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "info_id") - private Long infoId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 登录状态 0成功 1失败 - */ - private String status; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 提示消息 - */ - private String msg; - - /** - * 访问时间 - */ - private Date loginTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java deleted file mode 100644 index 6b498a3..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.ArrayList; -import java.util.List; - -/** - * 菜单权限表 sys_menu - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_menu") -public class SysMenu extends BaseEntity { - - /** - * 菜单ID - */ - @TableId(value = "menu_id") - private Long menuId; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 菜单名称 - */ - private String menuName; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 路由地址 - */ - private String path; - - /** - * 组件路径 - */ - private String component; - - /** - * 路由参数 - */ - private String queryParam; - - /** - * 是否为外链（0是 1否） - */ - private String isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 类型（M目录 C菜单 F按钮） - */ - private String menuType; - - /** - * 显示状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限字符串 - */ - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 备注 - */ - private String remark; - - /** - * 父菜单名称 - */ - @TableField(exist = false) - private String parentName; - - /** - * 子菜单 - */ - @TableField(exist = false) - private List children = new ArrayList<>(); - - /** - * 获取路由名称 - */ - public String getRouteName() { - String routerName = StringUtils.capitalize(path); - // 非外链并且是一级目录（类型为目录） - if (isMenuFrame()) { - routerName = StringUtils.EMPTY; - } - return routerName; - } - - /** - * 获取路由地址 - */ - public String getRouterPath() { - String routerPath = this.path; - // 内链打开外网方式 - if (getParentId() != 0L && isInnerLink()) { - routerPath = innerLinkReplaceEach(routerPath); - } - // 非外链并且是一级目录（类型为目录） - if (0L == getParentId() && UserConstants.TYPE_DIR.equals(getMenuType()) - && UserConstants.NO_FRAME.equals(getIsFrame())) { - routerPath = "/" + this.path; - } - // 非外链并且是一级目录（类型为菜单） - else if (isMenuFrame()) { - routerPath = "/"; - } - return routerPath; - } - - /** - * 获取组件信息 - */ - public String getComponentInfo() { - String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(this.component) && !isMenuFrame()) { - component = this.component; - } else if (StringUtils.isEmpty(this.component) && getParentId() != 0L && isInnerLink()) { - component = UserConstants.INNER_LINK; - } else if (StringUtils.isEmpty(this.component) && isParentView()) { - component = UserConstants.PARENT_VIEW; - } - return component; - } - - /** - * 是否为菜单内部跳转 - */ - public boolean isMenuFrame() { - return getParentId() == 0L && UserConstants.TYPE_MENU.equals(menuType) && isFrame.equals(UserConstants.NO_FRAME); - } - - /** - * 是否为内链组件 - */ - public boolean isInnerLink() { - return isFrame.equals(UserConstants.NO_FRAME) && StringUtils.ishttp(path); - } - - /** - * 是否为parent_view组件 - */ - public boolean isParentView() { - return getParentId() != 0L && UserConstants.TYPE_DIR.equals(menuType); - } - - /** - * 内链域名特殊字符替换 - */ - public static String innerLinkReplaceEach(String path) { - return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"}, - new String[]{"", "", "", "/", "/"}); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java deleted file mode 100644 index bfcc2bc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 通知公告表 sys_notice - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_notice") -public class SysNotice extends TenantEntity { - - /** - * 公告ID - */ - @TableId(value = "notice_id") - private Long noticeId; - - /** - * 公告标题 - */ - private String noticeTitle; - - /** - * 公告类型（1通知 2公告） - */ - private String noticeType; - - /** - * 公告内容 - */ - private String noticeContent; - - /** - * 公告状态（0正常 1关闭） - */ - private String status; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java deleted file mode 100644 index 41a8c59..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志记录表 oper_log - * - * @author Lion Li - */ - -@Data -@TableName("sys_oper_log") -public class SysOperLog implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - @TableId(value = "oper_id") - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 操作模块 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 请求方法 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求url - */ - private String operUrl; - - /** - * 操作地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java deleted file mode 100644 index af88898..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * OSS对象存储对象 - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_oss") -public class SysOss extends TenantEntity { - - /** - * 对象存储主键 - */ - @TableId(value = "oss_id") - private Long ossId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 原名 - */ - private String originalName; - - /** - * 文件后缀名 - */ - private String fileSuffix; - - /** - * URL地址 - */ - private String url; - - /** - * 服务商 - */ - private String service; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java deleted file mode 100644 index 4b67d63..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 对象存储配置对象 sys_oss_config - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_oss_config") -public class SysOssConfig extends BaseEntity { - - /** - * 主键 - */ - @TableId(value = "oss_config_id") - private Long ossConfigId; - - /** - * 配置key - */ - private String configKey; - - /** - * accessKey - */ - private String accessKey; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 桶名称 - */ - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（0否 1是） - */ - private String isHttps; - - /** - * 域 - */ - private String region; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - private String accessPolicy; -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java deleted file mode 100644 index 2c985da..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 岗位表 sys_post - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_post") -public class SysPost extends TenantEntity { - - /** - * 岗位序号 - */ - @TableId(value = "post_id") - private Long postId; - - /** - * 部门id - */ - private Long deptId; - - /** - * 岗位编码 - */ - private String postCode; - - /** - * 岗位名称 - */ - private String postName; - - /** - * 岗位类别编码 - */ - private String postCategory; - - /** - * 岗位排序 - */ - private Integer postSort; - - /** - * 状态（0正常 1停用） - */ - private String status; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java deleted file mode 100644 index 2b42464..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * 角色表 sys_role - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName("sys_role") -public class SysRole extends TenantEntity { - - /** - * 角色ID - */ - @TableId(value = "role_id") - private Long roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 角色权限 - */ - private String roleKey; - - /** - * 角色排序 - */ - private Integer roleSort; - - /** - * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） - */ - private String dataScope; - - /** - * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） - */ - private Boolean menuCheckStrictly; - - /** - * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） - */ - private Boolean deptCheckStrictly; - - /** - * 角色状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - - /** - * 备注 - */ - private String remark; - - public SysRole(Long roleId) { - this.roleId = roleId; - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java deleted file mode 100644 index ba77694..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * 角色和部门关联 sys_role_dept - * - * @author Lion Li - */ - -@Data -@TableName("sys_role_dept") -public class SysRoleDept { - - /** - * 角色ID - */ - @TableId(type = IdType.INPUT) - private Long roleId; - - /** - * 部门ID - */ - private Long deptId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java deleted file mode 100644 index ba28f17..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * 角色和菜单关联 sys_role_menu - * - * @author Lion Li - */ - -@Data -@TableName("sys_role_menu") -public class SysRoleMenu { - - /** - * 角色ID - */ - @TableId(type = IdType.INPUT) - private Long roleId; - - /** - * 菜单ID - */ - private Long menuId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java deleted file mode 100644 index 10f2936..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; - -import java.io.Serial; - -/** - * 社会化关系对象 sys_social - * - * @author thiszhc - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_social") -public class SysSocial extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 用户ID - */ - private Long userId; - - /** - * 的唯一ID - */ - private String authId; - - /** - * 用户来源 - */ - private String source; - - /** - * 用户的授权令牌 - */ - private String accessToken; - - /** - * 用户的授权令牌的有效期，部分平台可能没有 - */ - private int expireIn; - - /** - * 刷新令牌，部分平台可能没有 - */ - private String refreshToken; - - /** - * 用户的 open id - */ - private String openId; - - /** - * 授权的第三方账号 - */ - private String userName; - - /** - * 授权的第三方昵称 - */ - private String nickName; - - /** - * 授权的第三方邮箱 - */ - private String email; - - /** - * 授权的第三方头像地址 - */ - private String avatar; - - /** - * 平台的授权信息，部分平台可能没有 - */ - private String accessCode; - - /** - * 用户的 unionid - */ - private String unionId; - - /** - * 授予的权限，部分平台可能没有 - */ - private String scope; - - /** - * 个别平台的授权信息，部分平台可能没有 - */ - private String tokenType; - - /** - * id token，部分平台可能没有 - */ - private String idToken; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macAlgorithm; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macKey; - - /** - * 用户的授权code，部分平台可能没有 - */ - private String code; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthToken; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthTokenSecret; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java deleted file mode 100644 index a564a40..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; -import java.util.Date; - -/** - * 租户对象 sys_tenant - * - * @author Michelle.Chung - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant") -public class SysTenant extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "id") - private Long id; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 联系人 - */ - private String contactUserName; - - /** - * 联系电话 - */ - private String contactPhone; - - /** - * 企业名称 - */ - private String companyName; - - /** - * 统一社会信用代码 - */ - private String licenseNumber; - - /** - * 地址 - */ - private String address; - - /** - * 域名 - */ - private String domain; - - /** - * 企业简介 - */ - private String intro; - - /** - * 备注 - */ - private String remark; - - /** - * 租户套餐编号 - */ - private Long packageId; - - /** - * 过期时间 - */ - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java deleted file mode 100644 index f7e423f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户套餐对象 sys_tenant_package - * - * @author Michelle.Chung - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant_package") -public class SysTenantPackage extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户套餐id - */ - @TableId(value = "package_id") - private Long packageId; - /** - * 套餐名称 - */ - private String packageName; - /** - * 关联菜单id - */ - private String menuIds; - /** - * 备注 - */ - private String remark; - /** - * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） - */ - private Boolean menuCheckStrictly; - /** - * 状态（0正常 1停用） - */ - private String status; - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java deleted file mode 100644 index 8dde40b..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * 用户对象 sys_user - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName("sys_user") -public class SysUser extends TenantEntity { - - /** - * 用户ID - */ - @TableId(value = "user_id") - private Long userId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 用户昵称 - */ - private String nickName; - - /** - * 用户类型（sys_user系统用户） - */ - private String userType; - - /** - * 用户邮箱 - */ - private String email; - - /** - * 手机号码 - */ - private String phonenumber; - - /** - * 用户性别 - */ - private String sex; - - /** - * 用户头像 - */ - private Long avatar; - - /** - * 密码 - */ - @TableField( - insertStrategy = FieldStrategy.NOT_EMPTY, - updateStrategy = FieldStrategy.NOT_EMPTY, - whereStrategy = FieldStrategy.NOT_EMPTY - ) - private String password; - - /** - * 帐号状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - - /** - * 最后登录IP - */ - private String loginIp; - - /** - * 最后登录时间 - */ - private Date loginDate; - - /** - * 备注 - */ - private String remark; - - - public SysUser(Long userId) { - this.userId = userId; - } - - public boolean isSuperAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.userId); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java deleted file mode 100644 index ba30eb6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.dromara.system.domain; - -import lombok.Data; - -/** - * 当前在线会话 - * - * @author Lion Li - */ -@Data -public class SysUserOnline { - - /** - * 会话编号 - */ - private String tokenId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 用户名称 - */ - private String userName; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地址 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 登录时间 - */ - private Long loginTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java deleted file mode 100644 index 119c117..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * 用户和岗位关联 sys_user_post - * - * @author Lion Li - */ - -@Data -@TableName("sys_user_post") -public class SysUserPost { - - /** - * 用户ID - */ - @TableId(type = IdType.INPUT) - private Long userId; - - /** - * 岗位ID - */ - private Long postId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java deleted file mode 100644 index 0a50e80..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * 用户和角色关联 sys_user_role - * - * @author Lion Li - */ - -@Data -@TableName("sys_user_role") -public class SysUserRole { - - /** - * 用户ID - */ - @TableId(type = IdType.INPUT) - private Long userId; - - /** - * 角色ID - */ - private Long roleId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java deleted file mode 100644 index e5f5ffa..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import java.util.List; - -/** - * 授权管理业务对象 sys_client - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysClient.class, reverseConvertGenerate = false) -public class SysClientBo extends BaseEntity { - - /** - * id - */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 客户端id - */ - private String clientId; - - /** - * 客户端key - */ - @NotBlank(message = "客户端key不能为空", groups = { AddGroup.class, EditGroup.class }) - private String clientKey; - - /** - * 客户端秘钥 - */ - @NotBlank(message = "客户端秘钥不能为空", groups = { AddGroup.class, EditGroup.class }) - private String clientSecret; - - /** - * 授权类型 - */ - @NotNull(message = "授权类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private List grantTypeList; - - /** - * 授权类型 - */ - private String grantType; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * token活跃超时时间 - */ - private Long activeTimeout; - - /** - * token固定超时时间 - */ - private Long timeout; - - /** - * 状态（0正常 1停用） - */ - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java deleted file mode 100644 index 257935d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysConfig; - -/** - * 参数配置业务对象 sys_config - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false) -public class SysConfigBo extends BaseEntity { - - /** - * 参数主键 - */ - private Long configId; - - /** - * 参数名称 - */ - @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符") - private String configName; - - /** - * 参数键名 - */ - @NotBlank(message = "参数键名不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符") - private String configKey; - - /** - * 参数键值 - */ - @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符") - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - private String configType; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java deleted file mode 100644 index 5f64d6f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDept; - -/** - * 部门业务对象 sys_dept - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) -public class SysDeptBo extends BaseEntity { - - /** - * 部门id - */ - private Long deptId; - - /** - * 父部门ID - */ - private Long parentId; - - /** - * 部门名称 - */ - @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符") - private String deptName; - - /** - * 部门类别编码 - */ - @Size(min = 0, max = 100, message = "部门类别编码长度不能超过{max}个字符") - private String deptCategory; - - /** - * 显示顺序 - */ - @NotNull(message = "显示顺序不能为空") - private Integer orderNum; - - /** - * 负责人 - */ - private Long leader; - - /** - * 联系电话 - */ - @Size(min = 0, max = 11, message = "联系电话长度不能超过{max}个字符") - private String phone; - - /** - * 邮箱 - */ - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") - private String email; - - /** - * 部门状态（0正常 1停用） - */ - private String status; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java deleted file mode 100644 index 042946c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictData; - -/** - * 字典数据业务对象 sys_dict_data - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false) -public class SysDictDataBo extends BaseEntity { - - /** - * 字典编码 - */ - private Long dictCode; - - /** - * 字典排序 - */ - private Integer dictSort; - - /** - * 字典标签 - */ - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符") - private String dictLabel; - - /** - * 字典键值 - */ - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符") - private String dictValue; - - /** - * 字典类型 - */ - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符") - private String dictType; - - /** - * 样式属性（其他样式扩展） - */ - @Size(min = 0, max = 100, message = "样式属性长度不能超过{max}个字符") - private String cssClass; - - /** - * 表格回显样式 - */ - private String listClass; - - /** - * 是否默认（Y是 N否） - */ - private String isDefault; - - /** - * 创建部门 - */ - private Long createDept; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java deleted file mode 100644 index fcc1ac1..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictType; - -/** - * 字典类型业务对象 sys_dict_type - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false) -public class SysDictTypeBo extends BaseEntity { - - /** - * 字典主键 - */ - private Long dictId; - - /** - * 字典名称 - */ - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符") - private String dictName; - - /** - * 字典类型 - */ - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符") - @Pattern(regexp = RegexConstants.DICTIONARY_TYPE, message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") - private String dictType; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java deleted file mode 100644 index 4646162..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.system.domain.SysLogininfor; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 系统访问记录业务对象 sys_logininfor - * - * @author Michelle.Chung - */ - -@Data -@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false) -public class SysLogininforBo { - - /** - * 访问ID - */ - private Long infoId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 登录状态（0成功 1失败） - */ - private String status; - - /** - * 提示消息 - */ - private String msg; - - /** - * 访问时间 - */ - private Date loginTime; - - /** - * 请求参数 - */ - private Map params = new HashMap<>(); - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java deleted file mode 100644 index fbaafaa..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.dromara.system.domain.bo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysMenu; - -/** - * 菜单权限业务对象 sys_menu - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) -public class SysMenuBo extends BaseEntity { - - /** - * 菜单ID - */ - private Long menuId; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 菜单名称 - */ - @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符") - private String menuName; - - /** - * 显示顺序 - */ - @NotNull(message = "显示顺序不能为空") - private Integer orderNum; - - /** - * 路由地址 - */ - @Size(min = 0, max = 200, message = "路由地址不能超过{max}个字符") - private String path; - - /** - * 组件路径 - */ - @Size(min = 0, max = 200, message = "组件路径不能超过{max}个字符") - private String component; - - /** - * 路由参数 - */ - private String queryParam; - - /** - * 是否为外链（0是 1否） - */ - private String isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 菜单类型（M目录 C菜单 F按钮） - */ - @NotBlank(message = "菜单类型不能为空") - private String menuType; - - /** - * 显示状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限标识 - */ - @JsonInclude(JsonInclude.Include.NON_NULL) - @Size(min = 0, max = 100, message = "权限标识长度不能超过{max}个字符") - @Pattern(regexp = RegexConstants.PERMISSION_STRING, message = "权限标识必须符合 tool:build:list 格式") - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java deleted file mode 100644 index cdcc575..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysNotice; - -/** - * 通知公告业务对象 sys_notice - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false) -public class SysNoticeBo extends BaseEntity { - - /** - * 公告ID - */ - private Long noticeId; - - /** - * 公告标题 - */ - @Xss(message = "公告标题不能包含脚本字符") - @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符") - private String noticeTitle; - - /** - * 公告类型（1通知 2公告） - */ - private String noticeType; - - /** - * 公告内容 - */ - private String noticeContent; - - /** - * 公告状态（0正常 1关闭） - */ - private String status; - - /** - * 备注 - */ - private String remark; - - /** - * 创建人名称 - */ - private String createByName; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java deleted file mode 100644 index f16400a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.AutoMappers; -import lombok.Data; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 操作日志记录业务对象 sys_oper_log - * - * @author Michelle.Chung - * @date 2023-02-07 - */ - -@Data -@AutoMappers({ - @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), - @AutoMapper(target = OperLogEvent.class) -}) -public class SysOperLogBo { - - /** - * 日志主键 - */ - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 模块标题 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 方法名称 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求URL - */ - private String operUrl; - - /** - * 主机地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; - - /** - * 请求参数 - */ - private Map params = new HashMap<>(); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java deleted file mode 100644 index 7cb3104..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOss; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * OSS对象存储分页查询对象 sys_oss - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysOss.class, reverseConvertGenerate = false) -public class SysOssBo extends BaseEntity { - - /** - * ossId - */ - private Long ossId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 原名 - */ - private String originalName; - - /** - * 文件后缀名 - */ - private String fileSuffix; - - /** - * URL地址 - */ - private String url; - - /** - * 服务商 - */ - private String service; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java deleted file mode 100644 index 3dc4328..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOssConfig; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 对象存储配置业务对象 sys_oss_config - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) -public class SysOssConfigBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long ossConfigId; - - /** - * 配置key - */ - @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间") - private String configKey; - - /** - * accessKey - */ - @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间") - private String accessKey; - - /** - * 秘钥 - */ - @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间") - private String secretKey; - - /** - * 桶名称 - */ - @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间") - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间") - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（Y=是,N=否） - */ - private String isHttps; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 域 - */ - private String region; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class}) - private String accessPolicy; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java deleted file mode 100644 index 09805cd..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysPost; - -/** - * 岗位信息业务对象 sys_post - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysPost.class, reverseConvertGenerate = false) -public class SysPostBo extends BaseEntity { - - /** - * 岗位ID - */ - private Long postId; - - /** - * 部门id（单部门） - */ - @NotNull(message = "部门id不能为空") - private Long deptId; - - /** - * 归属部门id（部门树） - */ - private Long belongDeptId; - - /** - * 岗位编码 - */ - @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符") - private String postCode; - - /** - * 岗位名称 - */ - @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符") - private String postName; - - /** - * 岗位类别编码 - */ - @Size(min = 0, max = 100, message = "类别编码长度不能超过{max}个字符") - private String postCategory; - - /** - * 显示顺序 - */ - @NotNull(message = "显示顺序不能为空") - private Integer postSort; - - /** - * 状态（0正常 1停用） - */ - private String status; - - /** - * 备注 - */ - private String remark; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java deleted file mode 100644 index 0c8b4dc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysRole; - -/** - * 角色信息业务对象 sys_role - * - * @author Michelle.Chung - */ - -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysRole.class, reverseConvertGenerate = false) -public class SysRoleBo extends BaseEntity { - - /** - * 角色ID - */ - private Long roleId; - - /** - * 角色名称 - */ - @NotBlank(message = "角色名称不能为空") - @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符") - private String roleName; - - /** - * 角色权限字符串 - */ - @NotBlank(message = "角色权限字符串不能为空") - @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符") - private String roleKey; - - /** - * 显示顺序 - */ - @NotNull(message = "显示顺序不能为空") - private Integer roleSort; - - /** - * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） - */ - private String dataScope; - - /** - * 菜单树选择项是否关联显示 - */ - private Boolean menuCheckStrictly; - - /** - * 部门树选择项是否关联显示 - */ - private Boolean deptCheckStrictly; - - /** - * 角色状态（0正常 1停用） - */ - private String status; - - /** - * 备注 - */ - private String remark; - - /** - * 菜单组 - */ - private Long[] menuIds; - - /** - * 部门组（数据权限） - */ - private Long[] deptIds; - - public SysRoleBo(Long roleId) { - this.roleId = roleId; - } - - public boolean isSuperAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.roleId); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java deleted file mode 100644 index cede1e9..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.system.domain.SysSocial; - -/** - * 社会化关系业务对象 sys_social - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSocial.class, reverseConvertGenerate = false) -public class SysSocialBo extends TenantEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 认证唯一ID - */ - @NotBlank(message = "认证唯一ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private String authId; - - /** - * 用户来源 - */ - @NotBlank(message = "用户来源不能为空", groups = { AddGroup.class, EditGroup.class }) - private String source; - - /** - * 用户的授权令牌 - */ - @NotBlank(message = "用户的授权令牌不能为空", groups = { AddGroup.class, EditGroup.class }) - private String accessToken; - - /** - * 用户的授权令牌的有效期，部分平台可能没有 - */ - private int expireIn; - - /** - * 刷新令牌，部分平台可能没有 - */ - private String refreshToken; - - /** - * 平台唯一id - */ - private String openId; - - /** - * 用户的 ID - */ - @NotBlank(message = "用户的ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long userId; - - /** - * 平台的授权信息，部分平台可能没有 - */ - private String accessCode; - - /** - * 用户的 unionid - */ - private String unionId; - - /** - * 授予的权限，部分平台可能没有 - */ - private String scope; - - /** - * 授权的第三方账号 - */ - private String userName; - - /** - * 授权的第三方昵称 - */ - private String nickName; - - /** - * 授权的第三方邮箱 - */ - private String email; - - /** - * 授权的第三方头像地址 - */ - private String avatar; - - /** - * 个别平台的授权信息，部分平台可能没有 - */ - private String tokenType; - - /** - * id token，部分平台可能没有 - */ - private String idToken; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macAlgorithm; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macKey; - - /** - * 用户的授权code，部分平台可能没有 - */ - private String code; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthToken; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthTokenSecret; - - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java deleted file mode 100644 index e3ac642..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenant; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import java.util.Date; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户业务对象 sys_tenant - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false) -public class SysTenantBo extends BaseEntity { - - /** - * id - */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 联系人 - */ - @NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class }) - private String contactUserName; - - /** - * 联系电话 - */ - @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) - private String contactPhone; - - /** - * 企业名称 - */ - @NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String companyName; - - /** - * 用户名（创建系统用户） - */ - @NotBlank(message = "用户名不能为空", groups = { AddGroup.class }) - private String username; - - /** - * 密码（创建系统用户） - */ - @NotBlank(message = "密码不能为空", groups = { AddGroup.class }) - private String password; - - /** - * 统一社会信用代码 - */ - private String licenseNumber; - - /** - * 地址 - */ - private String address; - - /** - * 域名 - */ - private String domain; - - /** - * 企业简介 - */ - private String intro; - - /** - * 备注 - */ - private String remark; - - /** - * 租户套餐编号 - */ - @NotNull(message = "租户套餐不能为空", groups = { AddGroup.class }) - private Long packageId; - - /** - * 过期时间 - */ - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java deleted file mode 100644 index eecbc9f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenantPackage; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.AutoMapping; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户套餐业务对象 sys_tenant_package - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysTenantPackage.class, reverseConvertGenerate = false) -public class SysTenantPackageBo extends BaseEntity { - - /** - * 租户套餐id - */ - @NotNull(message = "租户套餐id不能为空", groups = { EditGroup.class }) - private Long packageId; - - /** - * 套餐名称 - */ - @NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String packageName; - - /** - * 关联菜单id - */ - @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") - private Long[] menuIds; - - /** - * 备注 - */ - private String remark; - - /** - * 菜单树选择项是否关联显示 - */ - private Boolean menuCheckStrictly; - - /** - * 状态（0正常 1停用） - */ - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java deleted file mode 100644 index 7ad2759..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.dromara.system.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysUser; - -/** - * 用户信息业务对象 sys_user - * - * @author Michelle.Chung - */ - -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysUser.class, reverseConvertGenerate = false) -public class SysUserBo extends BaseEntity { - - /** - * 用户ID - */ - private Long userId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 用户账号 - */ - @Xss(message = "用户账号不能包含脚本字符") - @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符") - private String userName; - - /** - * 用户昵称 - */ - @Xss(message = "用户昵称不能包含脚本字符") - @NotBlank(message = "用户昵称不能为空") - @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") - private String nickName; - - /** - * 用户类型（sys_user系统用户） - */ - private String userType; - - /** - * 用户邮箱 - */ - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") - private String email; - - /** - * 手机号码 - */ - private String phonenumber; - - /** - * 用户性别（0男 1女 2未知） - */ - private String sex; - - /** - * 密码 - */ - private String password; - - /** - * 帐号状态（0正常 1停用） - */ - private String status; - - /** - * 备注 - */ - private String remark; - - /** - * 角色组 - */ - @Size(min = 1, message = "用户角色不能为空") - private Long[] roleIds; - - /** - * 岗位组 - */ - private Long[] postIds; - - /** - * 数据权限 当前角色ID - */ - private Long roleId; - - /** - * 排除不查询的用户(工作流用) - */ - private String excludeUserIds; - - public SysUserBo(Long userId) { - this.userId = userId; - } - - public boolean isSuperAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.userId); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java deleted file mode 100644 index 8615fcd..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 用户密码修改bo - */ -@Data -public class SysUserPasswordBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 旧密码 - */ - @NotBlank(message = "旧密码不能为空") - private String oldPassword; - - /** - * 新密码 - */ - @NotBlank(message = "新密码不能为空") - private String newPassword; -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java deleted file mode 100644 index 846dd79..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.dromara.system.domain.bo; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; - -/** - * 个人信息业务处理 - * - * @author Michelle.Chung - */ - -@Data -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SysUserProfileBo extends BaseEntity { - - /** - * 用户昵称 - */ - @Xss(message = "用户昵称不能包含脚本字符") - @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") - private String nickName; - - /** - * 用户邮箱 - */ - @Sensitive(strategy = SensitiveStrategy.EMAIL) - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") - private String email; - - /** - * 手机号码 - */ - @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") - @Sensitive(strategy = SensitiveStrategy.PHONE) - private String phonenumber; - - /** - * 用户性别（0男 1女 2未知） - */ - private String sex; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java deleted file mode 100644 index 46c020b..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -/** - * 用户头像信息 - * - * @author Michelle.Chung - */ -@Data -public class AvatarVo { - - /** - * 头像地址 - */ - private String imgUrl; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java deleted file mode 100644 index f827cba..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -import java.util.List; -import java.util.Map; -import java.util.Properties; - -/** - * 缓存监控列表信息 - * - * @author Michelle.Chung - */ -@Data -public class CacheListInfoVo { - - private Properties info; - - private Long dbSize; - - private List> commandStats; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java deleted file mode 100644 index 6f7db28..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.system.domain.vo; - -import cn.hutool.core.lang.tree.Tree; -import lombok.Data; - -import java.util.List; - -/** - * 角色部门列表树信息 - * - * @author Michelle.Chung - */ -@Data -public class DeptTreeSelectVo { - - /** - * 选中部门列表 - */ - private List checkedKeys; - - /** - * 下拉树结构列表 - */ - private List> depts; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java deleted file mode 100644 index 0724538..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.system.domain.vo; - -import cn.hutool.core.lang.tree.Tree; -import lombok.Data; - -import java.util.List; - -/** - * 角色菜单列表树信息 - * - * @author Michelle.Chung - */ -@Data -public class MenuTreeSelectVo { - - /** - * 选中菜单列表 - */ - private List checkedKeys; - - /** - * 菜单下拉树结构列表 - */ - private List> menus; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java deleted file mode 100644 index f720cd7..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.system.domain.vo; - -import org.dromara.common.core.utils.StringUtils; -import lombok.Data; - -/** - * 路由显示信息 - * - * @author ruoyi - */ - -@Data -public class MetaVo { - - /** - * 设置该路由在侧边栏和面包屑中展示的名字 - */ - private String title; - - /** - * 设置该路由的图标，对应路径src/assets/icons/svg - */ - private String icon; - - /** - * 设置为true，则不会被 缓存 - */ - private boolean noCache; - - /** - * 内链地址（http(s)://开头） - */ - private String link; - - public MetaVo(String title, String icon) { - this.title = title; - this.icon = icon; - } - - public MetaVo(String title, String icon, boolean noCache) { - this.title = title; - this.icon = icon; - this.noCache = noCache; - } - - public MetaVo(String title, String icon, String link) { - this.title = title; - this.icon = icon; - this.link = link; - } - - public MetaVo(String title, String icon, boolean noCache, String link) { - this.title = title; - this.icon = icon; - this.noCache = noCache; - if (StringUtils.ishttp(link)) { - this.link = link; - } - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java deleted file mode 100644 index c047651..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -/** - * 用户个人信息 - * - * @author Michelle.Chung - */ -@Data -public class ProfileVo { - - /** - * 用户信息 - */ - private SysUserVo user; - - /** - * 用户所属角色组 - */ - private String roleGroup; - - /** - * 用户所属岗位组 - */ - private String postGroup; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java deleted file mode 100644 index 0d576ef..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -import java.util.List; - -/** - * 路由配置信息 - * - * @author Lion Li - */ -@Data -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo { - - /** - * 路由名字 - */ - private String name; - - /** - * 路由地址 - */ - private String path; - - /** - * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 - */ - private boolean hidden; - - /** - * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 - */ - private String redirect; - - /** - * 组件地址 - */ - private String component; - - /** - * 路由参数：如 {"id": 1, "name": "ry"} - */ - private String query; - - /** - * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 - */ - private Boolean alwaysShow; - - /** - * 其他元素 - */ - private MetaVo meta; - - /** - * 子路由 - */ - private List children; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java deleted file mode 100644 index 34f24eb..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.dromara.system.domain.vo; - -import org.dromara.system.domain.SysClient; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - - -/** - * 授权管理视图对象 sys_client - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysClient.class) -public class SysClientVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ExcelProperty(value = "id") - private Long id; - - /** - * 客户端id - */ - @ExcelProperty(value = "客户端id") - private String clientId; - - /** - * 客户端key - */ - @ExcelProperty(value = "客户端key") - private String clientKey; - - /** - * 客户端秘钥 - */ - @ExcelProperty(value = "客户端秘钥") - private String clientSecret; - - /** - * 授权类型 - */ - @ExcelProperty(value = "授权类型") - private List grantTypeList; - - /** - * 授权类型 - */ - private String grantType; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * token活跃超时时间 - */ - @ExcelProperty(value = "token活跃超时时间") - private Long activeTimeout; - - /** - * token固定超时时间 - */ - @ExcelProperty(value = "token固定超时时间") - private Long timeout; - - /** - * 状态（0正常 1停用） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java deleted file mode 100644 index f896000..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysConfig; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 参数配置视图对象 sys_config - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysConfig.class) -public class SysConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 参数主键 - */ - @ExcelProperty(value = "参数主键") - private Long configId; - - /** - * 参数名称 - */ - @ExcelProperty(value = "参数名称") - private String configName; - - /** - * 参数键名 - */ - @ExcelProperty(value = "参数键名") - private String configKey; - - /** - * 参数键值 - */ - @ExcelProperty(value = "参数键值") - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") - private String configType; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java deleted file mode 100644 index c56fb09..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDept; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 部门视图对象 sys_dept - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysDept.class) -public class SysDeptVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 部门id - */ - @ExcelProperty(value = "部门id") - private Long deptId; - - /** - * 父部门id - */ - private Long parentId; - - /** - * 父部门名称 - */ - private String parentName; - - /** - * 祖级列表 - */ - private String ancestors; - - /** - * 部门名称 - */ - @ExcelProperty(value = "部门名称") - private String deptName; - - /** - * 部门类别编码 - */ - @ExcelProperty(value = "部门类别编码") - private String deptCategory; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 负责人ID - */ - private Long leader; - - /** - * 负责人 - */ - @ExcelProperty(value = "负责人") - private String leaderName; - - /** - * 联系电话 - */ - @ExcelProperty(value = "联系电话") - private String phone; - - /** - * 邮箱 - */ - @ExcelProperty(value = "邮箱") - private String email; - - /** - * 部门状态（0正常 1停用） - */ - @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java deleted file mode 100644 index 83ea619..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictData; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 字典数据视图对象 sys_dict_data - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysDictData.class) -public class SysDictDataVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 字典编码 - */ - @ExcelProperty(value = "字典编码") - private Long dictCode; - - /** - * 字典排序 - */ - @ExcelProperty(value = "字典排序") - private Integer dictSort; - - /** - * 字典标签 - */ - @ExcelProperty(value = "字典标签") - private String dictLabel; - - /** - * 字典键值 - */ - @ExcelProperty(value = "字典键值") - private String dictValue; - - /** - * 字典类型 - */ - @ExcelProperty(value = "字典类型") - private String dictType; - - /** - * 样式属性（其他样式扩展） - */ - private String cssClass; - - /** - * 表格回显样式 - */ - private String listClass; - - /** - * 是否默认（Y是 N否） - */ - @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") - private String isDefault; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java deleted file mode 100644 index e6a184f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictType; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 字典类型视图对象 sys_dict_type - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysDictType.class) -public class SysDictTypeVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 字典主键 - */ - @ExcelProperty(value = "字典主键") - private Long dictId; - - /** - * 字典名称 - */ - @ExcelProperty(value = "字典名称") - private String dictName; - - /** - * 字典类型 - */ - @ExcelProperty(value = "字典类型") - private String dictType; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java deleted file mode 100644 index de19aea..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.dromara.system.domain.vo; - -import java.util.Date; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysLogininfor; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - - -/** - * 系统访问记录视图对象 sys_logininfor - * - * @author Michelle.Chung - * @date 2023-02-07 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysLogininfor.class) -public class SysLogininforVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 访问ID - */ - @ExcelProperty(value = "序号") - private Long infoId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 用户账号 - */ - @ExcelProperty(value = "用户账号") - private String userName; - - /** - * 客户端 - */ - @ExcelProperty(value = "客户端") - private String clientKey; - - /** - * 设备类型 - */ - @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_device_type") - private String deviceType; - - /** - * 登录状态（0成功 1失败） - */ - @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") - private String status; - - /** - * 登录IP地址 - */ - @ExcelProperty(value = "登录地址") - private String ipaddr; - - /** - * 登录地点 - */ - @ExcelProperty(value = "登录地点") - private String loginLocation; - - /** - * 浏览器类型 - */ - @ExcelProperty(value = "浏览器") - private String browser; - - /** - * 操作系统 - */ - @ExcelProperty(value = "操作系统") - private String os; - - - /** - * 提示消息 - */ - @ExcelProperty(value = "提示消息") - private String msg; - - /** - * 访问时间 - */ - @ExcelProperty(value = "访问时间") - private Date loginTime; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java deleted file mode 100644 index 5214a33..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.dromara.system.domain.vo; - -import org.dromara.system.domain.SysMenu; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - - -/** - * 菜单权限视图对象 sys_menu - * - * @author Michelle.Chung - */ -@Data -@AutoMapper(target = SysMenu.class) -public class SysMenuVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 菜单ID - */ - private Long menuId; - - /** - * 菜单名称 - */ - private String menuName; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 路由地址 - */ - private String path; - - /** - * 组件路径 - */ - private String component; - - /** - * 路由参数 - */ - private String queryParam; - - /** - * 是否为外链（0是 1否） - */ - private String isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 菜单类型（M目录 C菜单 F按钮） - */ - private String menuType; - - /** - * 显示状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限标识 - */ - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 创建部门 - */ - private Long createDept; - - /** - * 备注 - */ - private String remark; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 子菜单 - */ - private List children = new ArrayList<>(); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java deleted file mode 100644 index afe7367..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.dromara.system.domain.vo; - -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysNotice; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - - -/** - * 通知公告视图对象 sys_notice - * - * @author Michelle.Chung - */ -@Data -@AutoMapper(target = SysNotice.class) -public class SysNoticeVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 公告ID - */ - private Long noticeId; - - /** - * 公告标题 - */ - private String noticeTitle; - - /** - * 公告类型（1通知 2公告） - */ - private String noticeType; - - /** - * 公告内容 - */ - private String noticeContent; - - /** - * 公告状态（0正常 1关闭） - */ - private String status; - - /** - * 备注 - */ - private String remark; - - /** - * 创建者 - */ - private Long createBy; - - /** - * 创建人名称 - */ - @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy") - private String createByName; - - /** - * 创建时间 - */ - private Date createTime; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java deleted file mode 100644 index d9eb71d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysOperLog; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 操作日志记录视图对象 sys_oper_log - * - * @author Michelle.Chung - * @date 2023-02-07 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysOperLog.class) -public class SysOperLogVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - @ExcelProperty(value = "日志主键") - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 模块标题 - */ - @ExcelProperty(value = "操作模块") - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_oper_type") - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 方法名称 - */ - @ExcelProperty(value = "请求方法") - private String method; - - /** - * 请求方式 - */ - @ExcelProperty(value = "请求方式") - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") - private Integer operatorType; - - /** - * 操作人员 - */ - @ExcelProperty(value = "操作人员") - private String operName; - - /** - * 部门名称 - */ - @ExcelProperty(value = "部门名称") - private String deptName; - - /** - * 请求URL - */ - @ExcelProperty(value = "请求地址") - private String operUrl; - - /** - * 主机地址 - */ - @ExcelProperty(value = "操作地址") - private String operIp; - - /** - * 操作地点 - */ - @ExcelProperty(value = "操作地点") - private String operLocation; - - /** - * 请求参数 - */ - @ExcelProperty(value = "请求参数") - private String operParam; - - /** - * 返回参数 - */ - @ExcelProperty(value = "返回参数") - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") - private Integer status; - - /** - * 错误消息 - */ - @ExcelProperty(value = "错误消息") - private String errorMsg; - - /** - * 操作时间 - */ - @ExcelProperty(value = "操作时间") - private Date operTime; - - /** - * 消耗时间 - */ - @ExcelProperty(value = "消耗时间") - private Long costTime; -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java deleted file mode 100644 index e7cfde4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.domain.SysOssConfig; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 对象存储配置视图对象 sys_oss_config - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysOssConfig.class) -public class SysOssConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long ossConfigId; - - /** - * 配置key - */ - private String configKey; - - /** - * accessKey - */ - private String accessKey; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 桶名称 - */ - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（Y=是,N=否） - */ - private String isHttps; - - /** - * 域 - */ - private String region; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - private String accessPolicy; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java deleted file mode 100644 index 11e0ff8..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -/** - * 上传对象信息 - * - * @author Michelle.Chung - */ -@Data -public class SysOssUploadVo { - - /** - * URL地址 - */ - private String url; - - /** - * 文件名 - */ - private String fileName; - - /** - * 对象存储主键 - */ - private String ossId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java deleted file mode 100644 index 8d5c429..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.dromara.system.domain.vo; - -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysOss; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * OSS对象存储视图对象 sys_oss - * - * @author Lion Li - */ -@Data -@AutoMapper(target = SysOss.class) -public class SysOssVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 对象存储主键 - */ - private Long ossId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 原名 - */ - private String originalName; - - /** - * 文件后缀名 - */ - private String fileSuffix; - - /** - * URL地址 - */ - private String url; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 上传人 - */ - private Long createBy; - - /** - * 上传人名称 - */ - @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy") - private String createByName; - - /** - * 服务商 - */ - private String service; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java deleted file mode 100644 index 69be547..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysPost; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 岗位信息视图对象 sys_post - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysPost.class) -public class SysPostVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 岗位ID - */ - @ExcelProperty(value = "岗位序号") - private Long postId; - - /** - * 部门id - */ - @ExcelProperty(value = "部门id") - private Long deptId; - - /** - * 岗位编码 - */ - @ExcelProperty(value = "岗位编码") - private String postCode; - - /** - * 岗位名称 - */ - @ExcelProperty(value = "岗位名称") - private String postName; - - /** - * 岗位类别编码 - */ - @ExcelProperty(value = "类别编码") - private String postCategory; - - /** - * 显示顺序 - */ - @ExcelProperty(value = "岗位排序") - private Integer postSort; - - /** - * 状态（0正常 1停用） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - - /** - * 部门名 - */ - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId") - private String deptName; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java deleted file mode 100644 index 1e5cd9e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysRole; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 角色信息视图对象 sys_role - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysRole.class) -public class SysRoleVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - @ExcelProperty(value = "角色序号") - private Long roleId; - - /** - * 角色名称 - */ - @ExcelProperty(value = "角色名称") - private String roleName; - - /** - * 角色权限字符串 - */ - @ExcelProperty(value = "角色权限") - private String roleKey; - - /** - * 显示顺序 - */ - @ExcelProperty(value = "角色排序") - private Integer roleSort; - - /** - * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） - */ - @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") - private String dataScope; - - /** - * 菜单树选择项是否关联显示 - */ - @ExcelProperty(value = "菜单树选择项是否关联显示") - private Boolean menuCheckStrictly; - - /** - * 部门树选择项是否关联显示 - */ - @ExcelProperty(value = "部门树选择项是否关联显示") - private Boolean deptCheckStrictly; - - /** - * 角色状态（0正常 1停用） - */ - @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - - /** - * 用户是否存在此角色标识 默认不存在 - */ - private boolean flag = false; - - public boolean isSuperAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.roleId); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java deleted file mode 100644 index 948dbcc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.dromara.system.domain.vo; - -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.system.domain.SysSocial; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 社会化关系视图对象 sys_social - * - * @author thiszhc - */ -@Data -@AutoMapper(target = SysSocial.class) -public class SysSocialVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long id; - - /** - * 用户ID - */ - private Long userId; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 的唯一ID - */ - private String authId; - - /** - * 用户来源 - */ - private String source; - - /** - * 用户的授权令牌 - */ - private String accessToken; - - /** - * 用户的授权令牌的有效期，部分平台可能没有 - */ - private int expireIn; - - /** - * 刷新令牌，部分平台可能没有 - */ - private String refreshToken; - - /** - * 用户的 open id - */ - private String openId; - - /** - * 授权的第三方账号 - */ - private String userName; - - /** - * 授权的第三方昵称 - */ - private String nickName; - - /** - * 授权的第三方邮箱 - */ - private String email; - - /** - * 授权的第三方头像地址 - */ - private String avatar; - - - /** - * 平台的授权信息，部分平台可能没有 - */ - private String accessCode; - - /** - * 用户的 unionid - */ - private String unionId; - - /** - * 授予的权限，部分平台可能没有 - */ - private String scope; - - /** - * 个别平台的授权信息，部分平台可能没有 - */ - private String tokenType; - - /** - * id token，部分平台可能没有 - */ - private String idToken; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macAlgorithm; - - /** - * 小米平台用户的附带属性，部分平台可能没有 - */ - private String macKey; - - /** - * 用户的授权code，部分平台可能没有 - */ - private String code; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthToken; - - /** - * Twitter平台用户的附带属性，部分平台可能没有 - */ - private String oauthTokenSecret; - - /** - * 创建时间 - */ - private Date createTime; -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java deleted file mode 100644 index 070334b..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenantPackage; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 租户套餐视图对象 sys_tenant_package - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysTenantPackage.class) -public class SysTenantPackageVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户套餐id - */ - @ExcelProperty(value = "租户套餐id") - private Long packageId; - - /** - * 套餐名称 - */ - @ExcelProperty(value = "套餐名称") - private String packageName; - - /** - * 关联菜单id - */ - @ExcelProperty(value = "关联菜单id") - private String menuIds; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 菜单树选择项是否关联显示 - */ - @ExcelProperty(value = "菜单树选择项是否关联显示") - private Boolean menuCheckStrictly; - - /** - * 状态（0正常 1停用） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java deleted file mode 100644 index 6a45315..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.domain.vo; - -import java.util.Date; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenant; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 租户视图对象 sys_tenant - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysTenant.class) -public class SysTenantVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ExcelProperty(value = "id") - private Long id; - - /** - * 租户编号 - */ - @ExcelProperty(value = "租户编号") - private String tenantId; - - /** - * 联系人 - */ - @ExcelProperty(value = "联系人") - private String contactUserName; - - /** - * 联系电话 - */ - @ExcelProperty(value = "联系电话") - private String contactPhone; - - /** - * 企业名称 - */ - @ExcelProperty(value = "企业名称") - private String companyName; - - /** - * 统一社会信用代码 - */ - @ExcelProperty(value = "统一社会信用代码") - private String licenseNumber; - - /** - * 地址 - */ - @ExcelProperty(value = "地址") - private String address; - - /** - * 域名 - */ - @ExcelProperty(value = "域名") - private String domain; - - /** - * 企业简介 - */ - @ExcelProperty(value = "企业简介") - private String intro; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 租户套餐编号 - */ - @ExcelProperty(value = "租户套餐编号") - private Long packageId; - - /** - * 过期时间 - */ - @ExcelProperty(value = "过期时间") - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - @ExcelProperty(value = "用户数量") - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - @ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java deleted file mode 100644 index 37ec6b7..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.ReverseAutoMapping; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 用户对象导出VO - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -public class SysUserExportVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @ExcelProperty(value = "用户序号") - private Long userId; - - /** - * 用户账号 - */ - @ExcelProperty(value = "登录名称") - private String userName; - - /** - * 用户昵称 - */ - @ExcelProperty(value = "用户名称") - private String nickName; - - /** - * 用户邮箱 - */ - @ExcelProperty(value = "用户邮箱") - private String email; - - /** - * 手机号码 - */ - @ExcelProperty(value = "手机号码") - private String phonenumber; - - /** - * 用户性别 - */ - @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_user_sex") - private String sex; - - /** - * 帐号状态（0正常 1停用） - */ - @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - - /** - * 最后登录IP - */ - @ExcelProperty(value = "最后登录IP") - private String loginIp; - - /** - * 最后登录时间 - */ - @ExcelProperty(value = "最后登录时间") - private Date loginDate; - - /** - * 部门名称 - */ - @ExcelProperty(value = "部门名称") - private String deptName; - - /** - * 负责人 - */ - @ExcelProperty(value = "部门负责人") - private String leaderName; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java deleted file mode 100644 index c34a23c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 用户对象导入VO - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -// @Accessors(chain = true) // 导入不允许使用 会找不到set方法 -public class SysUserImportVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @ExcelProperty(value = "用户序号") - private Long userId; - - /** - * 部门ID - */ - @ExcelProperty(value = "部门编号") - private Long deptId; - - /** - * 用户账号 - */ - @ExcelProperty(value = "登录名称") - private String userName; - - /** - * 用户昵称 - */ - @ExcelProperty(value = "用户名称") - private String nickName; - - /** - * 用户邮箱 - */ - @ExcelProperty(value = "用户邮箱") - private String email; - - /** - * 手机号码 - */ - @ExcelProperty(value = "手机号码") - private String phonenumber; - - /** - * 用户性别 - */ - @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_user_sex") - private String sex; - - /** - * 帐号状态（0正常 1停用） - */ - @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java deleted file mode 100644 index e41355d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -import java.util.List; - -/** - * 用户信息 - * - * @author Michelle.Chung - */ -@Data -public class SysUserInfoVo { - - /** - * 用户信息 - */ - private SysUserVo user; - - /** - * 角色ID列表 - */ - private List roleIds; - - /** - * 角色列表 - */ - private List roles; - - /** - * 岗位ID列表 - */ - private List postIds; - - /** - * 岗位列表 - */ - private List posts; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java deleted file mode 100644 index 86249d2..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysUser; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - - -/** - * 用户信息视图对象 sys_user - * - * @author Michelle.Chung - */ -@Data -@AutoMapper(target = SysUser.class) -public class SysUserVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private Long userId; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 用户昵称 - */ - private String nickName; - - /** - * 用户类型（sys_user系统用户） - */ - private String userType; - - /** - * 用户邮箱 - */ - @Sensitive(strategy = SensitiveStrategy.EMAIL, perms = "system:user:edit") - private String email; - - /** - * 手机号码 - */ - @Sensitive(strategy = SensitiveStrategy.PHONE, perms = "system:user:edit") - private String phonenumber; - - /** - * 用户性别（0男 1女 2未知） - */ - private String sex; - - /** - * 头像地址 - */ - @Translation(type = TransConstant.OSS_ID_TO_URL) - private Long avatar; - - /** - * 密码 - */ - @JsonIgnore - @JsonProperty - private String password; - - /** - * 帐号状态（0正常 1停用） - */ - private String status; - - /** - * 最后登录IP - */ - private String loginIp; - - /** - * 最后登录时间 - */ - private Date loginDate; - - /** - * 备注 - */ - private String remark; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 部门名 - */ - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId") - private String deptName; - - /** - * 角色对象 - */ - private List roles; - - /** - * 角色组 - */ - private Long[] roleIds; - - /** - * 岗位组 - */ - private Long[] postIds; - - /** - * 数据权限 当前角色ID - */ - private Long roleId; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java deleted file mode 100644 index 48fa92a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; - -import java.util.Set; - -/** - * 登录用户信息 - * - * @author Michelle.Chung - */ -@Data -public class UserInfoVo { - - /** - * 用户基本信息 - */ - private SysUserVo user; - - /** - * 菜单权限 - */ - private Set permissions; - - /** - * 角色权限 - */ - private Set roles; - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java deleted file mode 100644 index 25b62a9..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.dromara.system.listener; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.crypto.digest.BCrypt; -import cn.hutool.http.HtmlUtil; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserImportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; - -import java.util.List; - -/** - * 系统用户自定义导入 - * - * @author Lion Li - */ -@Slf4j -public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { - - private final ISysUserService userService; - - private final String password; - - private final Boolean isUpdateSupport; - - private final Long operUserId; - - private int successNum = 0; - private int failureNum = 0; - private final StringBuilder successMsg = new StringBuilder(); - private final StringBuilder failureMsg = new StringBuilder(); - - public SysUserImportListener(Boolean isUpdateSupport) { - String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword"); - this.userService = SpringUtils.getBean(ISysUserService.class); - this.password = BCrypt.hashpw(initPassword); - this.isUpdateSupport = isUpdateSupport; - this.operUserId = LoginHelper.getUserId(); - } - - @Override - public void invoke(SysUserImportVo userVo, AnalysisContext context) { - SysUserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName()); - try { - // 验证是否存在这个用户 - if (ObjectUtil.isNull(sysUser)) { - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); - ValidatorUtils.validate(user); - user.setPassword(password); - user.setCreateBy(operUserId); - userService.insertUser(user); - successNum++; - successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); - } else if (isUpdateSupport) { - Long userId = sysUser.getUserId(); - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); - user.setUserId(userId); - ValidatorUtils.validate(user); - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(operUserId); - userService.updateUser(user); - successNum++; - successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功"); - } else { - failureNum++; - failureMsg.append("
").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在"); - } - } catch (Exception e) { - failureNum++; - String msg = "
" + failureNum + "、账号 " + HtmlUtil.cleanHtmlTag(userVo.getUserName()) + " 导入失败："; - String message = e.getMessage(); - if (e instanceof ConstraintViolationException cvException) { - message = StreamUtils.join(cvException.getConstraintViolations(), ConstraintViolation::getMessage, ", "); - } - failureMsg.append(msg).append(message); - log.error(msg, e); - } - } - - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - - } - - @Override - public ExcelResult getExcelResult() { - return new ExcelResult<>() { - - @Override - public String getAnalysis() { - if (failureNum > 0) { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); - throw new ServiceException(failureMsg.toString()); - } else { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); - } - return successMsg.toString(); - } - - @Override - public List getList() { - return null; - } - - @Override - public List getErrorList() { - return null; - } - }; - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java deleted file mode 100644 index 15bcfb4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 授权管理Mapper接口 - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -public interface SysClientMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java deleted file mode 100644 index 0eaaee8..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.vo.SysConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java deleted file mode 100644 index 08dda66..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.vo.SysDeptVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 部门管理 数据层 - * - * @author Lion Li - */ -public interface SysDeptMapper extends BaseMapperPlus { - - /** - * 查询部门管理数据 - * - * @param queryWrapper 查询条件 - * @return 部门信息集合 - */ - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id") - }) - List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); - - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id") - }) - long countDeptById(Long deptId); - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @param deptCheckStrictly 部门树选择项是否关联显示 - * @return 选中部门列表 - */ - List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java deleted file mode 100644 index c2f1a7c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.vo.SysDictDataVo; - -import java.util.List; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictDataMapper extends BaseMapperPlus { - - default List selectDictDataByType(String dictType) { - return selectVoList( - new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dictType) - .orderByAsc(SysDictData::getDictSort)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 9a9bdd5..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysDictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysDictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java deleted file mode 100644 index 85edd1d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.vo.SysLogininforVo; - -/** - * 系统访问日志情况信息 数据层 - * - * @author Lion Li - */ -public interface SysLogininforMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java deleted file mode 100644 index ac646c0..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.system.domain.SysMenu; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysMenuVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 菜单表 数据层 - * - * @author Lion Li - */ -public interface SysMenuMapper extends BaseMapperPlus { - - /** - * 根据用户查询系统菜单列表 - * - * @param queryWrapper 查询条件 - * @return 菜单列表 - */ - List selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - List selectMenuPermsByUserId(Long userId); - - /** - * 根据角色ID查询权限 - * - * @param roleId 角色ID - * @return 权限列表 - */ - List selectMenuPermsByRoleId(Long roleId); - - /** - * 根据用户ID查询菜单 - * - * @return 菜单列表 - */ - default List selectMenuTreeAll() { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .in(SysMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU) - .eq(SysMenu::getStatus, UserConstants.MENU_NORMAL) - .orderByAsc(SysMenu::getParentId) - .orderByAsc(SysMenu::getOrderNum); - return this.selectList(lqw); - } - - /** - * 根据用户ID查询菜单 - * - * @param userId 用户ID - * @return 菜单列表 - */ - List selectMenuTreeByUserId(Long userId); - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @param menuCheckStrictly 菜单树选择项是否关联显示 - * @return 选中菜单列表 - */ - List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java deleted file mode 100644 index 1e27b77..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.vo.SysNoticeVo; - -/** - * 通知公告表 数据层 - * - * @author Lion Li - */ -public interface SysNoticeMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java deleted file mode 100644 index 5d20404..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.vo.SysOperLogVo; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java deleted file mode 100644 index f93d34d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.vo.SysOssConfigVo; - -/** - * 对象存储配置Mapper接口 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -public interface SysOssConfigMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java deleted file mode 100644 index 3da621d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.vo.SysOssVo; - -/** - * 文件上传 数据层 - * - * @author Lion Li - */ -public interface SysOssMapper extends BaseMapperPlus { -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java deleted file mode 100644 index f9bf134..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.vo.SysPostVo; - -import java.util.List; - -/** - * 岗位信息 数据层 - * - * @author Lion Li - */ -public interface SysPostMapper extends BaseMapperPlus { - - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "create_by") - }) - Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 查询用户所属岗位组 - * - * @param userId 用户ID - * @return 结果 - */ - List selectPostsByUserId(Long userId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java deleted file mode 100644 index 3de0bb6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleDept; - -/** - * 角色与部门关联表 数据层 - * - * @author Lion Li - */ -public interface SysRoleDeptMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java deleted file mode 100644 index ac5a47e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.vo.SysRoleVo; - -import java.util.List; - -/** - * 角色表 数据层 - * - * @author Lion Li - */ -public interface SysRoleMapper extends BaseMapperPlus { - - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "r.create_by") - }) - Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 根据条件分页查询角色数据 - * - * @param queryWrapper 查询条件 - * @return 角色数据集合信息 - */ - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "r.create_by") - }) - List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); - - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "r.create_by") - }) - SysRoleVo selectRoleById(Long roleId); - - /** - * 根据用户ID查询角色 - * - * @param userId 用户ID - * @return 角色列表 - */ - List selectRolePermissionByUserId(Long userId); - - /** - * 根据用户ID查询角色 - * - * @param userId 用户ID - * @return 角色列表 - */ - List selectRolesByUserId(Long userId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java deleted file mode 100644 index 0a657b4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleMenu; - -/** - * 角色与菜单关联表 数据层 - * - * @author Lion Li - */ -public interface SysRoleMenuMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java deleted file mode 100644 index b942061..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.vo.SysSocialVo; - -/** - * 社会化关系Mapper接口 - * - * @author thiszhc - */ -public interface SysSocialMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java deleted file mode 100644 index 7e1167a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java deleted file mode 100644 index 10ca170..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.vo.SysTenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantPackageMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java deleted file mode 100644 index fc7fc6e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; - -import java.util.List; - -/** - * 用户表 数据层 - * - * @author Lion Li - */ -public interface SysUserMapper extends BaseMapperPlus { - - @DataPermission({ - @DataColumn(key = "deptName", value = "u.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") - }) - Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") - }) - List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 根据条件分页查询用户列表 - * - * @param queryWrapper 查询条件 - * @return 用户信息集合信息 - */ - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") - }) - List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 根据条件分页查询已配用户角色列表 - * - * @param queryWrapper 查询条件 - * @return 用户信息集合信息 - */ - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") - }) - Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param queryWrapper 查询条件 - * @return 用户信息集合信息 - */ - @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") - }) - Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") - }) - long countUserById(Long userId); - - @Override - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") - }) - int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper updateWrapper); - - @Override - @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") - }) - int updateById(@Param(Constants.ENTITY) SysUser user); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java deleted file mode 100644 index 07c1371..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserPost; - -/** - * 用户与岗位关联表 数据层 - * - * @author Lion Li - */ -public interface SysUserPostMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java deleted file mode 100644 index e2f706c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserRole; - -import java.util.List; - -/** - * 用户与角色关联表 数据层 - * - * @author Lion Li - */ -public interface SysUserRoleMapper extends BaseMapperPlus { - - List selectUserIdsByRoleId(Long roleId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java deleted file mode 100644 index 27dad7d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.system.runner; - -import org.dromara.system.service.ISysOssConfigService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -/** - * 初始化 system 模块对应业务数据 - * - * @author Lion Li - */ -@Slf4j -@RequiredArgsConstructor -@Component -public class SystemApplicationRunner implements ApplicationRunner { - - private final ISysOssConfigService ossConfigService; - - @Override - public void run(ApplicationArguments args) throws Exception { - ossConfigService.init(); - log.info("初始化OSS配置成功"); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java deleted file mode 100644 index d0f8a3c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 客户端管理Service接口 - * - * @author Michelle.Chung - * @date 2023-06-18 - */ -public interface ISysClientService { - - /** - * 查询客户端管理 - */ - SysClientVo queryById(Long id); - - /** - * 查询客户端信息基于客户端id - */ - SysClientVo queryByClientId(String clientId); - - /** - * 查询客户端管理列表 - */ - TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery); - - /** - * 查询客户端管理列表 - */ - List queryList(SysClientBo bo); - - /** - * 新增客户端管理 - */ - Boolean insertByBo(SysClientBo bo); - - /** - * 修改客户端管理 - */ - Boolean updateByBo(SysClientBo bo); - - /** - * 修改状态 - */ - int updateUserStatus(String clientId, String status); - - /** - * 校验并批量删除客户端管理信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java deleted file mode 100644 index f7efda7..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; - -import java.util.List; - -/** - * 参数配置 服务层 - * - * @author Lion Li - */ -public interface ISysConfigService { - - - TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery); - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - SysConfigVo selectConfigById(Long configId); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * @return 参数键值 - */ - String selectConfigByKey(String configKey); - - /** - * 获取注册开关 - * @param tenantId 租户id - * @return true开启，false关闭 - */ - boolean selectRegisterEnabled(String tenantId); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - List selectConfigList(SysConfigBo config); - - /** - * 新增参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - String insertConfig(SysConfigBo bo); - - /** - * 修改参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - String updateConfig(SysConfigBo bo); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - void deleteConfigByIds(Long[] configIds); - - /** - * 重置参数缓存数据 - */ - void resetConfigCache(); - - /** - * 校验参数键名是否唯一 - * - * @param config 参数信息 - * @return 结果 - */ - boolean checkConfigKeyUnique(SysConfigBo config); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java deleted file mode 100644 index 3f252f7..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.system.service; - -/** - * 通用 数据权限 服务 - * - * @author Lion Li - */ -public interface ISysDataScopeService { - - /** - * 获取角色自定义权限 - * - * @param roleId 角色id - * @return 部门id组 - */ - String getRoleCustom(Long roleId); - - /** - * 获取部门及以下权限 - * - * @param deptId 部门id - * @return 部门id组 - */ - String getDeptAndChild(Long deptId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java deleted file mode 100644 index bf16642..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.dromara.system.service; - -import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; - -import java.util.List; - -/** - * 部门管理 服务层 - * - * @author Lion Li - */ -public interface ISysDeptService { - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - List selectDeptList(SysDeptBo dept); - - /** - * 查询部门树结构信息 - * - * @param dept 部门信息 - * @return 部门树信息集合 - */ - List> selectDeptTreeList(SysDeptBo dept); - - /** - * 构建前端所需要下拉树结构 - * - * @param depts 部门列表 - * @return 下拉树结构列表 - */ - List> buildDeptTreeSelect(List depts); - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @return 选中部门列表 - */ - List selectDeptListByRoleId(Long roleId); - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - SysDeptVo selectDeptById(Long deptId); - - /** - * 通过部门ID串查询部门 - * - * @param deptIds 部门id串 - * @return 部门列表信息 - */ - List selectDeptByIds(List deptIds); - - /** - * 根据ID查询所有子部门数（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - long selectNormalChildrenDeptById(Long deptId); - - /** - * 是否存在部门子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - boolean hasChildByDeptId(Long deptId); - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 true 存在 false 不存在 - */ - boolean checkDeptExistUser(Long deptId); - - /** - * 校验部门名称是否唯一 - * - * @param dept 部门信息 - * @return 结果 - */ - boolean checkDeptNameUnique(SysDeptBo dept); - - /** - * 校验部门是否有数据权限 - * - * @param deptId 部门id - */ - void checkDeptDataScope(Long deptId); - - /** - * 新增保存部门信息 - * - * @param bo 部门信息 - * @return 结果 - */ - int insertDept(SysDeptBo bo); - - /** - * 修改保存部门信息 - * - * @param bo 部门信息 - * @return 结果 - */ - int updateDept(SysDeptBo bo); - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - int deleteDeptById(Long deptId); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java deleted file mode 100644 index 0e697db..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; - -import java.util.List; - -/** - * 字典 业务层 - * - * @author Lion Li - */ -public interface ISysDictDataService { - - - TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); - - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - List selectDictDataList(SysDictDataBo dictData); - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - String selectDictLabel(String dictType, String dictValue); - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - SysDictDataVo selectDictDataById(Long dictCode); - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - */ - void deleteDictDataByIds(Long[] dictCodes); - - /** - * 新增保存字典数据信息 - * - * @param bo 字典数据信息 - * @return 结果 - */ - List insertDictData(SysDictDataBo bo); - - /** - * 修改保存字典数据信息 - * - * @param bo 字典数据信息 - * @return 结果 - */ - List updateDictData(SysDictDataBo bo); - - /** - * 校验字典键值是否唯一 - * - * @param dict 字典数据 - * @return 结果 - */ - boolean checkDictDataUnique(SysDictDataBo dict); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java deleted file mode 100644 index 3b32d6c..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; - -import java.util.List; - -/** - * 字典 业务层 - * - * @author Lion Li - */ -public interface ISysDictTypeService { - - - TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); - - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - List selectDictTypeList(SysDictTypeBo dictType); - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - List selectDictTypeAll(); - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - List selectDictDataByType(String dictType); - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - SysDictTypeVo selectDictTypeById(Long dictId); - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - SysDictTypeVo selectDictTypeByType(String dictType); - - /** - * 批量删除字典信息 - * - * @param dictIds 需要删除的字典ID - */ - void deleteDictTypeByIds(Long[] dictIds); - - /** - * 重置字典缓存数据 - */ - void resetDictCache(); - - /** - * 新增保存字典类型信息 - * - * @param bo 字典类型信息 - * @return 结果 - */ - List insertDictType(SysDictTypeBo bo); - - /** - * 修改保存字典类型信息 - * - * @param bo 字典类型信息 - * @return 结果 - */ - List updateDictType(SysDictTypeBo bo); - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - boolean checkDictTypeUnique(SysDictTypeBo dictType); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java deleted file mode 100644 index 6b3b7a6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; - -import java.util.List; - -/** - * 系统访问日志情况信息 服务层 - * - * @author Lion Li - */ -public interface ISysLogininforService { - - - TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery); - - /** - * 新增系统登录日志 - * - * @param bo 访问日志对象 - */ - void insertLogininfor(SysLogininforBo bo); - - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - List selectLogininforList(SysLogininforBo logininfor); - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return 结果 - */ - int deleteLogininforByIds(Long[] infoIds); - - /** - * 清空系统登录日志 - */ - void cleanLogininfor(); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java deleted file mode 100644 index 72d705e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.dromara.system.service; - -import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; - -import java.util.List; -import java.util.Set; - -/** - * 菜单 业务层 - * - * @author Lion Li - */ -public interface ISysMenuService { - - /** - * 根据用户查询系统菜单列表 - * - * @param userId 用户ID - * @return 菜单列表 - */ - List selectMenuList(Long userId); - - /** - * 根据用户查询系统菜单列表 - * - * @param menu 菜单信息 - * @param userId 用户ID - * @return 菜单列表 - */ - List selectMenuList(SysMenuBo menu, Long userId); - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - Set selectMenuPermsByUserId(Long userId); - - /** - * 根据角色ID查询权限 - * - * @param roleId 角色ID - * @return 权限列表 - */ - Set selectMenuPermsByRoleId(Long roleId); - - /** - * 根据用户ID查询菜单树信息 - * - * @param userId 用户ID - * @return 菜单列表 - */ - List selectMenuTreeByUserId(Long userId); - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @return 选中菜单列表 - */ - List selectMenuListByRoleId(Long roleId); - - /** - * 根据租户套餐ID查询菜单树信息 - * - * @param packageId 租户套餐ID - * @return 选中菜单列表 - */ - List selectMenuListByPackageId(Long packageId); - - /** - * 构建前端路由所需要的菜单 - * - * @param menus 菜单列表 - * @return 路由列表 - */ - List buildMenus(List menus); - - /** - * 构建前端所需要下拉树结构 - * - * @param menus 菜单列表 - * @return 下拉树结构列表 - */ - List> buildMenuTreeSelect(List menus); - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * @return 菜单信息 - */ - SysMenuVo selectMenuById(Long menuId); - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * @return 结果 true 存在 false 不存在 - */ - boolean hasChildByMenuId(Long menuId); - - /** - * 查询菜单是否存在角色 - * - * @param menuId 菜单ID - * @return 结果 true 存在 false 不存在 - */ - boolean checkMenuExistRole(Long menuId); - - /** - * 新增保存菜单信息 - * - * @param bo 菜单信息 - * @return 结果 - */ - int insertMenu(SysMenuBo bo); - - /** - * 修改保存菜单信息 - * - * @param bo 菜单信息 - * @return 结果 - */ - int updateMenu(SysMenuBo bo); - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * @return 结果 - */ - int deleteMenuById(Long menuId); - - /** - * 校验菜单名称是否唯一 - * - * @param menu 菜单信息 - * @return 结果 - */ - boolean checkMenuNameUnique(SysMenuBo menu); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java deleted file mode 100644 index 8ec999d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; - -import java.util.List; - -/** - * 公告 服务层 - * - * @author Lion Li - */ -public interface ISysNoticeService { - - - TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); - - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - SysNoticeVo selectNoticeById(Long noticeId); - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - List selectNoticeList(SysNoticeBo notice); - - /** - * 新增公告 - * - * @param bo 公告信息 - * @return 结果 - */ - int insertNotice(SysNoticeBo bo); - - /** - * 修改公告 - * - * @param bo 公告信息 - * @return 结果 - */ - int updateNotice(SysNoticeBo bo); - - /** - * 删除公告信息 - * - * @param noticeId 公告ID - * @return 结果 - */ - int deleteNoticeById(Long noticeId); - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - int deleteNoticeByIds(Long[] noticeIds); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java deleted file mode 100644 index 9573510..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; - -import java.util.List; - -/** - * 操作日志 服务层 - * - * @author Lion Li - */ -public interface ISysOperLogService { - - TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); - - /** - * 新增操作日志 - * - * @param bo 操作日志对象 - */ - void insertOperlog(SysOperLogBo bo); - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - List selectOperLogList(SysOperLogBo operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - int deleteOperLogByIds(Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - SysOperLogVo selectOperLogById(Long operId); - - /** - * 清空操作日志 - */ - void cleanOperLog(); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java deleted file mode 100644 index 2f6dfc9..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; - -import java.util.Collection; - -/** - * 对象存储配置Service接口 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -public interface ISysOssConfigService { - - /** - * 初始化OSS配置 - */ - void init(); - - /** - * 查询单个 - */ - SysOssConfigVo queryById(Long ossConfigId); - - /** - * 查询列表 - */ - TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery); - - /** - * 根据新增业务对象插入对象存储配置 - * - * @param bo 对象存储配置新增业务对象 - * @return 结果 - */ - Boolean insertByBo(SysOssConfigBo bo); - - /** - * 根据编辑业务对象修改对象存储配置 - * - * @param bo 对象存储配置编辑业务对象 - * @return 结果 - */ - Boolean updateByBo(SysOssConfigBo bo); - - /** - * 校验并删除数据 - * - * @param ids 主键集合 - * @param isValid 是否校验,true-删除前校验,false-不校验 - * @return 结果 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 启用停用状态 - */ - int updateOssConfigStatus(SysOssConfigBo bo); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java deleted file mode 100644 index 057c068..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - -/** - * 文件上传 服务层 - * - * @author Lion Li - */ -public interface ISysOssService { - - /** - * 查询OSS对象存储列表 - * - * @param sysOss OSS对象存储分页查询对象 - * @param pageQuery 分页查询实体类 - * @return 结果 - */ - TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); - - /** - * 根据一组 ossIds 获取对应的 SysOssVo 列表 - * - * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 SysOssVo 对象的列表 - */ - List listByIds(Collection ossIds); - - /** - * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 - * - * @param ossId 文件在数据库中的唯一标识 - * @return SysOssVo 对象，包含文件信息 - */ - SysOssVo getById(Long ossId); - - /** - * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 - * - * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 - */ - SysOssVo upload(MultipartFile file); - - /** - * 上传文件到对象存储服务，并保存文件信息到数据库 - * - * @param file 要上传的文件对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 - */ - SysOssVo upload(File file); - - /** - * 文件下载方法，支持一次性下载完整文件 - * - * @param ossId OSS对象ID - * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 - */ - void download(Long ossId, HttpServletResponse response) throws IOException; - - /** - * 删除OSS对象存储 - * - * @param ids OSS对象ID串 - * @param isValid 判断是否需要校验 - * @return 结果 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java deleted file mode 100644 index 0116df5..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.system.service; - -import java.util.Set; - -/** - * 用户权限处理 - * - * @author Lion Li - */ -public interface ISysPermissionService { - - /** - * 获取角色数据权限 - * - * @param userId 用户id - * @return 角色权限信息 - */ - Set getRolePermission(Long userId); - - /** - * 获取菜单数据权限 - * - * @param userId 用户id - * @return 菜单权限信息 - */ - Set getMenuPermission(Long userId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java deleted file mode 100644 index 3751b23..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; - -import java.util.List; - -/** - * 岗位信息 服务层 - * - * @author Lion Li - */ -public interface ISysPostService { - - - TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery); - - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位列表 - */ - List selectPostList(SysPostBo post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - List selectPostAll(); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - SysPostVo selectPostById(Long postId); - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - List selectPostListByUserId(Long userId); - - /** - * 通过岗位ID串查询岗位 - * - * @param postIds 岗位id串 - * @return 岗位列表信息 - */ - List selectPostByIds(List postIds); - - /** - * 校验岗位名称 - * - * @param post 岗位信息 - * @return 结果 - */ - boolean checkPostNameUnique(SysPostBo post); - - /** - * 校验岗位编码 - * - * @param post 岗位信息 - * @return 结果 - */ - boolean checkPostCodeUnique(SysPostBo post); - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - long countUserPostById(Long postId); - - /** - * 通过部门ID查询岗位使用数量 - * - * @param deptId 部门id - * @return 结果 - */ - long countPostByDeptId(Long deptId); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - */ - int deletePostByIds(Long[] postIds); - - /** - * 新增保存岗位信息 - * - * @param bo 岗位信息 - * @return 结果 - */ - int insertPost(SysPostBo bo); - - /** - * 修改保存岗位信息 - * - * @param bo 岗位信息 - * @return 结果 - */ - int updatePost(SysPostBo bo); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java deleted file mode 100644 index 64740ae..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ /dev/null @@ -1,200 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; - -import java.util.List; -import java.util.Set; - -/** - * 角色业务层 - * - * @author Lion Li - */ -public interface ISysRoleService { - - - TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery); - - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * @return 角色数据集合信息 - */ - List selectRoleList(SysRoleBo role); - - /** - * 根据用户ID查询角色列表 - * - * @param userId 用户ID - * @return 角色列表 - */ - List selectRolesByUserId(Long userId); - - /** - * 根据用户ID查询角色列表(包含被授权状态) - * - * @param userId 用户ID - * @return 角色列表 - */ - List selectRolesAuthByUserId(Long userId); - - /** - * 根据用户ID查询角色权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - Set selectRolePermissionByUserId(Long userId); - - /** - * 查询所有角色 - * - * @return 角色列表 - */ - List selectRoleAll(); - - /** - * 根据用户ID获取角色选择框列表 - * - * @param userId 用户ID - * @return 选中角色ID列表 - */ - List selectRoleListByUserId(Long userId); - - /** - * 通过角色ID查询角色 - * - * @param roleId 角色ID - * @return 角色对象信息 - */ - SysRoleVo selectRoleById(Long roleId); - - /** - * 通过角色ID串查询角色 - * - * @param roleIds 角色ID串 - * @return 角色列表信息 - */ - List selectRoleByIds(List roleIds); - - /** - * 校验角色名称是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - boolean checkRoleNameUnique(SysRoleBo role); - - /** - * 校验角色权限是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - boolean checkRoleKeyUnique(SysRoleBo role); - - /** - * 校验角色是否允许操作 - * - * @param role 角色信息 - */ - void checkRoleAllowed(SysRoleBo role); - - /** - * 校验角色是否有数据权限 - * - * @param roleId 角色id - */ - void checkRoleDataScope(Long roleId); - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * @return 结果 - */ - long countUserRoleByRoleId(Long roleId); - - /** - * 新增保存角色信息 - * - * @param bo 角色信息 - * @return 结果 - */ - int insertRole(SysRoleBo bo); - - /** - * 修改保存角色信息 - * - * @param bo 角色信息 - * @return 结果 - */ - int updateRole(SysRoleBo bo); - - /** - * 修改角色状态 - * - * @param roleId 角色ID - * @param status 角色状态 - * @return 结果 - */ - int updateRoleStatus(Long roleId, String status); - - /** - * 修改数据权限信息 - * - * @param bo 角色信息 - * @return 结果 - */ - int authDataScope(SysRoleBo bo); - - /** - * 通过角色ID删除角色 - * - * @param roleId 角色ID - * @return 结果 - */ - int deleteRoleById(Long roleId); - - /** - * 批量删除角色信息 - * - * @param roleIds 需要删除的角色ID - * @return 结果 - */ - int deleteRoleByIds(Long[] roleIds); - - /** - * 取消授权用户角色 - * - * @param userRole 用户和角色关联信息 - * @return 结果 - */ - int deleteAuthUser(SysUserRole userRole); - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要取消授权的用户数据ID - * @return 结果 - */ - int deleteAuthUsers(Long roleId, Long[] userIds); - - /** - * 批量选择授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID - * @return 结果 - */ - int insertAuthUsers(Long roleId, Long[] userIds); - - void cleanOnlineUserByRole(Long roleId); - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java deleted file mode 100644 index cc7016e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; - -import java.util.List; - -/** - * 社会化关系Service接口 - * - * @author thiszhc - */ -public interface ISysSocialService { - - - /** - * 查询社会化关系 - */ - SysSocialVo queryById(String id); - - /** - * 查询社会化关系列表 - */ - List queryList(SysSocialBo bo); - - /** - * 查询社会化关系列表 - */ - List queryListByUserId(Long userId); - - /** - * 新增授权关系 - */ - Boolean insertByBo(SysSocialBo bo); - - /** - * 更新社会化关系 - */ - Boolean updateByBo(SysSocialBo bo); - - /** - * 删除社会化关系信息 - */ - Boolean deleteWithValidById(Long id); - - - /** - * 根据 authId 查询 - */ - List selectByAuthId(String authId); - - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java deleted file mode 100644 index d060b68..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; - -import java.util.Collection; -import java.util.List; - -/** - * 租户套餐Service接口 - * - * @author Michelle.Chung - */ -public interface ISysTenantPackageService { - - /** - * 查询租户套餐 - */ - SysTenantPackageVo queryById(Long packageId); - - /** - * 查询租户套餐列表 - */ - TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery); - - /** - * 查询租户套餐已启用列表 - */ - List selectList(); - - /** - * 查询租户套餐列表 - */ - List queryList(SysTenantPackageBo bo); - - /** - * 新增租户套餐 - */ - Boolean insertByBo(SysTenantPackageBo bo); - - /** - * 修改租户套餐 - */ - Boolean updateByBo(SysTenantPackageBo bo); - - /** - * 校验套餐名称是否唯一 - */ - boolean checkPackageNameUnique(SysTenantPackageBo bo); - - /** - * 修改套餐状态 - */ - int updatePackageStatus(SysTenantPackageBo bo); - - /** - * 校验并批量删除租户套餐信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java deleted file mode 100644 index f697829..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 租户Service接口 - * - * @author Michelle.Chung - */ -public interface ISysTenantService { - - /** - * 查询租户 - */ - SysTenantVo queryById(Long id); - - /** - * 基于租户ID查询租户 - */ - SysTenantVo queryByTenantId(String tenantId); - - /** - * 查询租户列表 - */ - TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery); - - /** - * 查询租户列表 - */ - List queryList(SysTenantBo bo); - - /** - * 新增租户 - */ - Boolean insertByBo(SysTenantBo bo); - - /** - * 修改租户 - */ - Boolean updateByBo(SysTenantBo bo); - - /** - * 修改租户状态 - */ - int updateTenantStatus(SysTenantBo bo); - - /** - * 校验租户是否允许操作 - */ - void checkTenantAllowed(String tenantId); - - /** - * 校验并批量删除租户信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 校验企业名称是否唯一 - */ - boolean checkCompanyNameUnique(SysTenantBo bo); - - /** - * 校验账号余额 - */ - boolean checkAccountBalance(String tenantId); - - /** - * 校验有效期 - */ - boolean checkExpireTime(String tenantId); - - /** - * 同步租户套餐 - */ - Boolean syncTenantPackage(String tenantId, Long packageId); - - /** - * 同步租户字典 - */ - void syncTenantDict(); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java deleted file mode 100644 index 0325a25..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ /dev/null @@ -1,222 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; - -import java.util.List; - -/** - * 用户 业务层 - * - * @author Lion Li - */ -public interface ISysUserService { - - - TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery); - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - List selectUserExportList(SysUserBo user); - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - SysUserVo selectUserByUserName(String userName); - - /** - * 通过手机号查询用户 - * - * @param phonenumber 手机号 - * @return 用户对象信息 - */ - SysUserVo selectUserByPhonenumber(String phonenumber); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - SysUserVo selectUserById(Long userId); - - /** - * 通过用户ID串查询用户 - * - * @param userIds 用户ID串 - * @param deptId 部门id - * @return 用户列表信息 - */ - List selectUserByIds(List userIds, Long deptId); - - /** - * 根据用户ID查询用户所属角色组 - * - * @param userId 用户ID - * @return 结果 - */ - String selectUserRoleGroup(Long userId); - - /** - * 根据用户ID查询用户所属岗位组 - * - * @param userId 用户ID - * @return 结果 - */ - String selectUserPostGroup(Long userId); - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - boolean checkUserNameUnique(SysUserBo user); - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - boolean checkPhoneUnique(SysUserBo user); - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - boolean checkEmailUnique(SysUserBo user); - - /** - * 校验用户是否允许操作 - * - * @param userId 用户ID - */ - void checkUserAllowed(Long userId); - - /** - * 校验用户是否有数据权限 - * - * @param userId 用户id - */ - void checkUserDataScope(Long userId); - - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - int insertUser(SysUserBo user); - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - boolean registerUser(SysUserBo user, String tenantId); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - int updateUser(SysUserBo user); - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - void insertUserAuth(Long userId, Long[] roleIds); - - /** - * 修改用户状态 - * - * @param userId 用户ID - * @param status 帐号状态 - * @return 结果 - */ - int updateUserStatus(Long userId, String status); - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - int updateUserProfile(SysUserBo user); - - /** - * 修改用户头像 - * - * @param userId 用户ID - * @param avatar 头像地址 - * @return 结果 - */ - boolean updateUserAvatar(Long userId, Long avatar); - - /** - * 重置用户密码 - * - * @param userId 用户ID - * @param password 密码 - * @return 结果 - */ - int resetUserPwd(Long userId, String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - int deleteUserByIds(Long[] userIds); - - /** - * 通过部门id查询当前部门所有用户 - * - * @param deptId 部门id - * @return 结果 - */ - List selectUserListByDept(Long deptId); -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java deleted file mode 100644 index 1c69243..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.crypto.SecureUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.mapper.SysClientMapper; -import org.dromara.system.service.ISysClientService; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -import java.util.Collection; -import java.util.List; - -/** - * 客户端管理Service业务层处理 - * - * @author Michelle.Chung - * @date 2023-06-18 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class SysClientServiceImpl implements ISysClientService { - - private final SysClientMapper baseMapper; - - /** - * 查询客户端管理 - */ - @Override - public SysClientVo queryById(Long id) { - SysClientVo vo = baseMapper.selectVoById(id); - vo.setGrantTypeList(List.of(vo.getGrantType().split(","))); - return vo; - } - - - /** - * 查询客户端管理 - */ - @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") - @Override - public SysClientVo queryByClientId(String clientId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysClient::getClientId, clientId)); - } - - /** - * 查询客户端管理列表 - */ - @Override - public TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - result.getRecords().forEach(r -> r.setGrantTypeList(List.of(r.getGrantType().split(",")))); - return TableDataInfo.build(result); - } - - /** - * 查询客户端管理列表 - */ - @Override - public List queryList(SysClientBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysClientBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysClient::getClientId, bo.getClientId()); - lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysClient::getClientKey, bo.getClientKey()); - lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysClient::getClientSecret, bo.getClientSecret()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysClient::getStatus, bo.getStatus()); - lqw.orderByAsc(SysClient::getId); - return lqw; - } - - /** - * 新增客户端管理 - */ - @Override - public Boolean insertByBo(SysClientBo bo) { - SysClient add = MapstructUtils.convert(bo, SysClient.class); - validEntityBeforeSave(add); - add.setGrantType(String.join(",", bo.getGrantTypeList())); - // 生成clientid - String clientKey = bo.getClientKey(); - String clientSecret = bo.getClientSecret(); - add.setClientId(SecureUtil.md5(clientKey + clientSecret)); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改客户端管理 - */ - @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#bo.clientId") - @Override - public Boolean updateByBo(SysClientBo bo) { - SysClient update = MapstructUtils.convert(bo, SysClient.class); - validEntityBeforeSave(update); - update.setGrantType(String.join(",", bo.getGrantTypeList())); - return baseMapper.updateById(update) > 0; - } - - /** - * 修改状态 - */ - @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") - @Override - public int updateUserStatus(String clientId, String status) { - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysClient::getStatus, status) - .eq(SysClient::getClientId, clientId)); - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysClient entity) { - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 批量删除客户端管理 - */ - @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true) - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java deleted file mode 100644 index 46526bd..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.mapper.SysConfigMapper; -import org.dromara.system.service.ISysConfigService; -import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 参数配置 服务层实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysConfigServiceImpl implements ISysConfigService, ConfigService { - - private final SysConfigMapper baseMapper; - - @Override - public TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - @Override - @DS("master") - public SysConfigVo selectConfigById(Long configId) { - return baseMapper.selectVoById(configId); - } - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数key - * @return 参数键值 - */ - @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") - @Override - public String selectConfigByKey(String configKey) { - SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, configKey)); - if (ObjectUtil.isNotNull(retConfig)) { - return retConfig.getConfigValue(); - } - return StringUtils.EMPTY; - } - - /** - * 获取注册开关 - * @param tenantId 租户id - * @return true开启，false关闭 - */ - @Override - public boolean selectRegisterEnabled(String tenantId) { - SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> { - return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, "sys.account.registerUser")); - }); - if (ObjectUtil.isNull(retConfig)) { - return false; - } - return Convert.toBool(retConfig.getConfigValue()); - } - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - @Override - public List selectConfigList(SysConfigBo config) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysConfigBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysConfig::getConfigName, bo.getConfigName()); - lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysConfig::getConfigType, bo.getConfigType()); - lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(SysConfig::getConfigId); - return lqw; - } - - /** - * 新增参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") - @Override - public String insertConfig(SysConfigBo bo) { - SysConfig config = MapstructUtils.convert(bo, SysConfig.class); - int row = baseMapper.insert(config); - if (row > 0) { - return config.getConfigValue(); - } - throw new ServiceException("操作失败"); - } - - /** - * 修改参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") - @Override - public String updateConfig(SysConfigBo bo) { - int row = 0; - SysConfig config = MapstructUtils.convert(bo, SysConfig.class); - if (config.getConfigId() != null) { - SysConfig temp = baseMapper.selectById(config.getConfigId()); - if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { - CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey()); - } - row = baseMapper.updateById(config); - } else { - CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - row = baseMapper.update(config, new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, config.getConfigKey())); - } - if (row > 0) { - return config.getConfigValue(); - } - throw new ServiceException("操作失败"); - } - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - @Override - public void deleteConfigByIds(Long[] configIds) { - for (Long configId : configIds) { - SysConfig config = baseMapper.selectById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { - throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); - } - CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - } - baseMapper.deleteByIds(Arrays.asList(configIds)); - } - - /** - * 重置参数缓存数据 - */ - @Override - public void resetConfigCache() { - CacheUtils.clear(CacheNames.SYS_CONFIG); - } - - /** - * 校验参数键名是否唯一 - * - * @param config 参数配置信息 - * @return 结果 - */ - @Override - public boolean checkConfigKeyUnique(SysConfigBo config) { - long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey())); - if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { - return false; - } - return true; - } - - /** - * 根据参数 key 获取参数值 - * - * @param configKey 参数 key - * @return 参数值 - */ - @Override - public String getConfigValue(String configKey) { - return SpringUtils.getAopProxy(this).selectConfigByKey(configKey); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java deleted file mode 100644 index 018f9a0..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.service.ISysDataScopeService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 数据权限 实现 - *

- * 注意: 此Service内不允许调用标注`数据权限`注解的方法 - * 例如: deptMapper.selectList 此 selectList 方法标注了`数据权限`注解 会出现循环解析的问题 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service("sdss") -public class SysDataScopeServiceImpl implements ISysDataScopeService { - - private final SysRoleDeptMapper roleDeptMapper; - private final SysDeptMapper deptMapper; - - /** - * 获取角色自定义权限 - * - * @param roleId 角色Id - * @return 部门Id组 - */ - @Override - public String getRoleCustom(Long roleId) { - if (ObjectUtil.isNull(roleId)) { - return "-1"; - } - List list = roleDeptMapper.selectList( - new LambdaQueryWrapper() - .select(SysRoleDept::getDeptId) - .eq(SysRoleDept::getRoleId, roleId)); - if (CollUtil.isNotEmpty(list)) { - return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); - } - return "-1"; - } - - /** - * 获取部门及以下权限 - * - * @param deptId 部门Id - * @return 部门Id组 - */ - @Override - public String getDeptAndChild(Long deptId) { - if (ObjectUtil.isNull(deptId)) { - return "-1"; - } - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) - .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); - ids.add(deptId); - if (CollUtil.isNotEmpty(ids)) { - return StreamUtils.join(ids, Convert::toStr); - } - return "-1"; - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java deleted file mode 100644 index 00a19dc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ /dev/null @@ -1,340 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.tree.Tree; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysDeptService; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 部门管理 服务实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysDeptServiceImpl implements ISysDeptService, DeptService { - - private final SysDeptMapper baseMapper; - private final SysRoleMapper roleMapper; - private final SysUserMapper userMapper; - - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - @Override - public List selectDeptList(SysDeptBo dept) { - LambdaQueryWrapper lqw = buildQueryWrapper(dept); - return baseMapper.selectDeptList(lqw); - } - - /** - * 查询部门树结构信息 - * - * @param bo 部门信息 - * @return 部门树信息集合 - */ - @Override - public List> selectDeptTreeList(SysDeptBo bo) { - // 只查询未禁用部门 - bo.setStatus(UserConstants.DEPT_NORMAL); - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List depts = baseMapper.selectDeptList(lqw); - return buildDeptTreeSelect(depts); - } - - private LambdaQueryWrapper buildQueryWrapper(SysDeptBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysDept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); - lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); - lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId()); - lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); - lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); - lqw.orderByAsc(SysDept::getAncestors); - lqw.orderByAsc(SysDept::getParentId); - lqw.orderByAsc(SysDept::getOrderNum); - lqw.orderByAsc(SysDept::getDeptId); - return lqw; - } - - /** - * 构建前端所需要下拉树结构 - * - * @param depts 部门列表 - * @return 下拉树结构列表 - */ - @Override - public List> buildDeptTreeSelect(List depts) { - if (CollUtil.isEmpty(depts)) { - return CollUtil.newArrayList(); - } - return TreeBuildUtils.build(depts, (dept, tree) -> - tree.setId(dept.getDeptId()) - .setParentId(dept.getParentId()) - .setName(dept.getDeptName()) - .setWeight(dept.getOrderNum())); - } - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @return 选中部门列表 - */ - @Override - public List selectDeptListByRoleId(Long roleId) { - SysRole role = roleMapper.selectById(roleId); - return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); - } - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") - @Override - public SysDeptVo selectDeptById(Long deptId) { - SysDeptVo dept = baseMapper.selectVoById(deptId); - if (ObjectUtil.isNull(dept)) { - return null; - } - SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() - .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId())); - dept.setParentName(ObjectUtil.isNotNull(parentDept) ? parentDept.getDeptName() : null); - return dept; - } - - @Override - public List selectDeptByIds(List deptIds) { - return baseMapper.selectDeptList(new LambdaQueryWrapper() - .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) - .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); - } - - /** - * 通过部门ID查询部门名称 - * - * @param deptIds 部门ID串逗号分隔 - * @return 部门名称串逗号分隔 - */ - @Override - public String selectDeptNameByIds(String deptIds) { - List list = new ArrayList<>(); - for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { - SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); - if (ObjectUtil.isNotNull(vo)) { - list.add(vo.getDeptName()); - } - } - return String.join(StringUtils.SEPARATOR, list); - } - - /** - * 根据ID查询所有子部门数（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - @Override - public long selectNormalChildrenDeptById(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper() - .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - } - - /** - * 是否存在子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - @Override - public boolean hasChildByDeptId(Long deptId) { - return baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDept::getParentId, deptId)); - } - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 true 存在 false 不存在 - */ - @Override - public boolean checkDeptExistUser(Long deptId) { - return userMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getDeptId, deptId)); - } - - /** - * 校验部门名称是否唯一 - * - * @param dept 部门信息 - * @return 结果 - */ - @Override - public boolean checkDeptNameUnique(SysDeptBo dept) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDept::getDeptName, dept.getDeptName()) - .eq(SysDept::getParentId, dept.getParentId()) - .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())); - return !exist; - } - - /** - * 校验部门是否有数据权限 - * - * @param deptId 部门id - */ - @Override - public void checkDeptDataScope(Long deptId) { - if (ObjectUtil.isNull(deptId)) { - return; - } - if (LoginHelper.isSuperAdmin()) { - return; - } - if (baseMapper.countDeptById(deptId) == 0) { - throw new ServiceException("没有权限访问部门数据！"); - } - } - - /** - * 新增保存部门信息 - * - * @param bo 部门信息 - * @return 结果 - */ - @Override - public int insertDept(SysDeptBo bo) { - SysDept info = baseMapper.selectById(bo.getParentId()); - // 如果父节点不为正常状态,则不允许新增子节点 - if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { - throw new ServiceException("部门停用，不允许新增"); - } - SysDept dept = MapstructUtils.convert(bo, SysDept.class); - dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); - return baseMapper.insert(dept); - } - - /** - * 修改保存部门信息 - * - * @param bo 部门信息 - * @return 结果 - */ - @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId") - @Override - public int updateDept(SysDeptBo bo) { - SysDept dept = MapstructUtils.convert(bo, SysDept.class); - SysDept oldDept = baseMapper.selectById(dept.getDeptId()); - if (!oldDept.getParentId().equals(dept.getParentId())) { - // 如果是新父部门 则校验是否具有新父部门权限 避免越权 - this.checkDeptDataScope(dept.getParentId()); - SysDept newParentDept = baseMapper.selectById(dept.getParentId()); - if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) { - String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId(); - String oldAncestors = oldDept.getAncestors(); - dept.setAncestors(newAncestors); - updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); - } - } else { - dept.setAncestors(oldDept.getAncestors()); - } - int result = baseMapper.updateById(dept); - if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) - && !StringUtils.equals(UserConstants.DEPT_NORMAL, dept.getAncestors())) { - // 如果该部门是启用状态，则启用该部门的所有上级部门 - updateParentDeptStatusNormal(dept); - } - return result; - } - - /** - * 修改该部门的父级部门状态 - * - * @param dept 当前部门 - */ - private void updateParentDeptStatusNormal(SysDept dept) { - String ancestors = dept.getAncestors(); - Long[] deptIds = Convert.toLongArray(ancestors); - baseMapper.update(null, new LambdaUpdateWrapper() - .set(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .in(SysDept::getDeptId, Arrays.asList(deptIds))); - } - - /** - * 修改子元素关系 - * - * @param deptId 被修改的部门ID - * @param newAncestors 新的父ID集合 - * @param oldAncestors 旧的父ID集合 - */ - private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { - List children = baseMapper.selectList(new LambdaQueryWrapper() - .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List list = new ArrayList<>(); - for (SysDept child : children) { - SysDept dept = new SysDept(); - dept.setDeptId(child.getDeptId()); - dept.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); - list.add(dept); - } - if (CollUtil.isNotEmpty(list)) { - if (baseMapper.updateBatchById(list)) { - list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId())); - } - } - } - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") - @Override - public int deleteDeptById(Long deptId) { - return baseMapper.deleteById(deptId); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java deleted file mode 100644 index 1ab0faf..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.domain.SysDictData; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.service.ISysDictDataService; -import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.CachePut; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 字典 业务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysDictDataServiceImpl implements ISysDictDataService { - - private final SysDictDataMapper baseMapper; - - @Override - public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - @Override - public List selectDictDataList(SysDictDataBo dictData) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysDictDataBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort()); - lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel()); - lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType()); - lqw.orderByAsc(SysDictData::getDictSort); - return lqw; - } - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - @Override - public String selectDictLabel(String dictType, String dictValue) { - return baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysDictData::getDictLabel) - .eq(SysDictData::getDictType, dictType) - .eq(SysDictData::getDictValue, dictValue)) - .getDictLabel(); - } - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - @Override - public SysDictDataVo selectDictDataById(Long dictCode) { - return baseMapper.selectVoById(dictCode); - } - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - */ - @Override - public void deleteDictDataByIds(Long[] dictCodes) { - for (Long dictCode : dictCodes) { - SysDictData data = baseMapper.selectById(dictCode); - baseMapper.deleteById(dictCode); - CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType()); - } - } - - /** - * 新增保存字典数据信息 - * - * @param bo 字典数据信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") - @Override - public List insertDictData(SysDictDataBo bo) { - SysDictData data = MapstructUtils.convert(bo, SysDictData.class); - int row = baseMapper.insert(data); - if (row > 0) { - return baseMapper.selectDictDataByType(data.getDictType()); - } - throw new ServiceException("操作失败"); - } - - /** - * 修改保存字典数据信息 - * - * @param bo 字典数据信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") - @Override - public List updateDictData(SysDictDataBo bo) { - SysDictData data = MapstructUtils.convert(bo, SysDictData.class); - int row = baseMapper.updateById(data); - if (row > 0) { - return baseMapper.selectDictDataByType(data.getDictType()); - } - throw new ServiceException("操作失败"); - } - - /** - * 校验字典键值是否唯一 - * - * @param dict 字典数据 - * @return 结果 - */ - @Override - public boolean checkDictDataUnique(SysDictDataBo dict) { - Long dictCode = ObjectUtil.isNull(dict.getDictCode()) ? -1L : dict.getDictCode(); - SysDictData entity = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue())); - if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) { - return false; - } - return true; - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java deleted file mode 100644 index 1be0b7f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ /dev/null @@ -1,258 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.SysDictType; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysDictTypeMapper; -import org.dromara.system.service.ISysDictTypeService; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 字典 业务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService { - - private final SysDictTypeMapper baseMapper; - private final SysDictDataMapper dictDataMapper; - - @Override - public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeList(SysDictTypeBo dictType) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysDictTypeBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName()); - lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(SysDictType::getDictId); - return lqw; - } - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeAll() { - return baseMapper.selectVoList(); - } - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") - @Override - public List selectDictDataByType(String dictType) { - List dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (CollUtil.isNotEmpty(dictDatas)) { - return dictDatas; - } - return null; - } - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - @Override - public SysDictTypeVo selectDictTypeById(Long dictId) { - return baseMapper.selectVoById(dictId); - } - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - @Override - public SysDictTypeVo selectDictTypeByType(String dictType) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysDictType::getDictType, dictType)); - } - - /** - * 批量删除字典类型信息 - * - * @param dictIds 需要删除的字典ID - */ - @Override - public void deleteDictTypeByIds(Long[] dictIds) { - for (Long dictId : dictIds) { - SysDictType dictType = baseMapper.selectById(dictId); - if (dictDataMapper.exists(new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dictType.getDictType()))) { - throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); - } - CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType()); - } - baseMapper.deleteByIds(Arrays.asList(dictIds)); - } - - /** - * 重置字典缓存数据 - */ - @Override - public void resetDictCache() { - CacheUtils.clear(CacheNames.SYS_DICT); - } - - /** - * 新增保存字典类型信息 - * - * @param bo 字典类型信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") - @Override - public List insertDictType(SysDictTypeBo bo) { - SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); - int row = baseMapper.insert(dict); - if (row > 0) { - // 新增 type 下无 data 数据 返回空防止缓存穿透 - return new ArrayList<>(); - } - throw new ServiceException("操作失败"); - } - - /** - * 修改保存字典类型信息 - * - * @param bo 字典类型信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") - @Override - @Transactional(rollbackFor = Exception.class) - public List updateDictType(SysDictTypeBo bo) { - SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); - SysDictType oldDict = baseMapper.selectById(dict.getDictId()); - dictDataMapper.update(null, new LambdaUpdateWrapper() - .set(SysDictData::getDictType, dict.getDictType()) - .eq(SysDictData::getDictType, oldDict.getDictType())); - int row = baseMapper.updateById(dict); - if (row > 0) { - CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); - return dictDataMapper.selectDictDataByType(dict.getDictType()); - } - throw new ServiceException("操作失败"); - } - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - @Override - public boolean checkDictTypeUnique(SysDictTypeBo dictType) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDictType::getDictType, dictType.getDictType()) - .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId())); - return !exist; - } - - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @param separator 分隔符 - * @return 字典标签 - */ - @Override - public String getDictLabel(String dictType, String dictValue, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); - if (StringUtils.containsAny(dictValue, separator)) { - return Arrays.stream(dictValue.split(separator)) - .map(v -> map.getOrDefault(v, StringUtils.EMPTY)) - .collect(Collectors.joining(separator)); - } else { - return map.getOrDefault(dictValue, StringUtils.EMPTY); - } - } - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @param separator 分隔符 - * @return 字典值 - */ - @Override - public String getDictValue(String dictType, String dictLabel, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue); - if (StringUtils.containsAny(dictLabel, separator)) { - return Arrays.stream(dictLabel.split(separator)) - .map(l -> map.getOrDefault(l, StringUtils.EMPTY)) - .collect(Collectors.joining(separator)); - } else { - return map.getOrDefault(dictLabel, StringUtils.EMPTY); - } - } - - @Override - public Map getAllDictByDictType(String dictType) { - List list = selectDictDataByType(dictType); - return StreamUtils.toMap(list, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java deleted file mode 100644 index b95baf4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.useragent.UserAgent; -import cn.hutool.http.useragent.UserAgentUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jakarta.servlet.http.HttpServletRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.mapper.SysLogininforMapper; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysLogininforService; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 系统访问日志情况信息 服务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Slf4j -@Service -public class SysLogininforServiceImpl implements ISysLogininforService { - - private final SysLogininforMapper baseMapper; - - private final ISysClientService clientService; - - /** - * 记录登录信息 - * - * @param logininforEvent 登录事件 - */ - @Async - @EventListener - public void recordLogininfor(LogininforEvent logininforEvent) { - HttpServletRequest request = logininforEvent.getRequest(); - final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); - final String ip = ServletUtils.getClientIP(request); - // 客户端信息 - String clientId = request.getHeader(LoginHelper.CLIENT_KEY); - SysClientVo client = null; - if (StringUtils.isNotBlank(clientId)) { - client = clientService.queryByClientId(clientId); - } - - String address = AddressUtils.getRealAddressByIP(ip); - StringBuilder s = new StringBuilder(); - s.append(getBlock(ip)); - s.append(address); - s.append(getBlock(logininforEvent.getUsername())); - s.append(getBlock(logininforEvent.getStatus())); - s.append(getBlock(logininforEvent.getMessage())); - // 打印信息到日志 - log.info(s.toString(), logininforEvent.getArgs()); - // 获取客户端操作系统 - String os = userAgent.getOs().getName(); - // 获取客户端浏览器 - String browser = userAgent.getBrowser().getName(); - // 封装对象 - SysLogininforBo logininfor = new SysLogininforBo(); - logininfor.setTenantId(logininforEvent.getTenantId()); - logininfor.setUserName(logininforEvent.getUsername()); - if (ObjectUtil.isNotNull(client)) { - logininfor.setClientKey(client.getClientKey()); - logininfor.setDeviceType(client.getDeviceType()); - } - logininfor.setIpaddr(ip); - logininfor.setLoginLocation(address); - logininfor.setBrowser(browser); - logininfor.setOs(os); - logininfor.setMsg(logininforEvent.getMessage()); - // 日志状态 - if (StringUtils.equalsAny(logininforEvent.getStatus(), Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) { - logininfor.setStatus(Constants.SUCCESS); - } else if (Constants.LOGIN_FAIL.equals(logininforEvent.getStatus())) { - logininfor.setStatus(Constants.FAIL); - } - // 插入数据 - insertLogininfor(logininfor); - } - - private String getBlock(Object msg) { - if (msg == null) { - msg = ""; - } - return "[" + msg.toString() + "]"; - } - - @Override - public TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery) { - Map params = logininfor.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); - if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { - pageQuery.setOrderByColumn("info_id"); - pageQuery.setIsAsc("desc"); - } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 新增系统登录日志 - * - * @param bo 访问日志对象 - */ - @Override - public void insertLogininfor(SysLogininforBo bo) { - SysLogininfor logininfor = MapstructUtils.convert(bo, SysLogininfor.class); - logininfor.setLoginTime(new Date()); - baseMapper.insert(logininfor); - } - - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - @Override - public List selectLogininforList(SysLogininforBo logininfor) { - Map params = logininfor.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(SysLogininfor::getInfoId)); - } - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return 结果 - */ - @Override - public int deleteLogininforByIds(Long[] infoIds) { - return baseMapper.deleteByIds(Arrays.asList(infoIds)); - } - - /** - * 清空系统登录日志 - */ - @Override - public void cleanLogininfor() { - baseMapper.delete(new LambdaQueryWrapper<>()); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java deleted file mode 100644 index af844c9..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ /dev/null @@ -1,369 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.tree.Tree; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MetaVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.mapper.SysMenuMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysMenuService; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * 菜单 业务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysMenuServiceImpl implements ISysMenuService { - - private final SysMenuMapper baseMapper; - private final SysRoleMapper roleMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysTenantPackageMapper tenantPackageMapper; - - /** - * 根据用户查询系统菜单列表 - * - * @param userId 用户ID - * @return 菜单列表 - */ - @Override - public List selectMenuList(Long userId) { - return selectMenuList(new SysMenuBo(), userId); - } - - /** - * 查询系统菜单列表 - * - * @param menu 菜单信息 - * @return 菜单列表 - */ - @Override - public List selectMenuList(SysMenuBo menu, Long userId) { - List menuList; - // 管理员显示所有菜单信息 - if (LoginHelper.isSuperAdmin(userId)) { - menuList = baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()) - .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()) - .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus()) - .orderByAsc(SysMenu::getParentId) - .orderByAsc(SysMenu::getOrderNum)); - } else { - QueryWrapper wrapper = Wrappers.query(); - wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId) - .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) - .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) - .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) - .orderByAsc("m.parent_id") - .orderByAsc("m.order_num"); - List list = baseMapper.selectMenuListByUserId(wrapper); - menuList = MapstructUtils.convert(list, SysMenuVo.class); - } - return menuList; - } - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - @Override - public Set selectMenuPermsByUserId(Long userId) { - List perms = baseMapper.selectMenuPermsByUserId(userId); - Set permsSet = new HashSet<>(); - for (String perm : perms) { - if (StringUtils.isNotEmpty(perm)) { - permsSet.addAll(StringUtils.splitList(perm.trim())); - } - } - return permsSet; - } - - /** - * 根据角色ID查询权限 - * - * @param roleId 角色ID - * @return 权限列表 - */ - @Override - public Set selectMenuPermsByRoleId(Long roleId) { - List perms = baseMapper.selectMenuPermsByRoleId(roleId); - Set permsSet = new HashSet<>(); - for (String perm : perms) { - if (StringUtils.isNotEmpty(perm)) { - permsSet.addAll(StringUtils.splitList(perm.trim())); - } - } - return permsSet; - } - - /** - * 根据用户ID查询菜单 - * - * @param userId 用户名称 - * @return 菜单列表 - */ - @Override - public List selectMenuTreeByUserId(Long userId) { - List menus; - if (LoginHelper.isSuperAdmin(userId)) { - menus = baseMapper.selectMenuTreeAll(); - } else { - menus = baseMapper.selectMenuTreeByUserId(userId); - } - return getChildPerms(menus, 0); - } - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @return 选中菜单列表 - */ - @Override - public List selectMenuListByRoleId(Long roleId) { - SysRole role = roleMapper.selectById(roleId); - return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); - } - - /** - * 根据租户套餐ID查询菜单树信息 - * - * @param packageId 租户套餐ID - * @return 选中菜单列表 - */ - @Override - public List selectMenuListByPackageId(Long packageId) { - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); - if (CollUtil.isEmpty(menuIds)) { - return List.of(); - } - List parentIds = null; - if (tenantPackage.getMenuCheckStrictly()) { - parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() - .select(SysMenu::getParentId) - .in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); - } - return baseMapper.selectObjs(new LambdaQueryWrapper() - .in(SysMenu::getMenuId, menuIds) - .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); - } - - /** - * 构建前端路由所需要的菜单 - * 路由name命名规则 path首字母转大写 + id - * - * @param menus 菜单列表 - * @return 路由列表 - */ - @Override - public List buildMenus(List menus) { - List routers = new LinkedList<>(); - for (SysMenu menu : menus) { - String name = menu.getRouteName() + menu.getMenuId(); - RouterVo router = new RouterVo(); - router.setHidden("1".equals(menu.getVisible())); - router.setName(name); - router.setPath(menu.getRouterPath()); - router.setComponent(menu.getComponentInfo()); - router.setQuery(menu.getQueryParam()); - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); - List cMenus = menu.getChildren(); - if (CollUtil.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { - router.setAlwaysShow(true); - router.setRedirect("noRedirect"); - router.setChildren(buildMenus(cMenus)); - } else if (menu.isMenuFrame()) { - String frameName = StringUtils.capitalize(menu.getPath()) + menu.getMenuId(); - router.setMeta(null); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); - children.setPath(menu.getPath()); - children.setComponent(menu.getComponent()); - children.setName(frameName); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); - children.setQuery(menu.getQueryParam()); - childrenList.add(children); - router.setChildren(childrenList); - } else if (menu.getParentId().intValue() == 0 && menu.isInnerLink()) { - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); - router.setPath("/"); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); - String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath()); - String innerLinkName = StringUtils.capitalize(routerPath) + menu.getMenuId(); - children.setPath(routerPath); - children.setComponent(UserConstants.INNER_LINK); - children.setName(innerLinkName); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); - childrenList.add(children); - router.setChildren(childrenList); - } - routers.add(router); - } - return routers; - } - - /** - * 构建前端所需要下拉树结构 - * - * @param menus 菜单列表 - * @return 下拉树结构列表 - */ - @Override - public List> buildMenuTreeSelect(List menus) { - if (CollUtil.isEmpty(menus)) { - return CollUtil.newArrayList(); - } - return TreeBuildUtils.build(menus, (menu, tree) -> - tree.setId(menu.getMenuId()) - .setParentId(menu.getParentId()) - .setName(menu.getMenuName()) - .setWeight(menu.getOrderNum())); - } - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * @return 菜单信息 - */ - @Override - public SysMenuVo selectMenuById(Long menuId) { - return baseMapper.selectVoById(menuId); - } - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public boolean hasChildByMenuId(Long menuId) { - return baseMapper.exists(new LambdaQueryWrapper().eq(SysMenu::getParentId, menuId)); - } - - /** - * 查询菜单使用数量 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public boolean checkMenuExistRole(Long menuId) { - return roleMenuMapper.exists(new LambdaQueryWrapper().eq(SysRoleMenu::getMenuId, menuId)); - } - - /** - * 新增保存菜单信息 - * - * @param bo 菜单信息 - * @return 结果 - */ - @Override - public int insertMenu(SysMenuBo bo) { - SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); - return baseMapper.insert(menu); - } - - /** - * 修改保存菜单信息 - * - * @param bo 菜单信息 - * @return 结果 - */ - @Override - public int updateMenu(SysMenuBo bo) { - SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); - return baseMapper.updateById(menu); - } - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public int deleteMenuById(Long menuId) { - return baseMapper.deleteById(menuId); - } - - /** - * 校验菜单名称是否唯一 - * - * @param menu 菜单信息 - * @return 结果 - */ - @Override - public boolean checkMenuNameUnique(SysMenuBo menu) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysMenu::getMenuName, menu.getMenuName()) - .eq(SysMenu::getParentId, menu.getParentId()) - .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId())); - return !exist; - } - - /** - * 根据父节点的ID获取所有子节点 - * - * @param list 分类表 - * @param parentId 传入的父节点ID - * @return String - */ - private List getChildPerms(List list, int parentId) { - List returnList = new ArrayList<>(); - for (SysMenu t : list) { - // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 - if (t.getParentId() == parentId) { - recursionFn(list, t); - returnList.add(t); - } - } - return returnList; - } - - /** - * 递归列表 - */ - private void recursionFn(List list, SysMenu t) { - // 得到子节点列表 - List childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); - t.setChildren(childList); - for (SysMenu tChild : childList) { - // 判断是否有子节点 - if (list.stream().anyMatch(n -> n.getParentId().equals(tChild.getMenuId()))) { - recursionFn(list, tChild); - } - } - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java deleted file mode 100644 index db63e61..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysNoticeMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysNoticeService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 公告 服务层实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysNoticeServiceImpl implements ISysNoticeService { - - private final SysNoticeMapper baseMapper; - private final SysUserMapper userMapper; - - @Override - public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - @Override - public SysNoticeVo selectNoticeById(Long noticeId) { - return baseMapper.selectVoById(noticeId); - } - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - @Override - public List selectNoticeList(SysNoticeBo notice) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysNoticeBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType()); - if (StringUtils.isNotBlank(bo.getCreateByName())) { - SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, bo.getCreateByName())); - lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null); - } - lqw.orderByAsc(SysNotice::getNoticeId); - return lqw; - } - - /** - * 新增公告 - * - * @param bo 公告信息 - * @return 结果 - */ - @Override - public int insertNotice(SysNoticeBo bo) { - SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); - return baseMapper.insert(notice); - } - - /** - * 修改公告 - * - * @param bo 公告信息 - * @return 结果 - */ - @Override - public int updateNotice(SysNoticeBo bo) { - SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); - return baseMapper.updateById(notice); - } - - /** - * 删除公告对象 - * - * @param noticeId 公告ID - * @return 结果 - */ - @Override - public int deleteNoticeById(Long noticeId) { - return baseMapper.deleteById(noticeId); - } - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - @Override - public int deleteNoticeByIds(Long[] noticeIds) { - return baseMapper.deleteByIds(Arrays.asList(noticeIds)); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java deleted file mode 100644 index 750e455..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ArrayUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.mapper.SysOperLogMapper; -import org.dromara.system.service.ISysOperLogService; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 操作日志 服务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysOperLogServiceImpl implements ISysOperLogService { - - private final SysOperLogMapper baseMapper; - - /** - * 操作日志记录 - * - * @param operLogEvent 操作日志事件 - */ - @Async - @EventListener - public void recordOper(OperLogEvent operLogEvent) { - SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class); - // 远程查询操作地点 - operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); - insertOperlog(operLog); - } - - @Override - public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(operLog); - if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { - pageQuery.setOrderByColumn("oper_id"); - pageQuery.setIsAsc("desc"); - } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - private LambdaQueryWrapper buildQueryWrapper(SysOperLogBo operLog) { - Map params = operLog.getParams(); - return new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) - .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - SysOperLog::getBusinessType, operLog.getBusinessType()) - .func(f -> { - if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); - } - }) - .eq(operLog.getStatus() != null, - SysOperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); - } - - /** - * 新增操作日志 - * - * @param bo 操作日志对象 - */ - @Override - public void insertOperlog(SysOperLogBo bo) { - SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); - operLog.setOperTime(new Date()); - baseMapper.insert(operLog); - } - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - @Override - public List selectOperLogList(SysOperLogBo operLog) { - LambdaQueryWrapper lqw = buildQueryWrapper(operLog); - return baseMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId)); - } - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - @Override - public int deleteOperLogByIds(Long[] operIds) { - return baseMapper.deleteByIds(Arrays.asList(operIds)); - } - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - @Override - public SysOperLogVo selectOperLogById(Long operId) { - return baseMapper.selectVoById(operId); - } - - /** - * 清空操作日志 - */ - @Override - public void cleanOperLog() { - baseMapper.delete(new LambdaQueryWrapper<>()); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java deleted file mode 100644 index a1eefce..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.mapper.SysOssConfigMapper; -import org.dromara.system.service.ISysOssConfigService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.List; - -/** - * 对象存储配置Service业务层处理 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class SysOssConfigServiceImpl implements ISysOssConfigService { - - private final SysOssConfigMapper baseMapper; - - /** - * 项目启动时，初始化参数到缓存，加载配置类 - */ - @Override - public void init() { - List list = baseMapper.selectList(); - // 加载OSS初始化配置 - for (SysOssConfig config : list) { - String configKey = config.getConfigKey(); - if ("0".equals(config.getStatus())) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey); - } - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - } - - @Override - public SysOssConfigVo queryById(Long ossConfigId) { - return baseMapper.selectVoById(ossConfigId); - } - - @Override - public TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - - private LambdaQueryWrapper buildQueryWrapper(SysOssConfigBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey()); - lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus()); - lqw.orderByAsc(SysOssConfig::getOssConfigId); - return lqw; - } - - @Override - public Boolean insertByBo(SysOssConfigBo bo) { - SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); - validEntityBeforeSave(config); - boolean flag = baseMapper.insert(config) > 0; - if (flag) { - // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - return flag; - } - - @Override - public Boolean updateByBo(SysOssConfigBo bo) { - SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); - validEntityBeforeSave(config); - LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); - luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); - luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, ""); - luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, ""); - luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, ""); - luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId()); - boolean flag = baseMapper.update(config, luw) > 0; - if (flag) { - // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - return flag; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysOssConfig entity) { - if (StringUtils.isNotEmpty(entity.getConfigKey()) - && !checkConfigKeyUnique(entity)) { - throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); - } - } - - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) { - throw new ServiceException("系统内置, 不可删除!"); - } - } - List list = CollUtil.newArrayList(); - for (Long configId : ids) { - SysOssConfig config = baseMapper.selectById(configId); - list.add(config); - } - boolean flag = baseMapper.deleteByIds(ids) > 0; - if (flag) { - list.forEach(sysOssConfig -> - CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey())); - } - return flag; - } - - /** - * 判断configKey是否唯一 - */ - private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) { - long ossConfigId = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId(); - SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) - .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())); - if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { - return false; - } - return true; - } - - /** - * 启用禁用状态 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int updateOssConfigStatus(SysOssConfigBo bo) { - SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class); - int row = baseMapper.update(null, new LambdaUpdateWrapper() - .set(SysOssConfig::getStatus, "1")); - row += baseMapper.updateById(sysOssConfig); - if (row > 0) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey()); - } - return row; - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java deleted file mode 100644 index f58f061..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ /dev/null @@ -1,269 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enumd.AccessPolicyType; -import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.mapper.SysOssMapper; -import org.dromara.system.service.ISysOssService; -import org.jetbrains.annotations.NotNull; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * 文件上传 服务层实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysOssServiceImpl implements ISysOssService, OssService { - - private final SysOssMapper baseMapper; - - /** - * 查询OSS对象存储列表 - * - * @param bo OSS对象存储分页查询对象 - * @param pageQuery 分页查询实体类 - * @return 结果 - */ - @Override - public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); - result.setRecords(filterResult); - return TableDataInfo.build(result); - } - - /** - * 根据一组 ossIds 获取对应的 SysOssVo 列表 - * - * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 SysOssVo 对象的列表 - */ - @Override - public List listByIds(Collection ossIds) { - List list = new ArrayList<>(); - SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); - for (Long id : ossIds) { - SysOssVo vo = ossService.getById(id); - if (ObjectUtil.isNotNull(vo)) { - try { - list.add(this.matchingUrl(vo)); - } catch (Exception ignored) { - // 如果oss异常无法连接则将数据直接返回 - list.add(vo); - } - } - } - return list; - } - - /** - * 根据一组 ossIds 获取对应文件的 URL 列表 - * - * @param ossIds 以逗号分隔的 ossId 字符串 - * @return 以逗号分隔的文件 URL 字符串 - */ - @Override - public String selectUrlByIds(String ossIds) { - List list = new ArrayList<>(); - SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); - for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - SysOssVo vo = ossService.getById(id); - if (ObjectUtil.isNotNull(vo)) { - try { - list.add(this.matchingUrl(vo).getUrl()); - } catch (Exception ignored) { - // 如果oss异常无法连接则将数据直接返回 - list.add(vo.getUrl()); - } - } - } - return String.join(StringUtils.SEPARATOR, list); - } - - @Override - public List selectByIds(String ossIds) { - List list = new ArrayList<>(); - for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); - if (ObjectUtil.isNotNull(vo)) { - try { - vo.setUrl(this.matchingUrl(vo).getUrl()); - list.add(BeanUtil.toBean(vo, OssDTO.class)); - } catch (Exception ignored) { - // 如果oss异常无法连接则将数据直接返回 - list.add(BeanUtil.toBean(vo, OssDTO.class)); - } - } - } - return list; - } - - private LambdaQueryWrapper buildQueryWrapper(SysOssBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName()); - lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName()); - lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix()); - lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); - lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); - lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy()); - lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService()); - lqw.orderByAsc(SysOss::getOssId); - return lqw; - } - - /** - * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 - * - * @param ossId 文件在数据库中的唯一标识 - * @return SysOssVo 对象，包含文件信息 - */ - @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") - @Override - public SysOssVo getById(Long ossId) { - return baseMapper.selectVoById(ossId); - } - - - /** - * 文件下载方法，支持一次性下载完整文件 - * - * @param ossId OSS对象ID - * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 - */ - @Override - public void download(Long ossId, HttpServletResponse response) throws IOException { - SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); - if (ObjectUtil.isNull(sysOss)) { - throw new ServiceException("文件数据不存在!"); - } - FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); - OssClient storage = OssFactory.instance(sysOss.getService()); - long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); - response.setContentLengthLong(contentLength); - } - - /** - * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 - * - * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 - * @throws ServiceException 如果上传过程中发生异常，则抛出 ServiceException 异常 - */ - @Override - public SysOssVo upload(MultipartFile file) { - String originalfileName = file.getOriginalFilename(); - String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); - OssClient storage = OssFactory.instance(); - UploadResult uploadResult; - try { - uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType()); - } catch (IOException e) { - throw new ServiceException(e.getMessage()); - } - // 保存文件信息 - return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); - } - - /** - * 上传文件到对象存储服务，并保存文件信息到数据库 - * - * @param file 要上传的文件对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 - */ - @Override - public SysOssVo upload(File file) { - String originalfileName = file.getName(); - String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); - OssClient storage = OssFactory.instance(); - UploadResult uploadResult = storage.uploadSuffix(file, suffix); - // 保存文件信息 - return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); - } - - @NotNull - private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { - SysOss oss = new SysOss(); - oss.setUrl(uploadResult.getUrl()); - oss.setFileSuffix(suffix); - oss.setFileName(uploadResult.getFilename()); - oss.setOriginalName(originalfileName); - oss.setService(configKey); - baseMapper.insert(oss); - SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class); - return this.matchingUrl(sysOssVo); - } - - /** - * 删除OSS对象存储 - * - * @param ids OSS对象ID串 - * @param isValid 判断是否需要校验 - * @return 结果 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - // 做一些业务上的校验,判断是否需要校验 - } - List list = baseMapper.selectByIds(ids); - for (SysOss sysOss : list) { - OssClient storage = OssFactory.instance(sysOss.getService()); - storage.delete(sysOss.getUrl()); - } - return baseMapper.deleteByIds(ids) > 0; - } - - /** - * 桶类型为 private 的URL 修改为临时URL时长为120s - * - * @param oss OSS对象 - * @return oss 匹配Url的OSS对象 - */ - private SysOssVo matchingUrl(SysOssVo oss) { - OssClient storage = OssFactory.instance(oss.getService()); - // 仅修改桶类型为 private 的URL，临时URL时长为120s - if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { - oss.setUrl(storage.getPrivateUrl(oss.getFileName(), 120)); - } - return oss; - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java deleted file mode 100644 index 9852821..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.system.service.impl; - -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysMenuService; -import org.dromara.system.service.ISysPermissionService; -import org.dromara.system.service.ISysRoleService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.HashSet; -import java.util.Set; - -/** - * 用户权限处理 - * - * @author ruoyi - */ -@RequiredArgsConstructor -@Service -public class SysPermissionServiceImpl implements ISysPermissionService { - - private final ISysRoleService roleService; - private final ISysMenuService menuService; - - /** - * 获取角色数据权限 - * - * @param userId 用户id - * @return 角色权限信息 - */ - @Override - public Set getRolePermission(Long userId) { - Set roles = new HashSet<>(); - // 管理员拥有所有权限 - if (LoginHelper.isSuperAdmin(userId)) { - roles.add(TenantConstants.SUPER_ADMIN_ROLE_KEY); - } else { - roles.addAll(roleService.selectRolePermissionByUserId(userId)); - } - return roles; - } - - /** - * 获取菜单数据权限 - * - * @param userId 用户id - * @return 菜单权限信息 - */ - @Override - public Set getMenuPermission(Long userId) { - Set perms = new HashSet<>(); - // 管理员拥有所有权限 - if (LoginHelper.isSuperAdmin(userId)) { - perms.add("*:*:*"); - } else { - perms.addAll(menuService.selectMenuPermsByUserId(userId)); - } - return perms; - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java deleted file mode 100644 index 2c38129..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ /dev/null @@ -1,242 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysPostMapper; -import org.dromara.system.mapper.SysUserPostMapper; -import org.dromara.system.service.ISysPostService; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 岗位信息 服务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysPostServiceImpl implements ISysPostService { - - private final SysPostMapper baseMapper; - private final SysDeptMapper deptMapper; - private final SysUserPostMapper userPostMapper; - - @Override - public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { - Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); - return TableDataInfo.build(page); - } - - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位信息集合 - */ - @Override - public List selectPostList(SysPostBo post) { - return baseMapper.selectVoList(buildQueryWrapper(post)); - } - - /** - * 根据查询条件构建查询包装器 - * - * @param bo 查询条件对象 - * @return 构建好的查询包装器 - */ - private LambdaQueryWrapper buildQueryWrapper(SysPostBo bo) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), SysPost::getPostCode, bo.getPostCode()) - .like(StringUtils.isNotBlank(bo.getPostCategory()), SysPost::getPostCategory, bo.getPostCategory()) - .like(StringUtils.isNotBlank(bo.getPostName()), SysPost::getPostName, bo.getPostName()) - .eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus()) - .orderByAsc(SysPost::getPostSort); - if (ObjectUtil.isNotNull(bo.getDeptId())) { - //优先单部门搜索 - wrapper.eq(SysPost::getDeptId, bo.getDeptId()); - } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { - //部门树搜索 - wrapper.and(x -> { - List deptIds = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) - .apply(DataBaseHelper.findInSet(bo.getBelongDeptId(), "ancestors"))) - .stream() - .map(SysDept::getDeptId) - .collect(Collectors.toList()); - deptIds.add(bo.getBelongDeptId()); - x.in(SysPost::getDeptId, deptIds); - }); - } - return wrapper; - } - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - @Override - public List selectPostAll() { - return baseMapper.selectVoList(new QueryWrapper<>()); - } - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - @Override - public SysPostVo selectPostById(Long postId) { - return baseMapper.selectVoById(postId); - } - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - @Override - public List selectPostListByUserId(Long userId) { - List list = baseMapper.selectPostsByUserId(userId); - return StreamUtils.toList(list, SysPostVo::getPostId); - } - - /** - * 通过岗位ID串查询岗位 - * - * @param postIds 岗位id串 - * @return 岗位列表信息 - */ - @Override - public List selectPostByIds(List postIds) { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode) - .eq(SysPost::getStatus, UserConstants.POST_NORMAL) - .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds)); - } - - /** - * 校验岗位名称是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public boolean checkPostNameUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostName, post.getPostName()) - .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); - return !exist; - } - - /** - * 校验岗位编码是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public boolean checkPostCodeUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostCode, post.getPostCode()) - .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); - return !exist; - } - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public long countUserPostById(Long postId) { - return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysUserPost::getPostId, postId)); - } - - /** - * 通过部门ID查询岗位使用数量 - * - * @param deptId 部门id - * @return 结果 - */ - @Override - public long countPostByDeptId(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysPost::getDeptId, deptId)); - } - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public int deletePostById(Long postId) { - return baseMapper.deleteById(postId); - } - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - */ - @Override - public int deletePostByIds(Long[] postIds) { - for (Long postId : postIds) { - SysPost post = baseMapper.selectById(postId); - if (countUserPostById(postId) > 0) { - throw new ServiceException(String.format("%1$s已分配，不能删除!", post.getPostName())); - } - } - return baseMapper.deleteByIds(Arrays.asList(postIds)); - } - - /** - * 新增保存岗位信息 - * - * @param bo 岗位信息 - * @return 结果 - */ - @Override - public int insertPost(SysPostBo bo) { - SysPost post = MapstructUtils.convert(bo, SysPost.class); - return baseMapper.insert(post); - } - - /** - * 修改保存岗位信息 - * - * @param bo 岗位信息 - * @return 结果 - */ - @Override - public int updatePost(SysPostBo bo) { - SysPost post = MapstructUtils.convert(bo, SysPost.class); - return baseMapper.updateById(post); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java deleted file mode 100644 index 9b8b0ec..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ /dev/null @@ -1,514 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.dev33.satoken.exception.NotLoginException; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysRoleService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -/** - * 角色 业务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysRoleServiceImpl implements ISysRoleService { - - private final SysRoleMapper baseMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysRoleDeptMapper roleDeptMapper; - - @Override - public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); - return TableDataInfo.build(page); - } - - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * @return 角色数据集合信息 - */ - @Override - public List selectRoleList(SysRoleBo role) { - return baseMapper.selectRoleList(this.buildQueryWrapper(role)); - } - - private Wrapper buildQueryWrapper(SysRoleBo bo) { - Map params = bo.getParams(); - QueryWrapper wrapper = Wrappers.query(); - wrapper.eq("r.del_flag", UserConstants.ROLE_NORMAL) - .eq(ObjectUtil.isNotNull(bo.getRoleId()), "r.role_id", bo.getRoleId()) - .like(StringUtils.isNotBlank(bo.getRoleName()), "r.role_name", bo.getRoleName()) - .eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus()) - .like(StringUtils.isNotBlank(bo.getRoleKey()), "r.role_key", bo.getRoleKey()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "r.create_time", params.get("beginTime"), params.get("endTime")) - .orderByAsc("r.role_sort").orderByAsc("r.create_time"); - return wrapper; - } - - /** - * 根据用户ID查询角色 - * - * @param userId 用户ID - * @return 角色列表 - */ - @Override - public List selectRolesByUserId(Long userId) { - return baseMapper.selectRolesByUserId(userId); - } - - /** - * 根据用户ID查询角色列表(包含被授权状态) - * - * @param userId 用户ID - * @return 角色列表 - */ - @Override - public List selectRolesAuthByUserId(Long userId) { - List userRoles = baseMapper.selectRolesByUserId(userId); - List roles = selectRoleAll(); - // 使用HashSet提高查找效率 - Set userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId); - for (SysRoleVo role : roles) { - if (userRoleIds.contains(role.getRoleId())) { - role.setFlag(true); - } - } - return roles; - } - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - @Override - public Set selectRolePermissionByUserId(Long userId) { - List perms = baseMapper.selectRolesByUserId(userId); - Set permsSet = new HashSet<>(); - for (SysRoleVo perm : perms) { - if (ObjectUtil.isNotNull(perm)) { - permsSet.addAll(StringUtils.splitList(perm.getRoleKey().trim())); - } - } - return permsSet; - } - - /** - * 查询所有角色 - * - * @return 角色列表 - */ - @Override - public List selectRoleAll() { - return this.selectRoleList(new SysRoleBo()); - } - - /** - * 根据用户ID获取角色选择框列表 - * - * @param userId 用户ID - * @return 选中角色ID列表 - */ - @Override - public List selectRoleListByUserId(Long userId) { - List list = baseMapper.selectRolesByUserId(userId); - return StreamUtils.toList(list, SysRoleVo::getRoleId); - } - - /** - * 通过角色ID查询角色 - * - * @param roleId 角色ID - * @return 角色对象信息 - */ - @Override - public SysRoleVo selectRoleById(Long roleId) { - return baseMapper.selectRoleById(roleId); - } - - /** - * 通过角色ID串查询角色 - * - * @param roleIds 角色ID串 - * @return 角色列表信息 - */ - @Override - public List selectRoleByIds(List roleIds) { - return baseMapper.selectRoleList(new QueryWrapper() - .eq("r.status", UserConstants.ROLE_NORMAL) - .in(CollUtil.isNotEmpty(roleIds), "r.role_id", roleIds)); - } - - /** - * 校验角色名称是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - public boolean checkRoleNameUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleName, role.getRoleName()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); - return !exist; - } - - /** - * 校验角色权限是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - public boolean checkRoleKeyUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleKey, role.getRoleKey()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); - return !exist; - } - - /** - * 校验角色是否允许操作 - * - * @param role 角色信息 - */ - @Override - public void checkRoleAllowed(SysRoleBo role) { - if (ObjectUtil.isNotNull(role.getRoleId()) && LoginHelper.isSuperAdmin(role.getRoleId())) { - throw new ServiceException("不允许操作超级管理员角色"); - } - String[] keys = new String[]{TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}; - // 新增不允许使用 管理员标识符 - if (ObjectUtil.isNull(role.getRoleId()) - && StringUtils.equalsAny(role.getRoleKey(), keys)) { - throw new ServiceException("不允许使用系统内置管理员角色标识符!"); - } - // 修改不允许修改 管理员标识符 - if (ObjectUtil.isNotNull(role.getRoleId())) { - SysRole sysRole = baseMapper.selectById(role.getRoleId()); - // 如果标识符不相等 判断为修改了管理员标识符 - if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) { - if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) { - throw new ServiceException("不允许修改系统内置管理员角色标识符!"); - } else if (StringUtils.equalsAny(role.getRoleKey(), keys)) { - throw new ServiceException("不允许使用系统内置管理员角色标识符!"); - } - } - } - } - - /** - * 校验角色是否有数据权限 - * - * @param roleId 角色id - */ - @Override - public void checkRoleDataScope(Long roleId) { - if (ObjectUtil.isNull(roleId)) { - return; - } - if (LoginHelper.isSuperAdmin()) { - return; - } - List roles = this.selectRoleList(new SysRoleBo(roleId)); - if (CollUtil.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色数据！"); - } - - } - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * @return 结果 - */ - @Override - public long countUserRoleByRoleId(Long roleId) { - return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); - } - - /** - * 新增保存角色信息 - * - * @param bo 角色信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertRole(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); - // 新增角色信息 - baseMapper.insert(role); - bo.setRoleId(role.getRoleId()); - return insertRoleMenu(bo); - } - - /** - * 修改保存角色信息 - * - * @param bo 角色信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int updateRole(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); - - if (UserConstants.ROLE_DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) { - throw new ServiceException("角色已分配，不能禁用!"); - } - // 修改角色信息 - baseMapper.updateById(role); - // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, role.getRoleId())); - return insertRoleMenu(bo); - } - - /** - * 修改角色状态 - * - * @param roleId 角色ID - * @param status 角色状态 - * @return 结果 - */ - @Override - public int updateRoleStatus(Long roleId, String status) { - if (UserConstants.ROLE_DISABLE.equals(status) && this.countUserRoleByRoleId(roleId) > 0) { - throw new ServiceException("角色已分配，不能禁用!"); - } - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysRole::getStatus, status) - .eq(SysRole::getRoleId, roleId)); - } - - /** - * 修改数据权限信息 - * - * @param bo 角色信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int authDataScope(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); - // 修改角色信息 - baseMapper.updateById(role); - // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, role.getRoleId())); - // 新增角色和部门信息（数据权限） - return insertRoleDept(bo); - } - - /** - * 新增角色菜单信息 - * - * @param role 角色对象 - */ - private int insertRoleMenu(SysRoleBo role) { - int rows = 1; - // 新增用户与角色管理 - List list = new ArrayList(); - for (Long menuId : role.getMenuIds()) { - SysRoleMenu rm = new SysRoleMenu(); - rm.setRoleId(role.getRoleId()); - rm.setMenuId(menuId); - list.add(rm); - } - if (list.size() > 0) { - rows = roleMenuMapper.insertBatch(list) ? list.size() : 0; - } - return rows; - } - - /** - * 新增角色部门信息(数据权限) - * - * @param role 角色对象 - */ - private int insertRoleDept(SysRoleBo role) { - int rows = 1; - // 新增角色与部门（数据权限）管理 - List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) { - SysRoleDept rd = new SysRoleDept(); - rd.setRoleId(role.getRoleId()); - rd.setDeptId(deptId); - list.add(rd); - } - if (list.size() > 0) { - rows = roleDeptMapper.insertBatch(list) ? list.size() : 0; - } - return rows; - } - - /** - * 通过角色ID删除角色 - * - * @param roleId 角色ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteRoleById(Long roleId) { - // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, roleId)); - // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, roleId)); - return baseMapper.deleteById(roleId); - } - - /** - * 批量删除角色信息 - * - * @param roleIds 需要删除的角色ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteRoleByIds(Long[] roleIds) { - for (Long roleId : roleIds) { - SysRole role = baseMapper.selectById(roleId); - checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class)); - checkRoleDataScope(roleId); - if (countUserRoleByRoleId(roleId) > 0) { - throw new ServiceException(String.format("%1$s已分配，不能删除!", role.getRoleName())); - } - } - List ids = Arrays.asList(roleIds); - // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, ids)); - // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().in(SysRoleDept::getRoleId, ids)); - return baseMapper.deleteByIds(ids); - } - - /** - * 取消授权用户角色 - * - * @param userRole 用户和角色关联信息 - * @return 结果 - */ - @Override - public int deleteAuthUser(SysUserRole userRole) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(SysUserRole::getRoleId, userRole.getRoleId()) - .eq(SysUserRole::getUserId, userRole.getUserId())); - if (rows > 0) { - cleanOnlineUserByRole(userRole.getRoleId()); - } - return rows; - } - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要取消授权的用户数据ID - * @return 结果 - */ - @Override - public int deleteAuthUsers(Long roleId, Long[] userIds) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(SysUserRole::getRoleId, roleId) - .in(SysUserRole::getUserId, Arrays.asList(userIds))); - if (rows > 0) { - cleanOnlineUserByRole(roleId); - } - return rows; - } - - /** - * 批量选择授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要授权的用户数据ID - * @return 结果 - */ - @Override - public int insertAuthUsers(Long roleId, Long[] userIds) { - // 新增用户与角色管理 - int rows = 1; - List list = StreamUtils.toList(List.of(userIds), userId -> { - SysUserRole ur = new SysUserRole(); - ur.setUserId(userId); - ur.setRoleId(roleId); - return ur; - }); - if (CollUtil.isNotEmpty(list)) { - rows = userRoleMapper.insertBatch(list) ? list.size() : 0; - } - if (rows > 0) { - cleanOnlineUserByRole(roleId); - } - return rows; - } - - @Override - public void cleanOnlineUserByRole(Long roleId) { - // 如果角色未绑定用户 直接返回 - Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); - if (num == 0) { - return; - } - List keys = StpUtil.searchTokenValue("", 0, -1, false); - if (CollUtil.isEmpty(keys)) { - return; - } - // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作 - keys.parallelStream().forEach(key -> { - String token = StringUtils.substringAfterLast(key, ":"); - // 如果已经过期则跳过 - if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { - return; - } - LoginUser loginUser = LoginHelper.getLoginUser(token); - if (loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) { - try { - StpUtil.logoutByTokenValue(token); - } catch (NotLoginException ignored) { - } - } - }); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java deleted file mode 100644 index 5f4d121..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.dev33.satoken.stp.StpUtil; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.tenant.helper.TenantHelper; -import org.springframework.stereotype.Service; - -/** - * 脱敏服务 - * 默认管理员不过滤 - * 需自行根据业务重写实现 - * - * @author Lion Li - * @version 3.6.0 - */ -@Service -public class SysSensitiveServiceImpl implements SensitiveService { - - /** - * 是否脱敏 - */ - @Override - public boolean isSensitive(String roleKey, String perms) { - if (!LoginHelper.isLogin()) { - return true; - } - boolean roleExist = StringUtils.isNotBlank(roleKey); - boolean permsExist = StringUtils.isNotBlank(perms); - if (roleExist && permsExist) { - if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)) { - return false; - } - } else if (roleExist && StpUtil.hasRole(roleKey)) { - return false; - } else if (permsExist && StpUtil.hasPermission(perms)) { - return false; - } - - if (TenantHelper.isEnable()) { - return !LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin(); - } - return !LoginHelper.isSuperAdmin(); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java deleted file mode 100644 index 9c54cbc..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.mapper.SysSocialMapper; -import org.dromara.system.service.ISysSocialService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 社会化关系Service业务层处理 - * - * @author thiszhc - * @date 2023-06-12 - */ -@RequiredArgsConstructor -@Service -public class SysSocialServiceImpl implements ISysSocialService { - - private final SysSocialMapper baseMapper; - - - /** - * 查询社会化关系 - */ - @Override - public SysSocialVo queryById(String id) { - return baseMapper.selectVoById(id); - } - - /** - * 授权列表 - */ - @Override - public List queryList(SysSocialBo bo) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId()) - .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId()) - .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource()); - return baseMapper.selectVoList(lqw); - } - - @Override - public List queryListByUserId(Long userId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getUserId, userId)); - } - - - /** - * 新增社会化关系 - */ - @Override - public Boolean insertByBo(SysSocialBo bo) { - SysSocial add = MapstructUtils.convert(bo, SysSocial.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - if (add != null) { - bo.setId(add.getId()); - } else { - return false; - } - } - return flag; - } - - /** - * 更新社会化关系 - */ - @Override - public Boolean updateByBo(SysSocialBo bo) { - SysSocial update = MapstructUtils.convert(bo, SysSocial.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysSocial entity) { - //TODO 做一些数据校验,如唯一约束 - } - - - /** - * 删除社会化关系 - */ - @Override - public Boolean deleteWithValidById(Long id) { - return baseMapper.deleteById(id) > 0; - } - - - /** - * 根据 authId 查询用户信息 - * - * @param authId 认证id - * @return 授权信息 - */ - @Override - public List selectByAuthId(String authId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getAuthId, authId)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java deleted file mode 100644 index d2a72f6..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.mapper.SysTenantMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysTenantPackageService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -/** - * 租户套餐Service业务层处理 - * - * @author Michelle.Chung - */ -@RequiredArgsConstructor -@Service -public class SysTenantPackageServiceImpl implements ISysTenantPackageService { - - private final SysTenantPackageMapper baseMapper; - private final SysTenantMapper tenantMapper; - - /** - * 查询租户套餐 - */ - @Override - public SysTenantPackageVo queryById(Long packageId){ - return baseMapper.selectVoById(packageId); - } - - /** - * 查询租户套餐列表 - */ - @Override - public TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - @Override - public List selectList() { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL)); - } - - /** - * 查询租户套餐列表 - */ - @Override - public List queryList(SysTenantPackageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysTenantPackageBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getPackageName()), SysTenantPackage::getPackageName, bo.getPackageName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenantPackage::getStatus, bo.getStatus()); - lqw.orderByAsc(SysTenantPackage::getPackageId); - return lqw; - } - - /** - * 新增租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysTenantPackageBo bo) { - SysTenantPackage add = MapstructUtils.convert(bo, SysTenantPackage.class); - // 保存菜单id - List menuIds = Arrays.asList(bo.getMenuIds()); - if (CollUtil.isNotEmpty(menuIds)) { - add.setMenuIds(StringUtils.join(menuIds, ", ")); - } else { - add.setMenuIds(""); - } - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setPackageId(add.getPackageId()); - } - return flag; - } - - /** - * 修改租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(SysTenantPackageBo bo) { - SysTenantPackage update = MapstructUtils.convert(bo, SysTenantPackage.class); - // 保存菜单id - List menuIds = Arrays.asList(bo.getMenuIds()); - if (CollUtil.isNotEmpty(menuIds)) { - update.setMenuIds(StringUtils.join(menuIds, ", ")); - } else { - update.setMenuIds(""); - } - return baseMapper.updateById(update) > 0; - } - - /** - * 校验套餐名称是否唯一 - */ - @Override - public boolean checkPackageNameUnique(SysTenantPackageBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysTenantPackage::getPackageName, bo.getPackageName()) - .ne(ObjectUtil.isNotNull(bo.getPackageId()), SysTenantPackage::getPackageId, bo.getPackageId())); - return !exist; - } - - /** - * 修改套餐状态 - * - * @param bo 套餐信息 - * @return 结果 - */ - @Override - public int updatePackageStatus(SysTenantPackageBo bo) { - SysTenantPackage tenantPackage = MapstructUtils.convert(bo, SysTenantPackage.class); - return baseMapper.updateById(tenantPackage); - } - - /** - * 批量删除租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysTenant::getPackageId, ids)); - if (exists) { - throw new ServiceException("租户套餐已被使用"); - } - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java deleted file mode 100644 index 7476549..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ /dev/null @@ -1,464 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysTenantService; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -/** - * 租户Service业务层处理 - * - * @author Michelle.Chung - */ -@RequiredArgsConstructor -@Service -public class SysTenantServiceImpl implements ISysTenantService { - - private final SysTenantMapper baseMapper; - private final SysTenantPackageMapper tenantPackageMapper; - private final SysUserMapper userMapper; - private final SysDeptMapper deptMapper; - private final SysRoleMapper roleMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysRoleDeptMapper roleDeptMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysDictTypeMapper dictTypeMapper; - private final SysDictDataMapper dictDataMapper; - private final SysConfigMapper configMapper; - - /** - * 查询租户 - */ - @Override - public SysTenantVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - /** - * 基于租户ID查询租户 - */ - @Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId") - @Override - public SysTenantVo queryByTenantId(String tenantId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantId)); - } - - /** - * 查询租户列表 - */ - @Override - public TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询租户列表 - */ - @Override - public List queryList(SysTenantBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysTenantBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()); - lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), SysTenant::getContactUserName, bo.getContactUserName()); - lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), SysTenant::getContactPhone, bo.getContactPhone()); - lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysTenant::getCompanyName, bo.getCompanyName()); - lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysTenant::getLicenseNumber, bo.getLicenseNumber()); - lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysTenant::getAddress, bo.getAddress()); - lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysTenant::getIntro, bo.getIntro()); - lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysTenant::getDomain, bo.getDomain()); - lqw.eq(bo.getPackageId() != null, SysTenant::getPackageId, bo.getPackageId()); - lqw.eq(bo.getExpireTime() != null, SysTenant::getExpireTime, bo.getExpireTime()); - lqw.eq(bo.getAccountCount() != null, SysTenant::getAccountCount, bo.getAccountCount()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenant::getStatus, bo.getStatus()); - lqw.orderByAsc(SysTenant::getId); - return lqw; - } - - /** - * 新增租户 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysTenantBo bo) { - SysTenant add = MapstructUtils.convert(bo, SysTenant.class); - - // 获取所有租户编号 - List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);}); - String tenantId = generateTenantId(tenantIds); - add.setTenantId(tenantId); - boolean flag = baseMapper.insert(add) > 0; - if (!flag) { - throw new ServiceException("创建租户失败"); - } - bo.setId(add.getId()); - - // 根据套餐创建角色 - Long roleId = createTenantRole(tenantId, bo.getPackageId()); - - // 创建部门: 公司名是部门名称 - SysDept dept = new SysDept(); - dept.setTenantId(tenantId); - dept.setDeptName(bo.getCompanyName()); - dept.setParentId(Constants.TOP_PARENT_ID); - dept.setAncestors(Constants.TOP_PARENT_ID.toString()); - deptMapper.insert(dept); - Long deptId = dept.getDeptId(); - - // 角色和部门关联表 - SysRoleDept roleDept = new SysRoleDept(); - roleDept.setRoleId(roleId); - roleDept.setDeptId(deptId); - roleDeptMapper.insert(roleDept); - - // 创建系统用户 - SysUser user = new SysUser(); - user.setTenantId(tenantId); - user.setUserName(bo.getUsername()); - user.setNickName(bo.getUsername()); - user.setPassword(BCrypt.hashpw(bo.getPassword())); - user.setDeptId(deptId); - userMapper.insert(user); - //新增系统用户后，默认当前用户为部门的负责人 - SysDept sd = new SysDept(); - sd.setLeader(user.getUserId()); - sd.setDeptId(deptId); - deptMapper.updateById(sd); - - // 用户和角色关联表 - SysUserRole userRole = new SysUserRole(); - userRole.setUserId(user.getUserId()); - userRole.setRoleId(roleId); - userRoleMapper.insert(userRole); - - String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; - List dictTypeList = dictTypeMapper.selectList( - new LambdaQueryWrapper().eq(SysDictType::getTenantId, defaultTenantId)); - List dictDataList = dictDataMapper.selectList( - new LambdaQueryWrapper().eq(SysDictData::getTenantId, defaultTenantId)); - for (SysDictType dictType : dictTypeList) { - dictType.setDictId(null); - dictType.setTenantId(tenantId); - } - for (SysDictData dictData : dictDataList) { - dictData.setDictCode(null); - dictData.setTenantId(tenantId); - } - dictTypeMapper.insertBatch(dictTypeList); - dictDataMapper.insertBatch(dictDataList); - - List sysConfigList = configMapper.selectList( - new LambdaQueryWrapper().eq(SysConfig::getTenantId, defaultTenantId)); - for (SysConfig config : sysConfigList) { - config.setConfigId(null); - config.setTenantId(tenantId); - } - configMapper.insertBatch(sysConfigList); - return true; - } - - /** - * 生成租户id - * - * @param tenantIds 已有租户id列表 - * @return 租户id - */ - private String generateTenantId(List tenantIds) { - // 随机生成6位 - String numbers = RandomUtil.randomNumbers(6); - // 判断是否存在，如果存在则重新生成 - if (tenantIds.contains(numbers)) { - return generateTenantId(tenantIds); - } - return numbers; - } - - /** - * 根据租户菜单创建租户角色 - * - * @param tenantId 租户编号 - * @param packageId 租户套餐id - * @return 角色id - */ - private Long createTenantRole(String tenantId, Long packageId) { - // 获取租户套餐 - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - if (ObjectUtil.isNull(tenantPackage)) { - throw new ServiceException("套餐不存在"); - } - // 获取套餐菜单id - List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); - - // 创建角色 - SysRole role = new SysRole(); - role.setTenantId(tenantId); - role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); - role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); - role.setRoleSort(1); - role.setStatus(TenantConstants.NORMAL); - roleMapper.insert(role); - Long roleId = role.getRoleId(); - - // 创建角色菜单 - List roleMenus = new ArrayList<>(menuIds.size()); - menuIds.forEach(menuId -> { - SysRoleMenu roleMenu = new SysRoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(menuId); - roleMenus.add(roleMenu); - }); - roleMenuMapper.insertBatch(roleMenus); - - return roleId; - } - - /** - * 修改租户 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") - @Override - public Boolean updateByBo(SysTenantBo bo) { - SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); - tenant.setTenantId(null); - tenant.setPackageId(null); - return baseMapper.updateById(tenant) > 0; - } - - /** - * 修改租户状态 - * - * @param bo 租户信息 - * @return 结果 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") - @Override - public int updateTenantStatus(SysTenantBo bo) { - SysTenant tenant = new SysTenant(); - tenant.setId(bo.getId()); - tenant.setStatus(bo.getStatus()); - return baseMapper.updateById(tenant); - } - - /** - * 校验租户是否允许操作 - * - * @param tenantId 租户ID - */ - @Override - public void checkTenantAllowed(String tenantId) { - if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { - throw new ServiceException("不允许操作管理租户"); - } - } - - /** - * 批量删除租户 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, allEntries = true) - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - // 做一些业务上的校验,判断是否需要校验 - if (ids.contains(TenantConstants.SUPER_ADMIN_ID)) { - throw new ServiceException("超管租户不能删除"); - } - } - return baseMapper.deleteByIds(ids) > 0; - } - - /** - * 校验企业名称是否唯一 - */ - @Override - public boolean checkCompanyNameUnique(SysTenantBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysTenant::getCompanyName, bo.getCompanyName()) - .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId())); - return !exist; - } - - /** - * 校验账号余额 - */ - @Override - public boolean checkAccountBalance(String tenantId) { - SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); - // 如果余额为-1代表不限制 - if (tenant.getAccountCount() == -1) { - return true; - } - Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>()); - // 如果余额大于0代表还有可用名额 - return tenant.getAccountCount() - userNumber > 0; - } - - /** - * 校验有效期 - */ - @Override - public boolean checkExpireTime(String tenantId) { - SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); - // 如果未设置过期时间代表不限制 - if (ObjectUtil.isNull(tenant.getExpireTime())) { - return true; - } - // 如果当前时间在过期时间之前则通过 - return new Date().before(tenant.getExpireTime()); - } - - /** - * 同步租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean syncTenantPackage(String tenantId, Long packageId) { - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - List roles = roleMapper.selectList( - new LambdaQueryWrapper().eq(SysRole::getTenantId, tenantId)); - List roleIds = new ArrayList<>(roles.size() - 1); - List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); - roles.forEach(item -> { - if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) { - List roleMenus = new ArrayList<>(menuIds.size()); - menuIds.forEach(menuId -> { - SysRoleMenu roleMenu = new SysRoleMenu(); - roleMenu.setRoleId(item.getRoleId()); - roleMenu.setMenuId(menuId); - roleMenus.add(roleMenu); - }); - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, item.getRoleId())); - roleMenuMapper.insertBatch(roleMenus); - } else { - roleIds.add(item.getRoleId()); - } - }); - if (!roleIds.isEmpty()) { - roleMenuMapper.delete( - new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysRoleMenu::getMenuId, menuIds)); - } - return true; - } - - /** - * 同步租户字典 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void syncTenantDict() { - // 查询超管 所有字典数据 - List dictTypeList = new ArrayList<>(); - List dictDataList = new ArrayList<>(); - TenantHelper.ignore(() -> { - dictTypeList.addAll(dictTypeMapper.selectList()); - dictDataList.addAll(dictDataMapper.selectList()); - }); - Map> typeMap = StreamUtils.groupByKey(dictTypeList, TenantEntity::getTenantId); - Map>> typeDataMap = StreamUtils.groupBy2Key( - dictDataList, TenantEntity::getTenantId, SysDictData::getDictType); - // 管理租户字典数据 - List defaultTypeMap = typeMap.get(TenantConstants.DEFAULT_TENANT_ID); - Map> defaultTypeDataMap = typeDataMap.get(TenantConstants.DEFAULT_TENANT_ID); - - // 获取所有租户编号 - List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(SysTenant::getTenantId) - .eq(SysTenant::getStatus, TenantConstants.NORMAL), x -> {return Convert.toStr(x);}); - List saveTypeList = new ArrayList<>(); - List saveDataList = new ArrayList<>(); - Set set = new HashSet<>(); - for (String tenantId : tenantIds) { - if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { - continue; - } - for (SysDictType dictType : defaultTypeMap) { - List typeList = StreamUtils.toList(typeMap.get(tenantId), SysDictType::getDictType); - List dataList = defaultTypeDataMap.get(dictType.getDictType()); - if (typeList.contains(dictType.getDictType())) { - List dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType()); - Map map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue); - for (SysDictData dictData : dataList) { - if (!map.containsKey(dictData.getDictValue())) { - SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); - // 设置字典编码为 null - data.setDictCode(null); - data.setTenantId(tenantId); - data.setCreateTime(null); - data.setUpdateTime(null); - set.add(tenantId); - saveDataList.add(data); - } - } - } else { - SysDictType type = BeanUtil.toBean(dictType, SysDictType.class); - type.setDictId(null); - type.setTenantId(tenantId); - type.setCreateTime(null); - type.setUpdateTime(null); - set.add(tenantId); - saveTypeList.add(type); - if (CollUtil.isNotEmpty(dataList)) { - // 筛选出 dictType 对应的 data - for (SysDictData dictData : dataList) { - SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); - // 设置字典编码为 null - data.setDictCode(null); - data.setTenantId(tenantId); - data.setCreateTime(null); - data.setUpdateTime(null); - set.add(tenantId); - saveDataList.add(data); - } - } - } - } - } - TenantHelper.ignore(() -> { - if (CollUtil.isNotEmpty(saveTypeList)) { - dictTypeMapper.insertBatch(saveTypeList); - } - if (CollUtil.isNotEmpty(saveDataList)) { - dictDataMapper.insertBatch(saveDataList); - } - }); - for (String tenantId : set) { - TenantHelper.dynamic(tenantId, () -> CacheUtils.clear(CacheNames.SYS_DICT)); - } - } - -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java deleted file mode 100644 index 29804de..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ /dev/null @@ -1,706 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysUserService; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * 用户 业务层处理 - * - * @author Lion Li - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class SysUserServiceImpl implements ISysUserService, UserService { - - private final SysUserMapper baseMapper; - private final SysDeptMapper deptMapper; - private final SysRoleMapper roleMapper; - private final SysPostMapper postMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysUserPostMapper userPostMapper; - - @Override - public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); - return TableDataInfo.build(page); - } - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - public List selectUserExportList(SysUserBo user) { - return baseMapper.selectUserExportList(this.buildQueryWrapper(user)); - } - - private Wrapper buildQueryWrapper(SysUserBo user) { - Map params = user.getParams(); - QueryWrapper wrapper = Wrappers.query(); - wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) - .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId()) - .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) - .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) - .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "u.create_time", params.get("beginTime"), params.get("endTime")) - .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) - .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); - ids.add(user.getDeptId()); - w.in("u.dept_id", ids); - }).orderByAsc("u.user_id"); - if (StringUtils.isNotBlank(user.getExcludeUserIds())) { - wrapper.notIn("u.user_id", StringUtils.splitTo(user.getExcludeUserIds(), Convert::toLong)); - } - return wrapper; - } - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - public TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery) { - QueryWrapper wrapper = Wrappers.query(); - wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) - .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) - .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) - .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) - .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) - .orderByAsc("u.user_id"); - Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); - return TableDataInfo.build(page); - } - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - public TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { - List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); - QueryWrapper wrapper = Wrappers.query(); - wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) - .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id")) - .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds) - .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) - .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) - .orderByAsc("u.user_id"); - Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); - return TableDataInfo.build(page); - } - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - @Override - public SysUserVo selectUserByUserName(String userName) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, userName)); - } - - /** - * 通过手机号查询用户 - * - * @param phonenumber 手机号 - * @return 用户对象信息 - */ - @Override - public SysUserVo selectUserByPhonenumber(String phonenumber) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhonenumber, phonenumber)); - } - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - @Override - public SysUserVo selectUserById(Long userId) { - SysUserVo user = baseMapper.selectVoById(userId); - if (ObjectUtil.isNull(user)) { - return user; - } - user.setRoles(roleMapper.selectRolesByUserId(user.getUserId())); - return user; - } - - /** - * 通过用户ID串查询用户 - * - * @param userIds 用户ID串 - * @param deptId 部门id - * @return 用户列表信息 - */ - @Override - public List selectUserByIds(List userIds, Long deptId) { - return baseMapper.selectUserList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) - .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds)); - } - - /** - * 查询用户所属角色组 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - public String selectUserRoleGroup(Long userId) { - List list = roleMapper.selectRolesByUserId(userId); - if (CollUtil.isEmpty(list)) { - return StringUtils.EMPTY; - } - return StreamUtils.join(list, SysRoleVo::getRoleName); - } - - /** - * 查询用户所属岗位组 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - public String selectUserPostGroup(Long userId) { - List list = postMapper.selectPostsByUserId(userId); - if (CollUtil.isEmpty(list)) { - return StringUtils.EMPTY; - } - return StreamUtils.join(list, SysPostVo::getPostName); - } - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean checkUserNameUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getUserName, user.getUserName()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); - return !exist; - } - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - */ - @Override - public boolean checkPhoneUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getPhonenumber, user.getPhonenumber()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); - return !exist; - } - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - */ - @Override - public boolean checkEmailUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getEmail, user.getEmail()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); - return !exist; - } - - /** - * 校验用户是否允许操作 - * - * @param userId 用户ID - */ - @Override - public void checkUserAllowed(Long userId) { - if (ObjectUtil.isNotNull(userId) && LoginHelper.isSuperAdmin(userId)) { - throw new ServiceException("不允许操作超级管理员用户"); - } - } - - /** - * 校验用户是否有数据权限 - * - * @param userId 用户id - */ - @Override - public void checkUserDataScope(Long userId) { - if (ObjectUtil.isNull(userId)) { - return; - } - if (LoginHelper.isSuperAdmin()) { - return; - } - if (baseMapper.countUserById(userId) == 0) { - throw new ServiceException("没有权限访问用户数据！"); - } - } - - /** - * 新增保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertUser(SysUserBo user) { - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); - // 新增用户信息 - int rows = baseMapper.insert(sysUser); - user.setUserId(sysUser.getUserId()); - // 新增用户岗位关联 - insertUserPost(user, false); - // 新增用户与角色管理 - insertUserRole(user, false); - return rows; - } - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean registerUser(SysUserBo user, String tenantId) { - user.setCreateBy(0L); - user.setUpdateBy(0L); - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); - sysUser.setTenantId(tenantId); - return baseMapper.insert(sysUser) > 0; - } - - /** - * 修改保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") - @Transactional(rollbackFor = Exception.class) - public int updateUser(SysUserBo user) { - // 新增用户与角色管理 - insertUserRole(user, true); - // 新增用户与岗位管理 - insertUserPost(user, true); - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); - // 防止错误更新后导致的数据误删除 - int flag = baseMapper.updateById(sysUser); - if (flag < 1) { - throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); - } - return flag; - } - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void insertUserAuth(Long userId, Long[] roleIds) { - insertUserRole(userId, roleIds, true); - } - - /** - * 修改用户状态 - * - * @param userId 用户ID - * @param status 帐号状态 - * @return 结果 - */ - @Override - public int updateUserStatus(Long userId, String status) { - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getStatus, status) - .eq(SysUser::getUserId, userId)); - } - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") - @Override - public int updateUserProfile(SysUserBo user) { - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName()) - .set(SysUser::getPhonenumber, user.getPhonenumber()) - .set(SysUser::getEmail, user.getEmail()) - .set(SysUser::getSex, user.getSex()) - .eq(SysUser::getUserId, user.getUserId())); - } - - /** - * 修改用户头像 - * - * @param userId 用户ID - * @param avatar 头像地址 - * @return 结果 - */ - @Override - public boolean updateUserAvatar(Long userId, Long avatar) { - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getAvatar, avatar) - .eq(SysUser::getUserId, userId)) > 0; - } - - /** - * 重置用户密码 - * - * @param userId 用户ID - * @param password 密码 - * @return 结果 - */ - @Override - public int resetUserPwd(Long userId, String password) { - return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getPassword, password) - .eq(SysUser::getUserId, userId)); - } - - /** - * 新增用户角色信息 - * - * @param user 用户对象 - * @param clear 清除已存在的关联数据 - */ - private void insertUserRole(SysUserBo user, boolean clear) { - this.insertUserRole(user.getUserId(), user.getRoleIds(), clear); - } - - /** - * 新增用户岗位信息 - * - * @param user 用户对象 - * @param clear 清除已存在的关联数据 - */ - private void insertUserPost(SysUserBo user, boolean clear) { - Long[] posts = user.getPostIds(); - if (ArrayUtil.isNotEmpty(posts)) { - if (clear) { - // 删除用户与岗位关联 - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, user.getUserId())); - } - // 新增用户与岗位管理 - List list = StreamUtils.toList(List.of(posts), postId -> { - SysUserPost up = new SysUserPost(); - up.setUserId(user.getUserId()); - up.setPostId(postId); - return up; - }); - userPostMapper.insertBatch(list); - } - } - - /** - * 新增用户角色信息 - * - * @param userId 用户ID - * @param roleIds 角色组 - * @param clear 清除已存在的关联数据 - */ - private void insertUserRole(Long userId, Long[] roleIds, boolean clear) { - if (ArrayUtil.isNotEmpty(roleIds)) { - List roleList = new ArrayList<>(List.of(roleIds)); - if (!LoginHelper.isSuperAdmin(userId)) { - roleList.remove(UserConstants.SUPER_ADMIN_ID); - } - // 判断是否具有此角色的操作权限 - List roles = roleMapper.selectRoleList( - new QueryWrapper().in("r.role_id", roleList)); - if (CollUtil.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色的数据"); - } - if (clear) { - // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); - } - // 新增用户与角色管理 - List list = StreamUtils.toList(roleList, roleId -> { - SysUserRole ur = new SysUserRole(); - ur.setUserId(userId); - ur.setRoleId(roleId); - return ur; - }); - userRoleMapper.insertBatch(list); - } - } - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteUserById(Long userId) { - // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); - // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); - // 防止更新失败导致的数据删除 - int flag = baseMapper.deleteById(userId); - if (flag < 1) { - throw new ServiceException("删除用户失败!"); - } - return flag; - } - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteUserByIds(Long[] userIds) { - for (Long userId : userIds) { - checkUserAllowed(userId); - checkUserDataScope(userId); - } - List ids = List.of(userIds); - // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().in(SysUserRole::getUserId, ids)); - // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().in(SysUserPost::getUserId, ids)); - // 防止更新失败导致的数据删除 - int flag = baseMapper.deleteByIds(ids); - if (flag < 1) { - throw new ServiceException("删除用户失败!"); - } - return flag; - } - - /** - * 通过部门id查询当前部门所有用户 - * - * @param deptId 部门ID - * @return 用户信息集合信息 - */ - @Override - public List selectUserListByDept(Long deptId) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysUser::getDeptId, deptId); - lqw.orderByAsc(SysUser::getUserId); - return baseMapper.selectVoList(lqw); - } - - /** - * 通过用户ID查询用户账户 - * - * @param userId 用户ID - * @return 用户账户 - */ - @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") - @Override - public String selectUserNameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getUserName).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName(); - } - - /** - * 通过用户ID查询用户账户 - * - * @param userId 用户ID - * @return 用户账户 - */ - @Override - @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") - public String selectNicknameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getNickName).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); - } - - /** - * 通过用户ID查询用户账户 - * - * @param userIds 用户ID 多个用逗号隔开 - * @return 用户账户 - */ - @Override - public String selectNicknameByIds(String userIds) { - List list = new ArrayList<>(); - for (Long id : StringUtils.splitTo(userIds, Convert::toLong)) { - String nickname = SpringUtils.getAopProxy(this).selectNicknameById(id); - if (StringUtils.isNotBlank(nickname)) { - list.add(nickname); - } - } - return String.join(StringUtils.SEPARATOR, list); - } - - /** - * 通过用户ID查询用户手机号 - * - * @param userId 用户id - * @return 用户手机号 - */ - @Override - public String selectPhonenumberById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber(); - } - - /** - * 通过用户ID查询用户邮箱 - * - * @param userId 用户id - * @return 用户邮箱 - */ - @Override - public String selectEmailById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail(); - } - - /** - * 通过用户ID查询用户列表 - * - * @param userIds 用户ids - * @return 用户列表 - */ - @Override - public List selectListByIds(List userIds) { - if (CollUtil.isEmpty(userIds)) { - return List.of(); - } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .in(SysUser::getUserId, userIds)); - return BeanUtil.copyToList(list, UserDTO.class); - } - - /** - * 通过角色ID查询用户ID - * - * @param roleIds 角色ids - * @return 用户ids - */ - @Override - public List selectUserIdsByRoleIds(List roleIds) { - if (CollUtil.isEmpty(roleIds)) { - return List.of(); - } - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); - return StreamUtils.toList(userRoles, SysUserRole::getUserId); - } - - /** - * 通过角色ID查询用户 - * - * @param roleIds 角色ids - * @return 用户 - */ - @Override - public List selectUsersByRoleIds(List roleIds) { - if (CollUtil.isEmpty(roleIds)) { - return List.of(); - } - - // 通过角色ID获取用户角色信息 - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); - - // 获取用户ID列表 - Set userIds = StreamUtils.toSet(userRoles, SysUserRole::getUserId); - - return selectListByIds(new ArrayList<>(userIds)); - } - - /** - * 通过部门ID查询用户 - * - * @param deptIds 部门ids - * @return 用户 - */ - @Override - public List selectUsersByDeptIds(List deptIds) { - if (CollUtil.isEmpty(deptIds)) { - return List.of(); - } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .in(SysUser::getDeptId, deptIds)); - return BeanUtil.copyToList(list, UserDTO.class); - } -} diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md deleted file mode 100644 index c938b1e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md +++ /dev/null @@ -1,3 +0,0 @@ -java包使用 `.` 分割 resource 目录使用 `/` 分割 -
-此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml deleted file mode 100644 index fd150ad..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml deleted file mode 100644 index e542a10..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml deleted file mode 100644 index 6ad866f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml deleted file mode 100644 index 6bcce51..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml deleted file mode 100644 index 6975da4..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index c64b551..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml deleted file mode 100644 index 9dd3f2e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml deleted file mode 100644 index 43f494d..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml deleted file mode 100644 index 5ef14ee..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml deleted file mode 100644 index 8c2c080..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml deleted file mode 100644 index d9b25bd..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml deleted file mode 100644 index 322403f..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml deleted file mode 100644 index 1705bb2..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml deleted file mode 100644 index 4ef7b1e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - select distinct r.role_id, - r.role_name, - r.role_key, - r.role_sort, - r.data_scope, - r.menu_check_strictly, - r.dept_check_strictly, - r.status, - r.del_flag, - r.create_time, - r.remark - from sys_role r - left join sys_user_role sur on sur.role_id = r.role_id - left join sys_user u on u.user_id = sur.user_id - left join sys_dept d on u.dept_id = d.dept_id - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml deleted file mode 100644 index f01dc5e..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml deleted file mode 100644 index baa4b59..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml deleted file mode 100644 index 0d96e13..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml deleted file mode 100644 index 79cf4c5..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml deleted file mode 100644 index ded6fa8..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml deleted file mode 100644 index e9f2496..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml deleted file mode 100644 index bc52d1a..0000000 --- a/template/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/README.md b/template/ruoyi-modules/ruoyi-workflow/README.md deleted file mode 100644 index 59096b1..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# 工作流说明 - -工作流目前在未成熟阶段 后续仍会经历重构 甚至重写(生产使用前请慎重考虑后续是否要更新维护) \ No newline at end of file diff --git a/template/ruoyi-modules/ruoyi-workflow/pom.xml b/template/ruoyi-modules/ruoyi-workflow/pom.xml deleted file mode 100644 index e55839e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - ../pom.xml - - 4.0.0 - jar - ruoyi-workflow - - - 工作流模块 - - - - - - - org.flowable - flowable-spring-boot-autoconfigure - - - org.flowable - flowable-spring-security - - - - - - org.flowable - flowable-spring-configurator - - - - org.flowable - flowable-spring-boot-starter-actuator - - - - - org.flowable - flowable-image-generator - - - - - org.flowable - flowable-json-converter - 6.8.0 - - - - - org.apache.xmlgraphics - batik-all - 1.17 - - - xalan - xalan - - - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mybatis - - - org.dromara - ruoyi-common-web - - - org.dromara - ruoyi-common-log - - - org.dromara - ruoyi-common-idempotent - - - org.dromara - ruoyi-common-excel - - - org.dromara - ruoyi-common-translation - - - org.dromara - ruoyi-common-tenant - - - org.dromara - ruoyi-common-security - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java deleted file mode 100644 index c3fcafa..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.dromara.workflow.common.constant; - - -/** - * 工作流常量 - * - * @author may - */ -public interface FlowConstant { - - String MESSAGE_CURRENT_TASK_IS_NULL = "当前任务不存在或你不是任务办理人！"; - - String MESSAGE_SUSPENDED = "当前任务已挂起不可审批！"; - - /** - * 连线 - */ - String SEQUENCE_FLOW = "sequenceFlow"; - - /** - * 并行网关 - */ - String PARALLEL_GATEWAY = "parallelGateway"; - - /** - * 排它网关 - */ - String EXCLUSIVE_GATEWAY = "exclusiveGateway"; - - /** - * 包含网关 - */ - String INCLUSIVE_GATEWAY = "inclusiveGateway"; - - /** - * 结束节点 - */ - String END_EVENT = "endEvent"; - - - /** - * 流程委派标识 - */ - String PENDING = "PENDING"; - - /** - * 候选人标识 - */ - String CANDIDATE = "candidate"; - - /** - * 会签任务总数 - */ - String NUMBER_OF_INSTANCES = "nrOfInstances"; - - /** - * 正在执行的会签总数 - */ - String NUMBER_OF_ACTIVE_INSTANCES = "nrOfActiveInstances"; - - /** - * 已完成的会签任务总数 - */ - String NUMBER_OF_COMPLETED_INSTANCES = "nrOfCompletedInstances"; - - /** - * 循环的索引值，可以使用elementIndexVariable属性修改loopCounter的变量名 - */ - String LOOP_COUNTER = "loopCounter"; - - String ZIP = "ZIP"; - - /** - * 业务与流程实例关联对象 - */ - String BUSINESS_INSTANCE_DTO = "businessInstanceDTO"; - - /** - * 流程定义配置 - */ - String WF_DEFINITION_CONFIG_VO = "wfDefinitionConfigVo"; - - /** - * 节点配置 - */ - String WF_NODE_CONFIG_VO = "wfNodeConfigVo"; - - /** - * 流程发起人 - */ - String INITIATOR = "initiator"; - - /** - * 流程实例id - */ - String PROCESS_INSTANCE_ID = "processInstanceId"; - - /** - * 业务id - */ - String BUSINESS_KEY = "businessKey"; - - /** - * 流程定义id - */ - String PROCESS_DEFINITION_ID = "processDefinitionId"; - - /** - * 开启跳过表达式变量 - */ - String FLOWABLE_SKIP_EXPRESSION_ENABLED = "_FLOWABLE_SKIP_EXPRESSION_ENABLED"; - - /** - * 模型标识key命名规范正则表达式 - */ - String MODEL_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$"; - - /** - * 用户任务 - */ - String USER_TASK = "userTask"; - - /** - * 会签 - */ - String MULTI_INSTANCE = "multiInstance"; - - /** - * 是 - */ - String TRUE = "0"; - - /** - * 否 - */ - String FALSE = "1"; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java deleted file mode 100644 index 083ab7b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.workflow.common.enums; - -import cn.hutool.core.util.StrUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.apache.commons.lang3.StringUtils; - -import java.util.Arrays; - -/** - * 任务状态枚举 - * - * @author may - */ -@Getter -@AllArgsConstructor -public enum FormTypeEnum { - /** - * 自定义表单 - */ - STATIC("static", "自定义表单"), - /** - * 动态表单 - */ - DYNAMIC("dynamic", "动态表单"); - - /** - * 类型 - */ - private final String type; - - /** - * 描述 - */ - private final String desc; - - /** - * 表单类型 - * - * @param formType 表单类型 - */ - public static String findByType(String formType) { - if (StringUtils.isBlank(formType)) { - return StrUtil.EMPTY; - } - - return Arrays.stream(FormTypeEnum.values()) - .filter(statusEnum -> statusEnum.getType().equals(formType)) - .findFirst() - .map(FormTypeEnum::getDesc) - .orElse(StrUtil.EMPTY); - } -} - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java deleted file mode 100644 index a282958..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.workflow.common.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * 消息类型枚举 - * - * @author may - */ -@Getter -@AllArgsConstructor -public enum MessageTypeEnum { - /** - * 站内信 - */ - SYSTEM_MESSAGE("1", "站内信"), - /** - * 邮箱 - */ - EMAIL_MESSAGE("2", "邮箱"), - /** - * 短信 - */ - SMS_MESSAGE("3", "短信"); - - private final String code; - - private final String desc; - - private final static Map MESSAGE_TYPE_ENUM_MAP = new ConcurrentHashMap<>(MessageTypeEnum.values().length); - - static { - for (MessageTypeEnum messageType : MessageTypeEnum.values()) { - MESSAGE_TYPE_ENUM_MAP.put(messageType.code, messageType); - } - } - - /** - * 根据消息类型 code 获取 MessageTypeEnum - * @param code 消息类型code - * @return MessageTypeEnum - */ - public static MessageTypeEnum getByCode(String code) { - return MESSAGE_TYPE_ENUM_MAP.get(code); - } -} - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java deleted file mode 100644 index 7b2f55c..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.dromara.workflow.common.enums; - -import cn.hutool.core.util.StrUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.apache.commons.lang3.StringUtils; - -import java.util.Arrays; - -/** - * 任务状态枚举 - * - * @author may - */ -@Getter -@AllArgsConstructor -public enum TaskStatusEnum { - /** - * 撤销 - */ - CANCEL("cancel", "撤销"), - /** - * 通过 - */ - PASS("pass", "通过"), - /** - * 待审核 - */ - WAITING("waiting", "待审核"), - /** - * 作废 - */ - INVALID("invalid", "作废"), - /** - * 退回 - */ - BACK("back", "退回"), - /** - * 终止 - */ - TERMINATION("termination", "终止"), - /** - * 转办 - */ - TRANSFER("transfer", "转办"), - /** - * 委托 - */ - PENDING("pending", "委托"), - /** - * 抄送 - */ - COPY("copy", "抄送"), - /** - * 加签 - */ - SIGN("sign", "加签"), - /** - * 减签 - */ - SIGN_OFF("sign_off", "减签"), - /** - * 超时 - */ - TIMEOUT("timeout", "超时"); - - /** - * 状态 - */ - private final String status; - - /** - * 描述 - */ - private final String desc; - - /** - * 任务业务状态 - * - * @param status 状态 - */ - public static String findByStatus(String status) { - if (StringUtils.isBlank(status)) { - return StrUtil.EMPTY; - } - - return Arrays.stream(TaskStatusEnum.values()) - .filter(statusEnum -> statusEnum.getStatus().equals(status)) - .findFirst() - .map(TaskStatusEnum::getDesc) - .orElse(StrUtil.EMPTY); - } -} - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java deleted file mode 100644 index 842d3d6..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.dromara.workflow.controller; - -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.vo.ModelVo; -import org.dromara.workflow.service.IActModelService; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.repository.Model; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * 模型管理 控制层 - * - * @author may - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/model") -public class ActModelController extends BaseController { - - @Autowired(required = false) - private RepositoryService repositoryService; - private final IActModelService actModelService; - - - /** - * 分页查询模型 - * - * @param modelBo 模型参数 - */ - @GetMapping("/list") - public TableDataInfo page(ModelBo modelBo, PageQuery pageQuery) { - return actModelService.page(modelBo, pageQuery); - } - - /** - * 新增模型 - * - * @param modelBo 模型请求对象 - */ - @Log(title = "模型管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/save") - public R saveNewModel(@Validated(AddGroup.class) @RequestBody ModelBo modelBo) { - return toAjax(actModelService.saveNewModel(modelBo)); - } - - /** - * 查询模型 - * - * @param id 模型id - */ - @GetMapping("/getInfo/{id}") - public R getInfo(@NotBlank(message = "模型id不能为空") @PathVariable String id) { - return R.ok(actModelService.getInfo(id)); - } - - /** - * 修改模型信息 - * - * @param modelBo 模型数据 - */ - @Log(title = "模型管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping(value = "/update") - public R update(@RequestBody ModelBo modelBo) { - return toAjax(actModelService.update(modelBo)); - } - - /** - * 编辑XMl模型 - * - * @param modelBo 模型数据 - */ - @Log(title = "模型管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping(value = "/editModelXml") - public R editModel(@Validated(EditGroup.class) @RequestBody ModelBo modelBo) { - return toAjax(actModelService.editModelXml(modelBo)); - } - - /** - * 删除流程模型 - * - * @param ids 模型id - */ - @Log(title = "模型管理", businessType = BusinessType.DELETE) - @RepeatSubmit() - @DeleteMapping("/{ids}") - @Transactional(rollbackFor = Exception.class) - public R delete(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) { - Arrays.stream(ids).parallel().forEachOrdered(repositoryService::deleteModel); - return R.ok(); - } - - /** - * 模型部署 - * - * @param id 模型id - */ - @Log(title = "模型管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/modelDeploy/{id}") - public R deploy(@NotBlank(message = "模型id不能为空") @PathVariable("id") String id) { - return toAjax(actModelService.modelDeploy(id)); - } - - /** - * 导出模型zip压缩包 - * - * @param modelIds 模型id - * @param response 相应 - */ - @GetMapping("/export/zip/{modelIds}") - public void exportZip(@NotEmpty(message = "模型id不能为空") @PathVariable List modelIds, - HttpServletResponse response) { - actModelService.exportZip(modelIds, response); - } - - /** - * 复制模型 - * - * @param modelBo 模型数据 - */ - @PostMapping("/copyModel") - public R copyModel(@RequestBody ModelBo modelBo) { - return toAjax(actModelService.copyModel(modelBo)); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java deleted file mode 100644 index 5198bd1..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.dromara.workflow.controller; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; -import org.dromara.workflow.service.IActProcessDefinitionService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 流程定义管理 控制层 - * - * @author may - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/processDefinition") -public class ActProcessDefinitionController extends BaseController { - - private final IActProcessDefinitionService actProcessDefinitionService; - - /** - * 分页查询 - * - * @param bo 参数 - */ - @GetMapping("/list") - public TableDataInfo page(ProcessDefinitionBo bo, PageQuery pageQuery) { - return actProcessDefinitionService.page(bo, pageQuery); - } - - /** - * 查询历史流程定义列表 - * - * @param key 流程定义key - */ - @GetMapping("/getListByKey/{key}") - public R> getListByKey(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) { - return R.ok("操作成功", actProcessDefinitionService.getListByKey(key)); - } - - /** - * 查看流程定义图片 - * - * @param processDefinitionId 流程定义id - */ - @GetMapping("/definitionImage/{processDefinitionId}") - public R definitionImage(@PathVariable String processDefinitionId) { - return R.ok("操作成功", actProcessDefinitionService.definitionImage(processDefinitionId)); - } - - /** - * 查看流程定义xml文件 - * - * @param processDefinitionId 流程定义id - */ - @GetMapping("/definitionXml/{processDefinitionId}") - public R> definitionXml(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) { - Map map = new HashMap<>(); - String xmlStr = actProcessDefinitionService.definitionXml(processDefinitionId); - map.put("xml", Arrays.asList(xmlStr.split("\n"))); - map.put("xmlStr", xmlStr); - return R.ok(map); - } - - /** - * 删除流程定义 - * - * @param deploymentIds 部署id - * @param processDefinitionIds 流程定义id - */ - @Log(title = "流程定义管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{deploymentIds}/{processDefinitionIds}") - public R deleteDeployment(@NotNull(message = "流程部署id不能为空") @PathVariable List deploymentIds, - @NotNull(message = "流程定义id不能为空") @PathVariable List processDefinitionIds) { - return toAjax(actProcessDefinitionService.deleteDeployment(deploymentIds, processDefinitionIds)); - } - - /** - * 激活或者挂起流程定义 - * - * @param processDefinitionId 流程定义id - */ - @Log(title = "流程定义管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping("/updateDefinitionState/{processDefinitionId}") - public R updateDefinitionState(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) { - return toAjax(actProcessDefinitionService.updateDefinitionState(processDefinitionId)); - } - - /** - * 迁移流程定义 - * - * @param currentProcessDefinitionId 当前流程定义id - * @param fromProcessDefinitionId 需要迁移到的流程定义id - */ - @Log(title = "流程定义管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}") - public R migrationDefinition(@NotBlank(message = "当前流程定义id") @PathVariable String currentProcessDefinitionId, - @NotBlank(message = "需要迁移到的流程定义id") @PathVariable String fromProcessDefinitionId) { - return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId)); - } - - /** - * 流程定义转换为模型 - * - * @param processDefinitionId 流程定义id - */ - @Log(title = "流程定义管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping("/convertToModel/{processDefinitionId}") - public R convertToModel(@NotEmpty(message = "流程定义id不能为空") @PathVariable String processDefinitionId) { - return toAjax(actProcessDefinitionService.convertToModel(processDefinitionId)); - } - - /** - * 通过zip或xml部署流程定义 - * - * @param file 文件 - * @param categoryCode 分类 - */ - @Log(title = "流程定义管理", businessType = BusinessType.INSERT) - @PostMapping("/deployByFile") - public void deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) { - actProcessDefinitionService.deployByFile(file, categoryCode); - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java deleted file mode 100644 index 931b9f5..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.dromara.workflow.controller; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.ActHistoryInfoVo; -import org.dromara.workflow.domain.vo.ProcessInstanceVo; -import org.dromara.workflow.service.IActProcessInstanceService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 流程实例管理 控制层 - * - * @author may - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/processInstance") -public class ActProcessInstanceController extends BaseController { - - private final IActProcessInstanceService actProcessInstanceService; - - /** - * 分页查询正在运行的流程实例 - * - * @param bo 参数 - */ - @GetMapping("/getPageByRunning") - public TableDataInfo getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) { - return actProcessInstanceService.getPageByRunning(bo, pageQuery); - } - - /** - * 分页查询已结束的流程实例 - * - * @param bo 参数 - */ - @GetMapping("/getPageByFinish") - public TableDataInfo getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) { - return actProcessInstanceService.getPageByFinish(bo, pageQuery); - } - - /** - * 通过业务id获取历史流程图 - * - * @param businessKey 业务id - */ - @GetMapping("/getHistoryImage/{businessKey}") - public R getHistoryImage(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) { - return R.ok("操作成功", actProcessInstanceService.getHistoryImage(businessKey)); - } - - /** - * 通过业务id获取历史流程图运行中，历史等节点 - * - * @param businessKey 业务id - */ - @GetMapping("/getHistoryList/{businessKey}") - public R> getHistoryList(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) { - return R.ok("操作成功", actProcessInstanceService.getHistoryList(businessKey)); - } - - /** - * 获取审批记录 - * - * @param businessKey 业务id - */ - @GetMapping("/getHistoryRecord/{businessKey}") - public R> getHistoryRecord(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) { - return R.ok(actProcessInstanceService.getHistoryRecord(businessKey)); - } - - /** - * 作废流程实例，不会删除历史记录(删除运行中的实例) - * - * @param processInvalidBo 参数 - */ - @Log(title = "流程实例管理", businessType = BusinessType.DELETE) - @RepeatSubmit() - @PostMapping("/deleteRunInstance") - public R deleteRunInstance(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) { - return toAjax(actProcessInstanceService.deleteRunInstance(processInvalidBo)); - } - - /** - * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - */ - @Log(title = "流程实例管理", businessType = BusinessType.DELETE) - @RepeatSubmit() - @DeleteMapping("/deleteRunAndHisInstance/{businessKeys}") - public R deleteRunAndHisInstance(@NotNull(message = "业务id不能为空") @PathVariable String[] businessKeys) { - return toAjax(actProcessInstanceService.deleteRunAndHisInstance(Arrays.asList(businessKeys))); - } - - /** - * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - */ - @Log(title = "流程实例管理", businessType = BusinessType.DELETE) - @RepeatSubmit() - @DeleteMapping("/deleteFinishAndHisInstance/{businessKeys}") - public R deleteFinishAndHisInstance(@NotNull(message = "业务id不能为空") @PathVariable String[] businessKeys) { - return toAjax(actProcessInstanceService.deleteFinishAndHisInstance(Arrays.asList(businessKeys))); - } - - /** - * 撤销流程申请 - * - * @param businessKey 业务id - */ - @Log(title = "流程实例管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/cancelProcessApply/{businessKey}") - public R cancelProcessApply(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) { - return toAjax(actProcessInstanceService.cancelProcessApply(businessKey)); - } - - /** - * 分页查询当前登录人单据 - * - * @param bo 参数 - */ - @GetMapping("/getPageByCurrent") - public TableDataInfo getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) { - return actProcessInstanceService.getPageByCurrent(bo, pageQuery); - } - - /** - * 任务催办(给当前任务办理人发送站内信，邮件，短信等) - * - * @param taskUrgingBo 任务催办 - */ - @Log(title = "流程实例管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/taskUrging") - public R taskUrging(@RequestBody TaskUrgingBo taskUrgingBo) { - return toAjax(actProcessInstanceService.taskUrging(taskUrgingBo)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java deleted file mode 100644 index 25724b6..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java +++ /dev/null @@ -1,295 +0,0 @@ -package org.dromara.workflow.controller; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import jakarta.validation.constraints.NotBlank; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.TaskVo; -import org.dromara.workflow.domain.vo.VariableVo; -import org.dromara.workflow.service.IActTaskService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.QueryUtils; -import org.flowable.engine.TaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * 任务管理 控制层 - * - * @author may - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/task") -public class ActTaskController extends BaseController { - - @Autowired(required = false) - private TaskService taskService; - private final IActTaskService actTaskService; - private final IWfTaskBackNodeService wfTaskBackNodeService; - - - /** - * 启动任务 - * - * @param startProcessBo 启动流程参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/startWorkFlow") - public R> startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) { - Map map = actTaskService.startWorkFlow(startProcessBo); - return R.ok("提交成功", map); - } - - /** - * 办理任务 - * - * @param completeTaskBo 办理任务参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/completeTask") - public R completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) { - return toAjax(actTaskService.completeTask(completeTaskBo)); - } - - /** - * 查询当前用户的待办任务 - * - * @param taskBo 参数 - */ - @GetMapping("/getPageByTaskWait") - public TableDataInfo getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) { - return actTaskService.getPageByTaskWait(taskBo, pageQuery); - } - - /** - * 查询当前租户所有待办任务 - * - * @param taskBo 参数 - */ - @GetMapping("/getPageByAllTaskWait") - public TableDataInfo getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) { - return actTaskService.getPageByAllTaskWait(taskBo, pageQuery); - } - - /** - * 查询当前用户的已办任务 - * - * @param taskBo 参数 - */ - @GetMapping("/getPageByTaskFinish") - public TableDataInfo getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) { - return actTaskService.getPageByTaskFinish(taskBo, pageQuery); - } - - /** - * 查询当前用户的抄送 - * - * @param taskBo 参数 - */ - @GetMapping("/getPageByTaskCopy") - public TableDataInfo getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) { - return actTaskService.getPageByTaskCopy(taskBo, pageQuery); - } - - /** - * 查询当前租户所有已办任务 - * - * @param taskBo 参数 - */ - @GetMapping("/getPageByAllTaskFinish") - public TableDataInfo getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) { - return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery); - } - - /** - * 签收（拾取）任务 - * - * @param taskId 任务id - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/claim/{taskId}") - public R claimTask(@NotBlank(message = "任务id不能为空") @PathVariable String taskId) { - try { - taskService.claim(taskId, Convert.toStr(LoginHelper.getUserId())); - return R.ok(); - } catch (Exception e) { - e.printStackTrace(); - return R.fail("签收任务失败：" + e.getMessage()); - } - } - - /** - * 归还（拾取的）任务 - * - * @param taskId 任务id - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/returnTask/{taskId}") - public R returnTask(@NotBlank(message = "任务id不能为空") @PathVariable String taskId) { - try { - taskService.setAssignee(taskId, null); - return R.ok(); - } catch (Exception e) { - e.printStackTrace(); - return R.fail("归还任务失败：" + e.getMessage()); - } - } - - /** - * 委派任务 - * - * @param delegateBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/delegateTask") - public R delegateTask(@Validated({AddGroup.class}) @RequestBody DelegateBo delegateBo) { - return toAjax(actTaskService.delegateTask(delegateBo)); - } - - /** - * 终止任务 - * - * @param terminationBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.DELETE) - @RepeatSubmit() - @PostMapping("/terminationTask") - public R terminationTask(@RequestBody TerminationBo terminationBo) { - return toAjax(actTaskService.terminationTask(terminationBo)); - } - - /** - * 转办任务 - * - * @param transmitBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/transferTask") - public R transferTask(@Validated({AddGroup.class}) @RequestBody TransmitBo transmitBo) { - return toAjax(actTaskService.transferTask(transmitBo)); - } - - /** - * 会签任务加签 - * - * @param addMultiBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/addMultiInstanceExecution") - public R addMultiInstanceExecution(@Validated({AddGroup.class}) @RequestBody AddMultiBo addMultiBo) { - return toAjax(actTaskService.addMultiInstanceExecution(addMultiBo)); - } - - /** - * 会签任务减签 - * - * @param deleteMultiBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/deleteMultiInstanceExecution") - public R deleteMultiInstanceExecution(@Validated({AddGroup.class}) @RequestBody DeleteMultiBo deleteMultiBo) { - return toAjax(actTaskService.deleteMultiInstanceExecution(deleteMultiBo)); - } - - /** - * 驳回审批 - * - * @param backProcessBo 参数 - */ - @Log(title = "任务管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/backProcess") - public R backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) { - return R.ok("操作成功", actTaskService.backProcess(backProcessBo)); - } - - /** - * 获取当前任务 - * - * @param taskId 任务id - */ - @GetMapping("/getTaskById/{taskId}") - public R getTaskById(@PathVariable String taskId) { - return R.ok(QueryUtils.getTask(taskId)); - } - - - /** - * 修改任务办理人 - * - * @param taskIds 任务id - * @param userId 办理人id - */ - @Log(title = "任务管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping("/updateAssignee/{taskIds}/{userId}") - public R updateAssignee(@PathVariable String[] taskIds, @PathVariable String userId) { - return toAjax(actTaskService.updateAssignee(taskIds, userId)); - } - - /** - * 查询流程变量 - * - * @param taskId 任务id - */ - @GetMapping("/getInstanceVariable/{taskId}") - public R> getProcessInstVariable(@PathVariable String taskId) { - return R.ok(actTaskService.getInstanceVariable(taskId)); - } - - /** - * 获取可驳回得任务节点 - * - * @param processInstanceId 流程实例id - */ - @GetMapping("/getTaskNodeList/{processInstanceId}") - public R> getNodeList(@PathVariable String processInstanceId) { - return R.ok(CollUtil.reverse(wfTaskBackNodeService.getListByInstanceId(processInstanceId))); - } - - /** - * 查询工作流任务用户选择加签人员 - * - * @param taskId 任务id - */ - @GetMapping("/getTaskUserIdsByAddMultiInstance/{taskId}") - public R getTaskUserIdsByAddMultiInstance(@PathVariable String taskId) { - return R.ok("操作成功", actTaskService.getTaskUserIdsByAddMultiInstance(taskId)); - } - - /** - * 查询工作流选择减签人员 - * - * @param taskId 任务id - */ - @GetMapping("/getListByDeleteMultiInstance/{taskId}") - public R> getListByDeleteMultiInstance(@PathVariable String taskId) { - return R.ok(actTaskService.getListByDeleteMultiInstance(taskId)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java deleted file mode 100644 index e1c246f..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.dromara.workflow.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.service.ITestLeaveService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 请假 - * - * @author may - * @date 2023-07-21 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/leave") -public class TestLeaveController extends BaseController { - - private final ITestLeaveService testLeaveService; - - /** - * 查询请假列表 - */ - @SaCheckPermission("workflow:leave:list") - @GetMapping("/list") - public TableDataInfo list(TestLeaveBo bo, PageQuery pageQuery) { - return testLeaveService.queryPageList(bo, pageQuery); - } - - /** - * 导出请假列表 - */ - @SaCheckPermission("workflow:leave:export") - @Log(title = "请假", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(TestLeaveBo bo, HttpServletResponse response) { - List list = testLeaveService.queryList(bo); - ExcelUtil.exportExcel(list, "请假", TestLeaveVo.class, response); - } - - /** - * 获取请假详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("workflow:leave:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(testLeaveService.queryById(id)); - } - - /** - * 新增请假 - */ - @SaCheckPermission("workflow:leave:add") - @Log(title = "请假", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) { - return R.ok(testLeaveService.insertByBo(bo)); - } - - /** - * 修改请假 - */ - @SaCheckPermission("workflow:leave:edit") - @Log(title = "请假", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) { - return R.ok(testLeaveService.updateByBo(bo)); - } - - /** - * 删除请假 - * - * @param ids 主键串 - */ - @SaCheckPermission("workflow:leave:remove") - @Log(title = "请假", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids))); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java deleted file mode 100644 index 8dced89..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.dromara.workflow.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; -import org.dromara.workflow.service.IWfCategoryService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 流程分类 - * - * @author may - * @date 2023-06-28 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/category") -public class WfCategoryController extends BaseController { - - private final IWfCategoryService wfCategoryService; - - /** - * 查询流程分类列表 - */ - @SaCheckPermission("workflow:category:list") - @GetMapping("/list") - public R> list(WfCategoryBo bo) { - List list = wfCategoryService.queryList(bo); - return R.ok(list); - - } - - /** - * 导出流程分类列表 - */ - @SaCheckPermission("workflow:category:export") - @Log(title = "流程分类", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(WfCategoryBo bo, HttpServletResponse response) { - List list = wfCategoryService.queryList(bo); - ExcelUtil.exportExcel(list, "流程分类", WfCategoryVo.class, response); - } - - /** - * 获取流程分类详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("workflow:category:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(wfCategoryService.queryById(id)); - } - - /** - * 新增流程分类 - */ - @SaCheckPermission("workflow:category:add") - @Log(title = "流程分类", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WfCategoryBo bo) { - return toAjax(wfCategoryService.insertByBo(bo)); - } - - /** - * 修改流程分类 - */ - @SaCheckPermission("workflow:category:edit") - @Log(title = "流程分类", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody WfCategoryBo bo) { - return toAjax(wfCategoryService.updateByBo(bo)); - } - - /** - * 删除流程分类 - * - * @param ids 主键串 - */ - @SaCheckPermission("workflow:category:remove") - @Log(title = "流程分类", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(wfCategoryService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java deleted file mode 100644 index 176aba2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.dromara.workflow.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.validation.constraints.*; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IWfDefinitionConfigService; - -/** - * 流程定义配置 - * - * @author may - * @date 2024-03-18 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/definitionConfig") -public class WfDefinitionConfigController extends BaseController { - - private final IWfDefinitionConfigService wfDefinitionConfigService; - - - /** - * 获取流程定义配置详细信息 - * - * @param definitionId 主键 - */ - @GetMapping("/getByDefId/{definitionId}") - public R getByDefId(@NotBlank(message = "流程定义ID不能为空") - @PathVariable String definitionId) { - return R.ok(wfDefinitionConfigService.getByDefId(definitionId)); - } - - /** - * 新增流程定义配置 - */ - @Log(title = "流程定义配置", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/saveOrUpdate") - public R saveOrUpdate(@Validated(AddGroup.class) @RequestBody WfDefinitionConfigBo bo) { - return toAjax(wfDefinitionConfigService.saveOrUpdate(bo)); - } - - /** - * 删除流程定义配置 - * - * @param ids 主键串 - */ - @Log(title = "流程定义配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(wfDefinitionConfigService.deleteByIds(List.of(ids))); - } - - /** - * 查询流程定义配置排除当前查询的流程定义 - * - * @param tableName 表名 - * @param definitionId 流程定义id - */ - @GetMapping("/getByTableNameNotDefId/{tableName}/{definitionId}") - public R> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @PathVariable String tableName, - @NotBlank(message = "流程定义ID不能为空") @PathVariable String definitionId) { - return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId)); - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java deleted file mode 100644 index 198e233..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.dromara.workflow.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.workflow.service.IWfFormManageService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 表单管理 - * - * @author may - * @date 2024-03-29 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/workflow/formManage") -public class WfFormManageController extends BaseController { - - private final IWfFormManageService wfFormManageService; - - /** - * 查询表单管理列表 - */ - @SaCheckPermission("workflow:formManage:list") - @GetMapping("/list") - public TableDataInfo list(WfFormManageBo bo, PageQuery pageQuery) { - return wfFormManageService.queryPageList(bo, pageQuery); - } - - /** - * 查询表单管理列表 - */ - @SaCheckPermission("workflow:formManage:list") - @GetMapping("/list/selectList") - public R> selectList() { - return R.ok(wfFormManageService.selectList()); - } - - /** - * 导出表单管理列表 - */ - @SaCheckPermission("workflow:formManage:export") - @Log(title = "表单管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(WfFormManageBo bo, HttpServletResponse response) { - List list = wfFormManageService.queryList(bo); - ExcelUtil.exportExcel(list, "表单管理", WfFormManageVo.class, response); - } - - /** - * 获取表单管理详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("workflow:formManage:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(wfFormManageService.queryById(id)); - } - - /** - * 新增表单管理 - */ - @SaCheckPermission("workflow:formManage:add") - @Log(title = "表单管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WfFormManageBo bo) { - return toAjax(wfFormManageService.insertByBo(bo)); - } - - /** - * 修改表单管理 - */ - @SaCheckPermission("workflow:formManage:edit") - @Log(title = "表单管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody WfFormManageBo bo) { - return toAjax(wfFormManageService.updateByBo(bo)); - } - - /** - * 删除表单管理 - * - * @param ids 主键串 - */ - @SaCheckPermission("workflow:formManage:remove") - @Log(title = "表单管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(wfFormManageService.deleteByIds(List.of(ids))); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java deleted file mode 100644 index e87fb92..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.dromara.workflow.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 流程实例对象 act_hi_procinst - * - * @author may - * @date 2023-07-22 - */ -@Data -@TableName("act_hi_procinst") -public class ActHiProcinst implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID_") - private String id; - - /** - * - */ - @TableField(value = "REV_") - private Long rev; - - /** - * - */ - @TableField(value = "PROC_INST_ID_") - private String procInstId; - - /** - * - */ - @TableField(value = "BUSINESS_KEY_") - private String businessKey; - - /** - * - */ - @TableField(value = "PROC_DEF_ID_") - private String procDefId; - - /** - * - */ - @TableField(value = "START_TIME_") - private Date startTime; - - /** - * - */ - @TableField(value = "END_TIME_") - private Date endTime; - - /** - * - */ - @TableField(value = "DURATION_") - private Long duration; - - /** - * - */ - @TableField(value = "START_USER_ID_") - private String startUserId; - - /** - * - */ - @TableField(value = "START_ACT_ID_") - private String startActId; - - /** - * - */ - @TableField(value = "END_ACT_ID_") - private String endActId; - - /** - * - */ - @TableField(value = "SUPER_PROCESS_INSTANCE_ID_") - private String superProcessInstanceId; - - /** - * - */ - @TableField(value = "DELETE_REASON_") - private String deleteReason; - - /** - * - */ - @TableField(value = "TENANT_ID_") - private String tenantId; - - /** - * - */ - @TableField(value = "NAME_") - private String name; - - /** - * - */ - @TableField(value = "CALLBACK_ID_") - private String callbackId; - - /** - * - */ - @TableField(value = "CALLBACK_TYPE_") - private String callbackType; - - /** - * - */ - @TableField(value = "REFERENCE_ID_") - private String referenceId; - - /** - * - */ - @TableField(value = "REFERENCE_TYPE_") - private String referenceType; - - /** - * - */ - @TableField(value = "PROPAGATED_STAGE_INST_ID_") - private String propagatedStageInstId; - - /** - * - */ - @TableField(value = "BUSINESS_STATUS_") - private String businessStatus; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java deleted file mode 100644 index abc17b5..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java +++ /dev/null @@ -1,193 +0,0 @@ -package org.dromara.workflow.domain; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -import java.io.Serial; - -/** - * 流程历史任务对象 act_hi_taskinst - * - * @author may - * @date 2024-03-02 - */ -@Data -@TableName("act_hi_taskinst") -public class ActHiTaskinst implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID_") - private String id; - - /** - * 版本 - */ - @TableField(value = "REV_") - private Long rev; - - /** - * 流程定义id - */ - @TableField(value = "PROC_DEF_ID_") - private String procDefId; - - /** - * - */ - @TableField(value = "TASK_DEF_ID_") - private String taskDefId; - - /** - * 任务节点id - */ - @TableField(value = "TASK_DEF_KEY_") - private String taskDefKey; - - /** - * 流程实例id - */ - @TableField(value = "PROC_INST_ID_") - private String procInstId; - - /** - * 流程执行id - */ - @TableField(value = "EXECUTION_ID") - private String executionId; - - /** - * - */ - @TableField(value = "SCOPE_ID_") - private String scopeId; - - /** - * - */ - @TableField(value = "SUB_SCOPE_ID_") - private String subScopeId; - - /** - * 先用当前字段标识抄送类型 - */ - @TableField(value = "SCOPE_TYPE_") - private String scopeType; - - /** - * - */ - @TableField(value = "SCOPE_DEFINITION_ID_") - private String scopeDefinitionId; - - /** - * - */ - @TableField(value = "PROPAGATED_STAGE_INST_ID_") - private String propagatedStageInstId; - - /** - * 任务名称 - */ - @TableField(value = "NAME_") - private String name; - - /** - * 父级id - */ - @TableField(value = "PARENT_TASK_ID_") - private String parentTaskId; - - /** - * 描述 - */ - @TableField(value = "DESCRIPTION_") - private String description; - - /** - * 办理人 - */ - @TableField(value = "OWNER_") - private String owner; - - /** - * 办理人 - */ - @TableField(value = "ASSIGNEE_") - private String assignee; - - /** - * 开始事件 - */ - @TableField(value = "START_TIME_") - private Date startTime; - - /** - * 认领时间 - */ - @TableField(value = "CLAIM_TIME_") - private Date claimTime; - - /** - * 结束时间 - */ - @TableField(value = "END_TIME_") - private Date endTime; - - /** - * 持续时间 - */ - @TableField(value = "DURATION_") - private Long duration; - - /** - * 删除原因 - */ - @TableField(value = "DELETE_REASON_") - private String deleteReason; - - /** - * 优先级 - */ - @TableField(value = "PRIORITY_") - private Long priority; - - /** - * 到期时间 - */ - @TableField(value = "DUE_DATE_") - private Date dueDate; - - /** - * - */ - @TableField(value = "FORM_KEY_") - private String formKey; - - /** - * 分类 - */ - @TableField(value = "CATEGORY_") - private String category; - - /** - * 最后修改时间 - */ - @TableField(value = "LAST_UPDATED_TIME_") - private Date lastUpdatedTime; - - /** - * 租户id - */ - @TableField(value = "TENANT_ID_") - private String tenantId; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java deleted file mode 100644 index 7d42a9b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.dromara.workflow.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -import java.io.Serial; -import java.util.Date; - -/** - * 请假对象 test_leave - * - * @author may - * @date 2023-07-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("test_leave") -public class TestLeave extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 请假类型 - */ - private String leaveType; - - /** - * 开始时间 - */ - private Date startDate; - - /** - * 结束时间 - */ - private Date endDate; - - /** - * 请假天数 - */ - private Integer leaveDays; - - /** - * 请假原因 - */ - private String remark; - - /** - * 状态 - */ - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java deleted file mode 100644 index 94a7cf5..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.workflow.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; - -import java.io.Serial; - -/** - * 流程分类对象 wf_category - * - * @author may - * @date 2023-06-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("wf_category") -public class WfCategory extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 分类名称 - */ - private String categoryName; - - /** - * 分类编码 - */ - private String categoryCode; - - /** - * 父级id - */ - private Long parentId; - - /** - * 排序 - */ - private Long sortNum; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java deleted file mode 100644 index 11dcaa0..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.dromara.workflow.domain; - -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 流程定义配置对象 wf_definition_config - * - * @author may - * @date 2024-03-18 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("wf_definition_config") -public class WfDefinitionConfig extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 表名 - */ - private String tableName; - - /** - * 流程定义ID - */ - private String definitionId; - - /** - * 流程KEY - */ - private String processKey; - - /** - * 流程版本 - */ - private Integer version; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java deleted file mode 100644 index 47f0d7a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.workflow.domain; - -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 表单管理对象 wf_form_manage - * - * @author may - * @date 2024-03-29 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("wf_form_manage") -public class WfFormManage extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 表单名称 - */ - private String formName; - - /** - * 表单类型 - */ - private String formType; - - /** - * 路由地址/表单ID - */ - private String router; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java deleted file mode 100644 index 999425f..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.workflow.domain; - -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 节点配置对象 wf_node_config - * - * @author may - * @date 2024-03-30 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("wf_node_config") -public class WfNodeConfig extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 表单id - */ - private Long formId; - - /** - * 表单类型 - */ - private String formType; - - /** - * 节点名称 - */ - private String nodeName; - - /** - * 节点id - */ - private String nodeId; - - /** - * 流程定义id - */ - private String definitionId; - - /** - * 是否为申请人节点 （0是 1否） - */ - private String applyUserTask; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java deleted file mode 100644 index 6f59727..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.workflow.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; - -import java.io.Serial; - -/** - * 节点驳回记录 wf_task_back_node - * - * @author may - * @date 2024-03-13 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("wf_task_back_node") -public class WfTaskBackNode extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 实例id - */ - private String instanceId; - - /** - * 节点id - */ - private String nodeId; - - /** - * 节点名称 - */ - private String nodeName; - - /** - * 排序 - */ - private Integer orderNo; - - /** - * 节点类型 - */ - private String taskType; - - /** - * 办理人 - */ - private String assignee; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java deleted file mode 100644 index 320ec64..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 加签参数请求 - * - * @author may - */ -@Data -public class AddMultiBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @NotBlank(message = "任务ID不能为空", groups = AddGroup.class) - private String taskId; - - /** - * 加签人员id - */ - @NotEmpty(message = "加签人员不能为空", groups = AddGroup.class) - private List assignees; - - /** - * 加签人员名称 - */ - @NotEmpty(message = "加签人员不能为空", groups = AddGroup.class) - private List assigneeNames; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java deleted file mode 100644 index d0f4369..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - - -/** - * 驳回参数请求 - * - * @author may - */ -@Data -public class BackProcessBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @NotBlank(message = "任务ID不能为空", groups = AddGroup.class) - private String taskId; - - /** - * 消息类型 - */ - private List messageType; - - /** - * 驳回的节点id(目前未使用，直接驳回到申请人) - */ - @NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class) - private String targetActivityId; - - /** - * 办理意见 - */ - private String message; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java deleted file mode 100644 index 0623905..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.workflow.domain.vo.WfCopy; - -import java.io.Serial; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 办理任务请求对象 - * - * @author may - */ -@Data -public class CompleteTaskBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务id - */ - @NotBlank(message = "任务id不能为空", groups = {AddGroup.class}) - private String taskId; - - /** - * 附件id - */ - private String fileId; - - /** - * 抄送人员 - */ - private List wfCopyList; - - /** - * 消息类型 - */ - private List messageType; - - /** - * 办理意见 - */ - private String message; - - /** - * 流程变量 - */ - private Map variables; - - public Map getVariables() { - if (variables == null) { - return new HashMap<>(16); - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java deleted file mode 100644 index a6846a6..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 委派任务请求对象 - * - * @author may - */ -@Data -public class DelegateBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 委派人id - */ - @NotBlank(message = "委派人id不能为空", groups = {AddGroup.class}) - private String userId; - - /** - * 委派人名称 - */ - @NotBlank(message = "委派人名称不能为空", groups = {AddGroup.class}) - private String nickName; - - /** - * 任务id - */ - @NotBlank(message = "任务id不能为空", groups = {AddGroup.class}) - private String taskId; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java deleted file mode 100644 index e533167..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 减签参数请求 - * - * @author may - */ -@Data -public class DeleteMultiBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @NotBlank(message = "任务ID不能为空", groups = AddGroup.class) - private String taskId; - - /** - * 减签人员 - */ - @NotEmpty(message = "减签人员不能为空", groups = AddGroup.class) - private List taskIds; - - /** - * 执行id - */ - @NotEmpty(message = "执行id不能为空", groups = AddGroup.class) - private List executionIds; - - /** - * 人员id - */ - @NotEmpty(message = "减签人员id不能为空", groups = AddGroup.class) - private List assigneeIds; - - /** - * 人员名称 - */ - @NotEmpty(message = "减签人员不能为空", groups = AddGroup.class) - private List assigneeNames; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java deleted file mode 100644 index efe9acd..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.workflow.common.constant.FlowConstant; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 模型请求对象 - * - * @author may - */ -@Data -public class ModelBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 模型id - */ - @NotBlank(message = "模型ID不能为空", groups = {EditGroup.class}) - private String id; - - /** - * 模型名称 - */ - @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class}) - private String name; - - /** - * 模型标识key - */ - @NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class}) - @Pattern(regexp = FlowConstant.MODEL_KEY_PATTERN, message = "模型标识key只能字符或者下划线开头", groups = {AddGroup.class}) - private String key; - - /** - * 模型分类 - */ - @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class}) - private String categoryCode; - - /** - * 模型XML - */ - @NotBlank(message = "模型XML不能为空", groups = {AddGroup.class}) - private String xml; - - /** - * 模型SVG图片 - */ - @NotBlank(message = "模型SVG不能为空", groups = {EditGroup.class}) - private String svg; - - /** - * 备注 - */ - private String description; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java deleted file mode 100644 index 2025932..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 流程定义请求对象 - * - * @author may - */ -@Data -public class ProcessDefinitionBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程定义名称key - */ - private String key; - - /** - * 流程定义名称 - */ - private String name; - - /** - * 模型分类 - */ - private String categoryCode; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java deleted file mode 100644 index 2833b3e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 流程实例请求对象 - * - * @author may - */ -@Data -public class ProcessInstanceBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程名称 - */ - private String name; - - /** - * 流程key - */ - private String key; - - /** - * 任务发起人 - */ - private String startUserId; - - /** - * 业务id - */ - private String businessKey; - - /** - * 模型分类 - */ - private String categoryCode; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java deleted file mode 100644 index 41e51c2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 流程实例作废请求对象 - * - * @author may - */ -@Data -public class ProcessInvalidBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 业务id - */ - @NotBlank(message = "业务id不能为空", groups = {AddGroup.class}) - private String businessKey; - - /** - * 作废原因 - */ - private String deleteReason; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java deleted file mode 100644 index 7af7935..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.dromara.workflow.domain.bo; - - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -/** - * 启动流程对象 - * - * @author may - */ -@Data -public class StartProcessBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 业务唯一值id - */ - @NotBlank(message = "业务ID不能为空", groups = {AddGroup.class}) - private String businessKey; - - /** - * 表名 - */ - @NotBlank(message = "表名不能为空", groups = {AddGroup.class}) - private String tableName; - - /** - * 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}} - */ - private Map variables; - - public Map getVariables() { - if (variables == null) { - return new HashMap<>(16); - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java deleted file mode 100644 index e4d99e4..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 用户加签查询 - * - * @author may - */ -@Data -public class SysUserMultiBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 人员名称 - */ - private String userName; - - /** - * 人员名称 - */ - private String nickName; - - /** - * 部门id - */ - private String deptId; - - /** - * 任务id - */ - private String taskId; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java deleted file mode 100644 index 3037479..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 任务请求对象 - * - * @author may - */ -@Data -public class TaskBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务名称 - */ - private String name; - - /** - * 流程定义名称 - */ - private String processDefinitionName; - - /** - * 流程定义key - */ - private String processDefinitionKey; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java deleted file mode 100644 index 20856ef..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 任务催办 - * - * @author may - */ -@Data -public class TaskUrgingBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程实例id - */ - private String processInstanceId; - - /** - * 消息类型 - */ - private List messageType; - - /** - * 催办内容（为空默认系统内置信息） - */ - private String message; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java deleted file mode 100644 index 8f2206e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 终止任务请求对象 - * - * @author may - */ -@Data -public class TerminationBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务id - */ - @NotBlank(message = "任务id为空", groups = AddGroup.class) - private String taskId; - - /** - * 审批意见 - */ - private String comment; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java deleted file mode 100644 index 877e981..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.TestLeave; - -import java.util.Date; - -/** - * 请假业务对象 test_leave - * - * @author may - * @date 2023-07-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TestLeave.class, reverseConvertGenerate = false) -public class TestLeaveBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 请假类型 - */ - @NotBlank(message = "请假类型不能为空", groups = {AddGroup.class, EditGroup.class}) - private String leaveType; - - /** - * 开始时间 - */ - @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - - /** - * 结束时间 - */ - @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - /** - * 请假天数 - */ - @NotNull(message = "请假天数不能为空", groups = {AddGroup.class, EditGroup.class}) - private Integer leaveDays; - - /** - * 开始时间 - */ - private Integer startLeaveDays; - - /** - * 结束时间 - */ - private Integer endLeaveDays; - - /** - * 请假原因 - */ - private String remark; - - /** - * 状态 - */ - private String status; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java deleted file mode 100644 index 3eb6609..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.AddGroup; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 终转办务请求对象 - * - * @author may - */ -@Data -public class TransmitBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务id - */ - @NotBlank(message = "任务id为空", groups = AddGroup.class) - private String taskId; - - /** - * 转办人id - */ - @NotBlank(message = "转办人不能为空", groups = AddGroup.class) - private String userId; - - /** - * 审批意见 - */ - private String comment; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java deleted file mode 100644 index 69608fd..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.WfCategory; - -/** - * 流程分类业务对象 wf_category - * - * @author may - * @date 2023-06-27 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = WfCategory.class, reverseConvertGenerate = false) -public class WfCategoryBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 分类名称 - */ - @NotBlank(message = "分类名称不能为空", groups = {AddGroup.class, EditGroup.class}) - private String categoryName; - - /** - * 分类编码 - */ - @NotBlank(message = "分类编码不能为空", groups = {AddGroup.class, EditGroup.class}) - private String categoryCode; - - /** - * 父级id - */ - @NotNull(message = "父级id不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long parentId; - - /** - * 排序 - */ - private Long sortNum; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java deleted file mode 100644 index fac1770..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -/** - * 流程定义配置业务对象 wf_form_definition - * - * @author may - * @date 2024-03-18 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = WfDefinitionConfig.class, reverseConvertGenerate = false) -public class WfDefinitionConfigBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 表名 - */ - @NotBlank(message = "表名不能为空", groups = {AddGroup.class}) - private String tableName; - - /** - * 流程定义ID - */ - @NotBlank(message = "流程定义ID不能为空", groups = {AddGroup.class}) - private String definitionId; - - /** - * 流程KEY - */ - @NotBlank(message = "流程KEY不能为空", groups = {AddGroup.class}) - private String processKey; - - /** - * 流程版本 - */ - @NotNull(message = "流程版本不能为空", groups = {AddGroup.class}) - private Integer version; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java deleted file mode 100644 index 8afc286..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -/** - * 表单管理业务对象 wf_form_manage - * - * @author may - * @date 2024-03-29 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = WfFormManage.class, reverseConvertGenerate = false) -public class WfFormManageBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 表单名称 - */ - @NotBlank(message = "表单名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String formName; - - /** - * 表单类型 - */ - @NotBlank(message = "表单类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String formType; - /** - * 路由地址/表单ID - */ - @NotBlank(message = "路由地址/表单ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private String router; - - - /** - * 备注 - */ - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java deleted file mode 100644 index de518d3..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.dromara.workflow.domain.bo; - -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -/** - * 节点配置业务对象 wf_node_config - * - * @author may - * @date 2024-03-30 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = WfNodeConfig.class, reverseConvertGenerate = false) -public class WfNodeConfigBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 表单id - */ - private Long formId; - - /** - * 表单类型 - */ - private String formType; - - /** - * 节点名称 - */ - @NotBlank(message = "节点名称不能为空", groups = {AddGroup.class, EditGroup.class}) - private String nodeName; - - /** - * 节点id - */ - @NotBlank(message = "节点id不能为空", groups = {AddGroup.class, EditGroup.class}) - private String nodeId; - - /** - * 流程定义id - */ - @NotBlank(message = "流程定义id不能为空", groups = {AddGroup.class, EditGroup.class}) - private String definitionId; - - /** - * 是否为申请人节点 （0是 1否） - */ - @NotBlank(message = "是否为申请人节点不能为空", groups = {AddGroup.class, EditGroup.class}) - private String applyUserTask; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java deleted file mode 100644 index e4c1142..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.flowable.engine.task.Attachment; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 流程审批记录视图 - * - * @author may - */ -@Data -public class ActHistoryInfoVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - /** - * 任务id - */ - private String id; - /** - * 节点id - */ - private String taskDefinitionKey; - /** - * 任务名称 - */ - private String name; - /** - * 流程实例id - */ - private String processInstanceId; - /** - * 版本 - */ - private Integer version; - /** - * 开始时间 - */ - private Date startTime; - /** - * 结束时间 - */ - private Date endTime; - /** - * 运行时长 - */ - private String runDuration; - /** - * 状态 - */ - private String status; - /** - * 状态 - */ - private String statusName; - /** - * 办理人id - */ - private String assignee; - - /** - * 办理人名称 - */ - @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee") - private String nickName; - - /** - * 办理人id - */ - private String owner; - - /** - * 审批信息id - */ - private String commentId; - - /** - * 审批信息 - */ - private String comment; - - /** - * 审批附件 - */ - private List attachmentList; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java deleted file mode 100644 index 7636131..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 节点图形信息 - * - * @author may - */ -@Data -public class GraphicInfoVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - /** - * x坐标 - */ - private double x; - - /** - * y坐标 - */ - private double y; - - /** - * 节点高度 - */ - private double height; - - /** - * 节点宽度 - */ - private double width; - - /** - * 节点id - */ - private String nodeId; - - /** - * 节点名称 - */ - private String nodeName; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java deleted file mode 100644 index b2ce811..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 模型视图对象 - * - * @author may - */ -@Data -public class ModelVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 模型id - */ - private String id; - - /** - * 模型名称 - */ - private String name; - - /** - * 模型标识key - */ - private String key; - - /** - * 模型分类 - */ - private String categoryCode; - - /** - * 模型XML - */ - private String xml; - - /** - * 备注 - */ - private String description; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java deleted file mode 100644 index b998396..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 多实例信息 - * - * @author may - */ -@Data -public class MultiInstanceVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 会签类型（串行，并行） - */ - private Object type; - - /** - * 会签人员KEY - */ - private String assignee; - - /** - * 会签人员集合KEY - */ - private String assigneeList; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java deleted file mode 100644 index c5876f6..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 参与者 - * - * @author may - */ -@Data -public class ParticipantVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 组id（角色id） - */ - private List groupIds; - - /** - * 候选人id（用户id） 当组id不为空时，将组内人员查出放入candidate - */ - private List candidate; - - /** - * 候选人名称（用户名称） 当组id不为空时，将组内人员查出放入candidateName - */ - private List candidateName; - - /** - * 是否认领标识 - * 当为空时默认当前任务不需要认领 - * 当为true时当前任务说明为候选模式并且有人已经认领了任务可以归还， - * 当为false时当前任务说明为候选模式该任务未认领， - */ - private Boolean claim; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java deleted file mode 100644 index 034adbb..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 流程定义视图 - * - * @author may - */ -@Data -public class ProcessDefinitionVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程定义id - */ - private String id; - - /** - * 流程定义名称 - */ - private String name; - - /** - * 流程定义标识key - */ - private String key; - - /** - * 流程定义版本 - */ - private int version; - - /** - * 流程定义挂起或激活 1激活 2挂起 - */ - private int suspensionState; - - /** - * 流程xml名称 - */ - private String resourceName; - - /** - * 流程图片名称 - */ - private String diagramResourceName; - - /** - * 流程部署id - */ - private String deploymentId; - - /** - * 流程部署时间 - */ - private Date deploymentTime; - - /** - * 流程定义配置 - */ - private WfDefinitionConfigVo wfDefinitionConfigVo; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java deleted file mode 100644 index ab3e7a1..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 流程实例视图 - * - * @author may - */ -@Data -public class ProcessInstanceVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流程实例id - */ - private String id; - - /** - * 流程定义id - */ - private String processDefinitionId; - - /** - * 流程定义名称 - */ - private String processDefinitionName; - - /** - * 流程定义key - */ - private String processDefinitionKey; - - /** - * 流程定义版本 - */ - private Integer processDefinitionVersion; - - /** - * 部署id - */ - private String deploymentId; - - /** - * 业务id - */ - private String businessKey; - - /** - * 是否挂起 - */ - private Boolean isSuspended; - - /** - * 租户id - */ - private String tenantId; - - /** - * 启动时间 - */ - private Date startTime; - - /** - * 结束时间 - */ - private Date endTime; - - /** - * 启动人id - */ - private String startUserId; - - /** - * 流程状态 - */ - private String businessStatus; - - /** - * 流程状态 - */ - private String businessStatusName; - - /** - * 待办任务集合 - */ - private List taskVoList; - - /** - * 节点配置 - */ - private WfNodeConfigVo wfNodeConfigVo; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java deleted file mode 100644 index 466e776..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java +++ /dev/null @@ -1,173 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 任务视图 - * - * @author may - */ -@Data -public class TaskVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 任务id - */ - private String id; - - /** - * 任务名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 优先级 - */ - private Integer priority; - - /** - * 负责此任务的人员的用户id - */ - private String owner; - - /** - * 办理人id - */ - private Long assignee; - - /** - * 办理人 - */ - @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee") - private String assigneeName; - - - /** - * 流程实例id - */ - private String processInstanceId; - - /** - * 执行id - */ - private String executionId; - - /** - * 无用 - */ - private String taskDefinitionId; - - /** - * 流程定义id - */ - private String processDefinitionId; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 已办任务-创建时间 - */ - private Date startTime; - - /** - * 结束时间 - */ - private Date endTime; - - /** - * 节点id - */ - private String taskDefinitionKey; - - /** - * 任务截止日期 - */ - private Date dueDate; - - /** - * 流程类别 - */ - private String category; - - /** - * 父级任务id - */ - private String parentTaskId; - - /** - * 租户id - */ - private String tenantId; - - /** - * 认领时间 - */ - private Date claimTime; - - /** - * 流程状态 - */ - private String businessStatus; - - /** - * 流程状态 - */ - private String businessStatusName; - - /** - * 流程定义名称 - */ - private String processDefinitionName; - - /** - * 流程定义key - */ - private String processDefinitionKey; - - /** - * 流程定义版本 - */ - private Integer processDefinitionVersion; - - /** - * 参与者 - */ - private ParticipantVo participantVo; - - /** - * 是否会签 - */ - private Boolean multiInstance; - - /** - * 业务id - */ - private String businessKey; - - /** - * 流程定义配置 - */ - private WfDefinitionConfigVo wfDefinitionConfigVo; - - /** - * 节点配置 - */ - private WfNodeConfigVo wfNodeConfigVo; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java deleted file mode 100644 index 47886d7..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.workflow.domain.TestLeave; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 请假视图对象 test_leave - * - * @author may - * @date 2023-07-21 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = TestLeave.class) -public class TestLeaveVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 请假类型 - */ - @ExcelProperty(value = "请假类型") - private String leaveType; - - /** - * 开始时间 - */ - @ExcelProperty(value = "开始时间") - private Date startDate; - - /** - * 结束时间 - */ - @ExcelProperty(value = "结束时间") - private Date endDate; - - /** - * 请假天数 - */ - @ExcelProperty(value = "请假天数") - private Integer leaveDays; - - /** - * 备注 - */ - @ExcelProperty(value = "请假原因") - private String remark; - - /** - * 状态 - */ - @ExcelProperty(value = "状态") - private String status; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java deleted file mode 100644 index 6a26c82..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 流程变量 - * - * @author may - */ -@Data -public class VariableVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 变量key - */ - private String key; - - /** - * 变量值 - */ - private String value; -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java deleted file mode 100644 index 362f646..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.workflow.domain.WfCategory; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 流程分类视图对象 wf_category - * - * @author may - * @date 2023-06-27 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = WfCategory.class) -public class WfCategoryVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 分类名称 - */ - @ExcelProperty(value = "分类名称") - private String categoryName; - - /** - * 分类编码 - */ - @ExcelProperty(value = "分类编码") - private String categoryCode; - - /** - * 父级id - */ - @ExcelProperty(value = "父级id") - private Long parentId; - - /** - * 排序 - */ - @ExcelProperty(value = "排序") - private Long sortNum; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java deleted file mode 100644 index 88a5a21..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 抄送 - * - * @author may - */ -@Data -public class WfCopy implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户id - */ - private Long userId; - - /** - * 用户名称 - */ - private String userName; - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java deleted file mode 100644 index 9c7b0d7..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import org.dromara.workflow.domain.WfDefinitionConfig; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 流程定义配置视图对象 wf_definition_config - * - * @author may - * @date 2024-03-18 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = WfDefinitionConfig.class) -public class WfDefinitionConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 表名 - */ - @ExcelProperty(value = "表名") - private String tableName; - - /** - * 流程定义ID - */ - @ExcelProperty(value = "流程定义ID") - private String definitionId; - - /** - * 流程KEY - */ - @ExcelProperty(value = "流程KEY") - private String processKey; - - - /** - * 流程版本 - */ - @ExcelProperty(value = "流程版本") - private Integer version; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 表单管理 - */ - private WfFormManageVo wfFormManageVo; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java deleted file mode 100644 index 302df23..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import org.dromara.workflow.domain.WfFormManage; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 表单管理视图对象 wf_form_manage - * - * @author may - * @date 2024-03-29 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = WfFormManage.class) -public class WfFormManageVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 表单名称 - */ - @ExcelProperty(value = "表单名称") - private String formName; - - /** - * 表单类型 - */ - @ExcelProperty(value = "表单类型") - private String formType; - - /** - * 表单类型名称 - */ - private String formTypeName; - - /** - * 路由地址/表单ID - */ - @ExcelProperty(value = "路由地址/表单ID") - private String router; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java deleted file mode 100644 index 89e9d9b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.workflow.domain.vo; - -import org.dromara.workflow.domain.WfNodeConfig; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 节点配置视图对象 wf_node_config - * - * @author may - * @date 2024-03-30 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = WfNodeConfig.class) -public class WfNodeConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 表单id - */ - @ExcelProperty(value = "表单id") - private Long formId; - - /** - * 表单类型 - */ - @ExcelProperty(value = "表单类型") - private String formType; - - /** - * 节点名称 - */ - @ExcelProperty(value = "节点名称") - private String nodeName; - - /** - * 节点id - */ - @ExcelProperty(value = "节点id") - private String nodeId; - - /** - * 流程定义id - */ - @ExcelProperty(value = "流程定义id") - private String definitionId; - - /** - * 是否为申请人节点 （0是 1否） - */ - @ExcelProperty(value = "是否为申请人节点 （0是 1否）") - private String applyUserTask; - - /** - * 表单管理 - */ - private WfFormManageVo wfFormManageVo; - - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java deleted file mode 100644 index 39fd9d3..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.dromara.workflow.flowable; - -import org.flowable.bpmn.model.AssociationDirection; -import org.flowable.image.impl.DefaultProcessDiagramCanvas; - -import java.awt.*; -import java.awt.geom.Line2D; -import java.awt.geom.RoundRectangle2D; - -public class CustomDefaultProcessDiagramCanvas extends DefaultProcessDiagramCanvas { - //设置高亮线的颜色 这里我设置成绿色 - protected static Color HIGHLIGHT_SEQUENCEFLOW_COLOR = Color.GREEN; - - public CustomDefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) { - super(width, height, minX, minY, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader); - } - - /** - * 画线颜色设置 - */ - public void drawConnection(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, String connectionType, - AssociationDirection associationDirection, boolean highLighted, double scaleFactor) { - - Paint originalPaint = g.getPaint(); - Stroke originalStroke = g.getStroke(); - - g.setPaint(CONNECTION_COLOR); - if (connectionType.equals("association")) { - g.setStroke(ASSOCIATION_STROKE); - } else if (highLighted) { - //设置线的颜色 - g.setPaint(HIGHLIGHT_SEQUENCEFLOW_COLOR); - g.setStroke(HIGHLIGHT_FLOW_STROKE); - } - - for (int i = 1; i < xPoints.length; i++) { - Integer sourceX = xPoints[i - 1]; - Integer sourceY = yPoints[i - 1]; - Integer targetX = xPoints[i]; - Integer targetY = yPoints[i]; - Line2D.Double line = new Line2D.Double(sourceX, sourceY, targetX, targetY); - g.draw(line); - } - - if (isDefault) { - Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]); - drawDefaultSequenceFlowIndicator(line, scaleFactor); - } - - if (conditional) { - Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]); - drawConditionalSequenceFlowIndicator(line, scaleFactor); - } - - if (associationDirection == AssociationDirection.ONE || associationDirection == AssociationDirection.BOTH) { - Line2D.Double line = new Line2D.Double(xPoints[xPoints.length - 2], yPoints[xPoints.length - 2], xPoints[xPoints.length - 1], yPoints[xPoints.length - 1]); - drawArrowHead(line, scaleFactor); - } - if (associationDirection == AssociationDirection.BOTH) { - Line2D.Double line = new Line2D.Double(xPoints[1], yPoints[1], xPoints[0], yPoints[0]); - drawArrowHead(line, scaleFactor); - } - g.setPaint(originalPaint); - g.setStroke(originalStroke); - } - - /** - * 高亮节点设置 - */ - public void drawHighLight(int x, int y, int width, int height) { - Paint originalPaint = g.getPaint(); - Stroke originalStroke = g.getStroke(); - //设置高亮节点的颜色 - g.setPaint(HIGHLIGHT_COLOR); - g.setStroke(THICK_TASK_BORDER_STROKE); - - RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20); - g.draw(rect); - - g.setPaint(originalPaint); - g.setStroke(originalStroke); - } - - /** - * @description: 高亮节点红色 - * @param: x - * @param: y - * @param: width - * @param: height - * @return: void - * @author: gssong - * @date: 2022/4/12 - */ - public void drawHighLightRed(int x, int y, int width, int height) { - Paint originalPaint = g.getPaint(); - Stroke originalStroke = g.getStroke(); - //设置高亮节点的颜色 - g.setPaint(Color.green); - g.setStroke(THICK_TASK_BORDER_STROKE); - - RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20); - g.draw(rect); - - g.setPaint(originalPaint); - g.setStroke(originalStroke); - } - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java deleted file mode 100644 index e4793a2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java +++ /dev/null @@ -1,1120 +0,0 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.dromara.workflow.flowable; - -import org.flowable.bpmn.model.Event; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.*; -import org.flowable.image.ProcessDiagramGenerator; - -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.InputStream; -import java.util.List; -import java.util.*; - -/** - * Class to generate an image based the diagram interchange information in a BPMN 2.0 process. - * - * @author Joram Barrez - * @author Tijs Rademakers - * @author Zheng Ji - */ -public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGenerator { - - protected Map, ActivityDrawInstruction> activityDrawInstructions = new HashMap<>(); - protected Map, ArtifactDrawInstruction> artifactDrawInstructions = new HashMap<>(); - - public CustomDefaultProcessDiagramGenerator() { - this(1.0); - } - - // The instructions on how to draw a certain construct is - // created statically and stored in a map for performance. - public CustomDefaultProcessDiagramGenerator(final double scaleFactor) { - // start event - activityDrawInstructions.put(StartEvent.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - StartEvent startEvent = (StartEvent) flowNode; - if (startEvent.getEventDefinitions() != null && !startEvent.getEventDefinitions().isEmpty()) { - EventDefinition eventDefinition = startEvent.getEventDefinitions().get(0); - if (eventDefinition instanceof TimerEventDefinition) { - processDiagramCanvas.drawTimerStartEvent(graphicInfo, scaleFactor); - } else if (eventDefinition instanceof ErrorEventDefinition) { - processDiagramCanvas.drawErrorStartEvent(graphicInfo, scaleFactor); - } else if (eventDefinition instanceof EscalationEventDefinition) { - processDiagramCanvas.drawEscalationStartEvent(graphicInfo, scaleFactor); - } else if (eventDefinition instanceof ConditionalEventDefinition) { - processDiagramCanvas.drawConditionalStartEvent(graphicInfo, scaleFactor); - } else if (eventDefinition instanceof SignalEventDefinition) { - processDiagramCanvas.drawSignalStartEvent(graphicInfo, scaleFactor); - } else if (eventDefinition instanceof MessageEventDefinition) { - processDiagramCanvas.drawMessageStartEvent(graphicInfo, scaleFactor); - } else { - processDiagramCanvas.drawNoneStartEvent(graphicInfo); - } - } else { - List eventTypeElements = startEvent.getExtensionElements().get("eventType"); - if (eventTypeElements != null && eventTypeElements.size() > 0) { - processDiagramCanvas.drawEventRegistryStartEvent(graphicInfo, scaleFactor); - - } else { - processDiagramCanvas.drawNoneStartEvent(graphicInfo); - } - } - } - }); - - // signal catch - activityDrawInstructions.put(IntermediateCatchEvent.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - IntermediateCatchEvent intermediateCatchEvent = (IntermediateCatchEvent) flowNode; - if (intermediateCatchEvent.getEventDefinitions() != null && !intermediateCatchEvent.getEventDefinitions().isEmpty()) { - - if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) { - processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, true, scaleFactor); - } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) { - processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, true, scaleFactor); - } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) { - processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, true, scaleFactor); - } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof ConditionalEventDefinition) { - processDiagramCanvas.drawCatchingConditionalEvent(flowNode.getName(), graphicInfo, true, scaleFactor); - } - } - } - }); - - // signal throw - activityDrawInstructions.put(ThrowEvent.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - ThrowEvent throwEvent = (ThrowEvent) flowNode; - if (throwEvent.getEventDefinitions() != null && !throwEvent.getEventDefinitions().isEmpty()) { - if (throwEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) { - processDiagramCanvas.drawThrowingSignalEvent(graphicInfo, scaleFactor); - } else if (throwEvent.getEventDefinitions().get(0) instanceof EscalationEventDefinition) { - processDiagramCanvas.drawThrowingEscalationEvent(graphicInfo, scaleFactor); - } else if (throwEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) { - processDiagramCanvas.drawThrowingCompensateEvent(graphicInfo, scaleFactor); - } else { - processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor); - } - } else { - processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor); - } - } - }); - - // end event - activityDrawInstructions.put(EndEvent.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - EndEvent endEvent = (EndEvent) flowNode; - if (endEvent.getEventDefinitions() != null && !endEvent.getEventDefinitions().isEmpty()) { - if (endEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) { - processDiagramCanvas.drawErrorEndEvent(flowNode.getName(), graphicInfo, scaleFactor); - } else if (endEvent.getEventDefinitions().get(0) instanceof EscalationEventDefinition) { - processDiagramCanvas.drawEscalationEndEvent(flowNode.getName(), graphicInfo, scaleFactor); - } else { - processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor); - } - } else { - processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor); - } - } - }); - - // task - activityDrawInstructions.put(Task.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // user task - activityDrawInstructions.put(UserTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawUserTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // script task - activityDrawInstructions.put(ScriptTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawScriptTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // service task - activityDrawInstructions.put(ServiceTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - ServiceTask serviceTask = (ServiceTask) flowNode; - if ("camel".equalsIgnoreCase(serviceTask.getType())) { - processDiagramCanvas.drawCamelTask(serviceTask.getName(), graphicInfo, scaleFactor); - }else if (ServiceTask.HTTP_TASK.equalsIgnoreCase(serviceTask.getType())) { - processDiagramCanvas.drawHttpTask(serviceTask.getName(), graphicInfo, scaleFactor); - } else if (ServiceTask.DMN_TASK.equalsIgnoreCase(serviceTask.getType())) { - processDiagramCanvas.drawDMNTask(serviceTask.getName(), graphicInfo, scaleFactor); - } else if (ServiceTask.SHELL_TASK.equalsIgnoreCase(serviceTask.getType())) { - processDiagramCanvas.drawShellTask(serviceTask.getName(), graphicInfo, scaleFactor); - } else { - processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor); - } - } - }); - - // http service task - activityDrawInstructions.put(HttpServiceTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawHttpTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // receive task - activityDrawInstructions.put(ReceiveTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawReceiveTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // send task - activityDrawInstructions.put(SendTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawSendTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // manual task - activityDrawInstructions.put(ManualTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawManualTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // send event service task - activityDrawInstructions.put(SendEventServiceTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawSendEventServiceTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // external worker service task - activityDrawInstructions.put(ExternalWorkerServiceTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - ServiceTask serviceTask = (ServiceTask) flowNode; - processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor); - } - }); - - // case service task - activityDrawInstructions.put(CaseServiceTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawCaseServiceTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // businessRuleTask task - activityDrawInstructions.put(BusinessRuleTask.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawBusinessRuleTask(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // exclusive gateway - activityDrawInstructions.put(ExclusiveGateway.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawExclusiveGateway(graphicInfo, scaleFactor); - } - }); - - // inclusive gateway - activityDrawInstructions.put(InclusiveGateway.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawInclusiveGateway(graphicInfo, scaleFactor); - } - }); - - // parallel gateway - activityDrawInstructions.put(ParallelGateway.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawParallelGateway(graphicInfo, scaleFactor); - } - }); - - // event based gateway - activityDrawInstructions.put(EventGateway.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawEventBasedGateway(graphicInfo, scaleFactor); - } - }); - - // Boundary timer - activityDrawInstructions.put(BoundaryEvent.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - BoundaryEvent boundaryEvent = (BoundaryEvent) flowNode; - if (boundaryEvent.getEventDefinitions() != null && !boundaryEvent.getEventDefinitions().isEmpty()) { - EventDefinition eventDefinition = boundaryEvent.getEventDefinitions().get(0); - if (eventDefinition instanceof TimerEventDefinition) { - processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof ConditionalEventDefinition) { - processDiagramCanvas.drawCatchingConditionalEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof ErrorEventDefinition) { - processDiagramCanvas.drawCatchingErrorEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof EscalationEventDefinition) { - processDiagramCanvas.drawCatchingEscalationEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof SignalEventDefinition) { - processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof MessageEventDefinition) { - processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - - } else if (eventDefinition instanceof CompensateEventDefinition) { - processDiagramCanvas.drawCatchingCompensateEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - } - - } else { - List eventTypeElements = boundaryEvent.getExtensionElements().get("eventType"); - if (eventTypeElements != null && eventTypeElements.size() > 0) { - processDiagramCanvas.drawCatchingEventRegistryEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); - } - } - } - }); - - // subprocess - activityDrawInstructions.put(SubProcess.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor); - } else { - processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor); - } - } - }); - - // transaction - activityDrawInstructions.put(Transaction.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor); - } else { - processDiagramCanvas.drawExpandedTransaction(flowNode.getName(), graphicInfo, scaleFactor); - } - } - }); - - // Event subprocess - activityDrawInstructions.put(EventSubProcess.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor); - } else { - processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor); - } - } - }); - - // Adhoc subprocess - activityDrawInstructions.put(AdhocSubProcess.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor); - } else { - processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor); - } - } - }); - - // call activity - activityDrawInstructions.put(CallActivity.class, new ActivityDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - processDiagramCanvas.drawCollapsedCallActivity(flowNode.getName(), graphicInfo, scaleFactor); - } - }); - - // text annotation - artifactDrawInstructions.put(TextAnnotation.class, new ArtifactDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(artifact.getId()); - TextAnnotation textAnnotation = (TextAnnotation) artifact; - processDiagramCanvas.drawTextAnnotation(textAnnotation.getText(), graphicInfo, scaleFactor); - } - }); - - // association - artifactDrawInstructions.put(Association.class, new ArtifactDrawInstruction() { - - @Override - public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) { - Association association = (Association) artifact; - String sourceRef = association.getSourceRef(); - String targetRef = association.getTargetRef(); - - // source and target can be instance of FlowElement or Artifact - BaseElement sourceElement = bpmnModel.getFlowElement(sourceRef); - BaseElement targetElement = bpmnModel.getFlowElement(targetRef); - if (sourceElement == null) { - sourceElement = bpmnModel.getArtifact(sourceRef); - } - if (targetElement == null) { - targetElement = bpmnModel.getArtifact(targetRef); - } - List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId()); - graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList); - int[] xPoints = new int[graphicInfoList.size()]; - int[] yPoints = new int[graphicInfoList.size()]; - for (int i = 1; i < graphicInfoList.size(); i++) { - GraphicInfo graphicInfo = graphicInfoList.get(i); - GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1); - - if (i == 1) { - xPoints[0] = (int) previousGraphicInfo.getX(); - yPoints[0] = (int) previousGraphicInfo.getY(); - } - xPoints[i] = (int) graphicInfo.getX(); - yPoints[i] = (int) graphicInfo.getY(); - } - - AssociationDirection associationDirection = association.getAssociationDirection(); - processDiagramCanvas.drawAssociation(xPoints, yPoints, associationDirection, false, scaleFactor); - } - }); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows, - String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - - return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, - activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI).generateImage(imageType); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, 1.0, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, - List highLightedActivities, List highLightedFlows, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.emptyList(), drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.emptyList(), scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, - String labelFontName, String annotationFontName, ClassLoader customClassLoader, boolean drawSequenceFlowNameWithNoLabelDI) { - - return generateDiagram(bpmnModel, imageType, Collections.emptyList(), Collections.emptyList(), - activityFontName, labelFontName, annotationFontName, customClassLoader, 1.0, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, - String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - - return generateDiagram(bpmnModel, imageType, Collections.emptyList(), Collections.emptyList(), - activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generatePngDiagram(BpmnModel bpmnModel, boolean drawSequenceFlowNameWithNoLabelDI) { - return generatePngDiagram(bpmnModel, 1.0, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, "png", Collections.emptyList(), Collections.emptyList(), scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public InputStream generateJpgDiagram(BpmnModel bpmnModel) { - return generateJpgDiagram(bpmnModel, 1.0, false); - } - - @Override - public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - return generateDiagram(bpmnModel, "jpg", Collections.emptyList(), Collections.emptyList(), drawSequenceFlowNameWithNoLabelDI); - } - - public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows, - String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - - return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, - activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI).generateBufferedImage(imageType); - } - - public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, - List highLightedActivities, List highLightedFlows, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - - return generateImage(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - - @Override - public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor) { - return generateImage(bpmnModel, "png", Collections.emptyList(), Collections.emptyList(), scaleFactor, false); - } - - protected CustomDefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType, - List highLightedActivities, List highLightedFlows, - String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) { - - prepareBpmnModel(bpmnModel); - - CustomDefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader); - - // Draw pool shape, if process is participant in collaboration - for (Pool pool : bpmnModel.getPools()) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId()); - processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo, scaleFactor); - } - - // Draw lanes - for (Process process : bpmnModel.getProcesses()) { - for (Lane lane : process.getLanes()) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId()); - processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo, scaleFactor); - } - } - - // Draw activities and their sequence-flows - for (Process process : bpmnModel.getProcesses()) { - for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) { - if (!isPartOfCollapsedSubProcess(flowNode, bpmnModel)) { - drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - } - } - - // Draw artifacts - for (Process process : bpmnModel.getProcesses()) { - - for (Artifact artifact : process.getArtifacts()) { - drawArtifact(processDiagramCanvas, bpmnModel, artifact); - } - - List subProcesses = process.findFlowElementsOfType(SubProcess.class, true); - if (subProcesses != null) { - for (SubProcess subProcess : subProcesses) { - - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(subProcess.getId()); - if (graphicInfo != null && graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - continue; - } - - if (!isPartOfCollapsedSubProcess(subProcess, bpmnModel)) { - for (Artifact subProcessArtifact : subProcess.getArtifacts()) { - drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact); - } - } - } - } - } - - return processDiagramCanvas; - } - - protected void prepareBpmnModel(BpmnModel bpmnModel) { - - // Need to make sure all elements have positive x and y. - // Check all graphicInfo and update the elements accordingly - - List allGraphicInfos = new ArrayList<>(); - if (bpmnModel.getLocationMap() != null) { - allGraphicInfos.addAll(bpmnModel.getLocationMap().values()); - } - if (bpmnModel.getLabelLocationMap() != null) { - allGraphicInfos.addAll(bpmnModel.getLabelLocationMap().values()); - } - if (bpmnModel.getFlowLocationMap() != null) { - for (List flowGraphicInfos : bpmnModel.getFlowLocationMap().values()) { - allGraphicInfos.addAll(flowGraphicInfos); - } - } - - if (allGraphicInfos.size() > 0) { - - boolean needsTranslationX = false; - boolean needsTranslationY = false; - - double lowestX = 0.0; - double lowestY = 0.0; - - // Collect lowest x and y - for (GraphicInfo graphicInfo : allGraphicInfos) { - - double x = graphicInfo.getX(); - double y = graphicInfo.getY(); - - if (x < lowestX) { - needsTranslationX = true; - lowestX = x; - } - if (y < lowestY) { - needsTranslationY = true; - lowestY = y; - } - - } - - // Update all graphicInfo objects - if (needsTranslationX || needsTranslationY) { - - double translationX = Math.abs(lowestX); - double translationY = Math.abs(lowestY); - - for (GraphicInfo graphicInfo : allGraphicInfos) { - if (needsTranslationX) { - graphicInfo.setX(graphicInfo.getX() + translationX); - } - if (needsTranslationY) { - graphicInfo.setY(graphicInfo.getY() + translationY); - } - } - } - - } - - } - - protected void drawActivity(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, - FlowNode flowNode, List highLightedActivities, List highLightedFlows, double scaleFactor, Boolean drawSequenceFlowNameWithNoLabelDI) { - - ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass()); - if (drawInstruction != null) { - - drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode); - - // Gather info on the multi instance marker - boolean multiInstanceSequential = false; - boolean multiInstanceParallel = false; - boolean collapsed = false; - if (flowNode instanceof Activity) { - Activity activity = (Activity) flowNode; - MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics(); - if (multiInstanceLoopCharacteristics != null) { - multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential(); - multiInstanceParallel = !multiInstanceSequential; - } - } - - // Gather info on the collapsed marker - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - if (flowNode instanceof SubProcess) { - collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded(); - } else if (flowNode instanceof CallActivity) { - collapsed = true; - } - - if (scaleFactor == 1.0) { - // Actually draw the markers - processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(), - multiInstanceSequential, multiInstanceParallel, collapsed); - } - - // Draw highlighted activities - if (highLightedActivities.contains(flowNode.getId())) { - drawHighLightRed(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId())); - } else if (highLightedActivities.contains(Color.RED.toString() + flowNode.getId())) { - drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId())); - } - - } else if (flowNode instanceof Task) { - activityDrawInstructions.get(Task.class).draw(processDiagramCanvas, bpmnModel, flowNode); - - if (highLightedActivities.contains(flowNode.getId())) { - drawHighLightRed(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId())); - } else if (highLightedActivities.contains(Color.RED.toString() + flowNode.getId())) { - drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId())); - } - } - - // Outgoing transitions of activity - for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) { - boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId())); - String defaultFlow = null; - if (flowNode instanceof Activity) { - defaultFlow = ((Activity) flowNode).getDefaultFlow(); - } else if (flowNode instanceof Gateway) { - defaultFlow = ((Gateway) flowNode).getDefaultFlow(); - } - - boolean isDefault = false; - if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) { - isDefault = true; - } - boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && sequenceFlow.getConditionExpression().trim().length() > 0 && !(flowNode instanceof Gateway); - - String sourceRef = sequenceFlow.getSourceRef(); - String targetRef = sequenceFlow.getTargetRef(); - FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef); - FlowElement targetElement = bpmnModel.getFlowElement(targetRef); - List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId()); - if (graphicInfoList != null && graphicInfoList.size() > 0) { - graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList); - int[] xPoints = new int[graphicInfoList.size()]; - int[] yPoints = new int[graphicInfoList.size()]; - - for (int i = 1; i < graphicInfoList.size(); i++) { - GraphicInfo graphicInfo = graphicInfoList.get(i); - GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1); - - if (i == 1) { - xPoints[0] = (int) previousGraphicInfo.getX(); - yPoints[0] = (int) previousGraphicInfo.getY(); - } - xPoints[i] = (int) graphicInfo.getX(); - yPoints[i] = (int) graphicInfo.getY(); - - } - - processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor); - - // Draw sequenceflow label - GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId()); - if (labelGraphicInfo != null) { - processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false); - } else { - if (drawSequenceFlowNameWithNoLabelDI) { - GraphicInfo lineCenter = getLineCenter(graphicInfoList); - processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false); - } - - } - } - } - - // Nested elements - if (flowNode instanceof FlowElementsContainer) { - for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) { - if (nestedFlowElement instanceof FlowNode && !isPartOfCollapsedSubProcess(nestedFlowElement, bpmnModel)) { - drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement, - highLightedActivities, highLightedFlows, scaleFactor, drawSequenceFlowNameWithNoLabelDI); - } - } - } - } - - /** - * This method makes coordinates of connection flow better. - * - * @param processDiagramCanvas - * @param bpmnModel - * @param sourceElement - * @param targetElement - * @param graphicInfoList - * @return - */ - protected static List connectionPerfectionizer(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, BaseElement sourceElement, BaseElement targetElement, List graphicInfoList) { - GraphicInfo sourceGraphicInfo = bpmnModel.getGraphicInfo(sourceElement.getId()); - GraphicInfo targetGraphicInfo = bpmnModel.getGraphicInfo(targetElement.getId()); - - CustomDefaultProcessDiagramCanvas.SHAPE_TYPE sourceShapeType = getShapeType(sourceElement); - CustomDefaultProcessDiagramCanvas.SHAPE_TYPE targetShapeType = getShapeType(targetElement); - - return processDiagramCanvas.connectionPerfectionizer(sourceShapeType, targetShapeType, sourceGraphicInfo, targetGraphicInfo, graphicInfoList); - } - - /** - * This method returns shape type of base element.
- * Each element can be presented as rectangle, rhombus, or ellipse. - * - * @param baseElement - * @return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE - */ - protected static CustomDefaultProcessDiagramCanvas.SHAPE_TYPE getShapeType(BaseElement baseElement) { - if (baseElement instanceof Task || baseElement instanceof Activity || baseElement instanceof TextAnnotation) { - return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Rectangle; - } else if (baseElement instanceof Gateway) { - return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Rhombus; - } else if (baseElement instanceof Event) { - return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Ellipse; - } else { - // unknown source element, just do not correct coordinates - } - return null; - } - - protected static GraphicInfo getLineCenter(List graphicInfoList) { - GraphicInfo gi = new GraphicInfo(); - - int[] xPoints = new int[graphicInfoList.size()]; - int[] yPoints = new int[graphicInfoList.size()]; - - double length = 0; - double[] lengths = new double[graphicInfoList.size()]; - lengths[0] = 0; - double m; - for (int i = 1; i < graphicInfoList.size(); i++) { - GraphicInfo graphicInfo = graphicInfoList.get(i); - GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1); - - if (i == 1) { - xPoints[0] = (int) previousGraphicInfo.getX(); - yPoints[0] = (int) previousGraphicInfo.getY(); - } - xPoints[i] = (int) graphicInfo.getX(); - yPoints[i] = (int) graphicInfo.getY(); - - length += Math.sqrt( - Math.pow((int) graphicInfo.getX() - (int) previousGraphicInfo.getX(), 2) + - Math.pow((int) graphicInfo.getY() - (int) previousGraphicInfo.getY(), 2)); - lengths[i] = length; - } - m = length / 2; - int p1 = 0; - int p2 = 1; - for (int i = 1; i < lengths.length; i++) { - double len = lengths[i]; - p1 = i - 1; - p2 = i; - if (len > m) { - break; - } - } - - GraphicInfo graphicInfo1 = graphicInfoList.get(p1); - GraphicInfo graphicInfo2 = graphicInfoList.get(p2); - - double AB = (int) graphicInfo2.getX() - (int) graphicInfo1.getX(); - double OA = (int) graphicInfo2.getY() - (int) graphicInfo1.getY(); - double OB = lengths[p2] - lengths[p1]; - double ob = m - lengths[p1]; - double ab = AB * ob / OB; - double oa = OA * ob / OB; - - double mx = graphicInfo1.getX() + ab; - double my = graphicInfo1.getY() + oa; - - gi.setX(mx); - gi.setY(my); - return gi; - } - - protected void drawArtifact(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) { - - ArtifactDrawInstruction drawInstruction = artifactDrawInstructions.get(artifact.getClass()); - if (drawInstruction != null) { - drawInstruction.draw(processDiagramCanvas, bpmnModel, artifact); - } - } - - private static void drawHighLight(CustomDefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) { - processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight()); - - } - - private static void drawHighLightRed(CustomDefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) { - processDiagramCanvas.drawHighLightRed((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight()); - - } - - protected static CustomDefaultProcessDiagramCanvas initProcessDiagramCanvas(BpmnModel bpmnModel, String imageType, - String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) { - - // We need to calculate maximum values to know how big the image will be in its entirety - double minX = Double.MAX_VALUE; - double maxX = 0; - double minY = Double.MAX_VALUE; - double maxY = 0; - - for (Pool pool : bpmnModel.getPools()) { - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId()); - minX = graphicInfo.getX(); - maxX = graphicInfo.getX() + graphicInfo.getWidth(); - minY = graphicInfo.getY(); - maxY = graphicInfo.getY() + graphicInfo.getHeight(); - } - - List flowNodes = gatherAllFlowNodes(bpmnModel); - for (FlowNode flowNode : flowNodes) { - - GraphicInfo flowNodeGraphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); - - // width - if (flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth() > maxX) { - maxX = flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth(); - } - if (flowNodeGraphicInfo.getX() < minX) { - minX = flowNodeGraphicInfo.getX(); - } - // height - if (flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight() > maxY) { - maxY = flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight(); - } - if (flowNodeGraphicInfo.getY() < minY) { - minY = flowNodeGraphicInfo.getY(); - } - - for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) { - List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId()); - if (graphicInfoList != null) { - for (GraphicInfo graphicInfo : graphicInfoList) { - // width - if (graphicInfo.getX() > maxX) { - maxX = graphicInfo.getX(); - } - if (graphicInfo.getX() < minX) { - minX = graphicInfo.getX(); - } - // height - if (graphicInfo.getY() > maxY) { - maxY = graphicInfo.getY(); - } - if (graphicInfo.getY() < minY) { - minY = graphicInfo.getY(); - } - } - } - } - } - - List artifacts = gatherAllArtifacts(bpmnModel); - for (Artifact artifact : artifacts) { - - GraphicInfo artifactGraphicInfo = bpmnModel.getGraphicInfo(artifact.getId()); - - if (artifactGraphicInfo != null) { - // width - if (artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth() > maxX) { - maxX = artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth(); - } - if (artifactGraphicInfo.getX() < minX) { - minX = artifactGraphicInfo.getX(); - } - // height - if (artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight() > maxY) { - maxY = artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight(); - } - if (artifactGraphicInfo.getY() < minY) { - minY = artifactGraphicInfo.getY(); - } - } - - List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId()); - if (graphicInfoList != null) { - for (GraphicInfo graphicInfo : graphicInfoList) { - // width - if (graphicInfo.getX() > maxX) { - maxX = graphicInfo.getX(); - } - if (graphicInfo.getX() < minX) { - minX = graphicInfo.getX(); - } - // height - if (graphicInfo.getY() > maxY) { - maxY = graphicInfo.getY(); - } - if (graphicInfo.getY() < minY) { - minY = graphicInfo.getY(); - } - } - } - } - - int nrOfLanes = 0; - for (Process process : bpmnModel.getProcesses()) { - for (Lane l : process.getLanes()) { - - nrOfLanes++; - - GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(l.getId()); - // // width - if (graphicInfo.getX() + graphicInfo.getWidth() > maxX) { - maxX = graphicInfo.getX() + graphicInfo.getWidth(); - } - if (graphicInfo.getX() < minX) { - minX = graphicInfo.getX(); - } - // height - if (graphicInfo.getY() + graphicInfo.getHeight() > maxY) { - maxY = graphicInfo.getY() + graphicInfo.getHeight(); - } - if (graphicInfo.getY() < minY) { - minY = graphicInfo.getY(); - } - } - } - - // Special case, see https://activiti.atlassian.net/browse/ACT-1431 - if (flowNodes.isEmpty() && bpmnModel.getPools().isEmpty() && nrOfLanes == 0) { - // Nothing to show - minX = 0; - minY = 0; - } - - return new CustomDefaultProcessDiagramCanvas((int) maxX + 10, (int) maxY + 10, (int) minX, (int) minY, - imageType, activityFontName, labelFontName, annotationFontName, customClassLoader); - } - - protected static List gatherAllArtifacts(BpmnModel bpmnModel) { - List artifacts = new ArrayList<>(); - for (Process process : bpmnModel.getProcesses()) { - artifacts.addAll(process.getArtifacts()); - } - return artifacts; - } - - protected static List gatherAllFlowNodes(BpmnModel bpmnModel) { - List flowNodes = new ArrayList<>(); - for (Process process : bpmnModel.getProcesses()) { - flowNodes.addAll(gatherAllFlowNodes(process)); - } - return flowNodes; - } - - protected static List gatherAllFlowNodes(FlowElementsContainer flowElementsContainer) { - List flowNodes = new ArrayList<>(); - for (FlowElement flowElement : flowElementsContainer.getFlowElements()) { - if (flowElement instanceof FlowNode) { - flowNodes.add((FlowNode) flowElement); - } - if (flowElement instanceof FlowElementsContainer) { - flowNodes.addAll(gatherAllFlowNodes((FlowElementsContainer) flowElement)); - } - } - return flowNodes; - } - - protected boolean isPartOfCollapsedSubProcess(FlowElement flowElement, BpmnModel model) { - SubProcess subProcess = flowElement.getSubProcess(); - if (subProcess != null) { - GraphicInfo graphicInfo = model.getGraphicInfo(subProcess.getId()); - if (graphicInfo != null && graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) { - return true; - } - - return isPartOfCollapsedSubProcess(subProcess, model); - } - - return false; - } - - public Map, ActivityDrawInstruction> getActivityDrawInstructions() { - return activityDrawInstructions; - } - - public void setActivityDrawInstructions( - Map, ActivityDrawInstruction> activityDrawInstructions) { - this.activityDrawInstructions = activityDrawInstructions; - } - - public Map, ArtifactDrawInstruction> getArtifactDrawInstructions() { - return artifactDrawInstructions; - } - - public void setArtifactDrawInstructions( - Map, ArtifactDrawInstruction> artifactDrawInstructions) { - this.artifactDrawInstructions = artifactDrawInstructions; - } - - protected interface ActivityDrawInstruction { - void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode); - } - - protected interface ArtifactDrawInstruction { - void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java deleted file mode 100644 index 3cdfcf4..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import cn.hutool.core.collection.CollUtil; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.impl.persistence.entity.ExecutionEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.dromara.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; - -/** - * 串行加签 - * - * @author may - */ -public class AddSequenceMultiInstanceCmd implements Command { - - /** - * 执行id - */ - private final String executionId; - - /** - * 会签人员集合KEY - */ - private final String assigneeList; - - /** - * 加签人员 - */ - private final List assignees; - - public AddSequenceMultiInstanceCmd(String executionId, String assigneeList, List assignees) { - this.executionId = executionId; - this.assigneeList = assigneeList; - this.assignees = assignees; - } - - @Override - public Void execute(CommandContext commandContext) { - ExecutionEntityManager executionEntityManager = CommandContextUtil.getExecutionEntityManager(); - ExecutionEntity entity = executionEntityManager.findById(executionId); - // 多实例任务总数加 assignees.size() - if (entity.getVariable(NUMBER_OF_INSTANCES) instanceof Integer nrOfInstances) { - entity.setVariable(NUMBER_OF_INSTANCES, nrOfInstances + assignees.size()); - } - // 设置流程变量 - if (entity.getVariable(assigneeList) instanceof List userIds) { - CollUtil.addAll(userIds, assignees); - Map variables = new HashMap<>(16); - variables.put(assigneeList, userIds); - entity.setVariables(variables); - } - return null; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java deleted file mode 100644 index 20a0a5f..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.AttachmentEntity; -import org.flowable.engine.impl.persistence.entity.AttachmentEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -import java.util.Date; -import java.util.List; - -/** - * 附件上传 - * - * @author may - */ -public class AttachmentCmd implements Command { - - private final String fileId; - - private final String taskId; - - private final String processInstanceId; - - private final OssService ossService; - - public AttachmentCmd(String fileId, String taskId, String processInstanceId, OssService ossService) { - this.fileId = fileId; - this.taskId = taskId; - this.processInstanceId = processInstanceId; - this.ossService = ossService; - } - - @Override - public Boolean execute(CommandContext commandContext) { - try { - if (StringUtils.isNotBlank(fileId)) { - List ossList = ossService.selectByIds(fileId); - if (CollUtil.isNotEmpty(ossList)) { - for (OssDTO oss : ossList) { - AttachmentEntityManager attachmentEntityManager = CommandContextUtil.getAttachmentEntityManager(); - AttachmentEntity attachmentEntity = attachmentEntityManager.create(); - attachmentEntity.setRevision(1); - attachmentEntity.setUserId(LoginHelper.getUserId().toString()); - attachmentEntity.setName(oss.getOriginalName()); - attachmentEntity.setDescription(oss.getOriginalName()); - attachmentEntity.setType(oss.getFileSuffix()); - attachmentEntity.setTaskId(taskId); - attachmentEntity.setProcessInstanceId(processInstanceId); - attachmentEntity.setContentId(oss.getOssId().toString()); - attachmentEntity.setTime(new Date()); - attachmentEntityManager.insert(attachmentEntity); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return true; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java deleted file mode 100644 index 215d310..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.impl.persistence.entity.ExecutionEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -import java.io.Serializable; - -/** - * 删除执行数据 - * - * @author may - */ -public class DeleteExecutionCmd implements Command, Serializable { - - /** - * 执行id - */ - private final String executionId; - - public DeleteExecutionCmd(String executionId) { - this.executionId = executionId; - } - - @Override - public Void execute(CommandContext commandContext) { - ExecutionEntityManager executionEntityManager = CommandContextUtil.getExecutionEntityManager(); - ExecutionEntity entity = executionEntityManager.findById(executionId); - if (entity != null) { - executionEntityManager.deleteExecutionAndRelatedData(entity, "", false, false); - } - return null; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java deleted file mode 100644 index a61daeb..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.StreamUtils; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.impl.persistence.entity.ExecutionEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.dromara.workflow.common.constant.FlowConstant.LOOP_COUNTER; -import static org.dromara.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; - - -/** - * 串行减签 - * - * @author may - */ -@AllArgsConstructor -public class DeleteSequenceMultiInstanceCmd implements Command { - - /** - * 当前节点审批人员id - */ - private final String currentUserId; - - /** - * 执行id - */ - private final String executionId; - - /** - * 会签人员集合KEY - */ - private final String assigneeList; - - /** - * 减签人员 - */ - private final List assignees; - - - @Override - @SuppressWarnings("unchecked") - public Void execute(CommandContext commandContext) { - ExecutionEntityManager executionEntityManager = CommandContextUtil.getExecutionEntityManager(); - ExecutionEntity entity = executionEntityManager.findById(executionId); - // 设置流程变量 - List userIds = new ArrayList<>(); - List variable = (List) entity.getVariable(assigneeList); - for (Object o : variable) { - userIds.add(Long.valueOf(o.toString())); - } - List userIdList = new ArrayList<>(); - userIds.forEach(e -> { - Long userId = StreamUtils.findFirst(assignees, id -> ObjectUtil.equals(id, e)); - if (userId == null) { - userIdList.add(e); - } - }); - // 当前任务执行位置 - int loopCounterIndex = -1; - for (int i = 0; i < userIdList.size(); i++) { - Long userId = userIdList.get(i); - if (currentUserId.equals(userId.toString())) { - loopCounterIndex = i; - } - } - Map variables = new HashMap<>(16); - variables.put(NUMBER_OF_INSTANCES, userIdList.size()); - variables.put(assigneeList, userIdList); - variables.put(LOOP_COUNTER, loopCounterIndex); - entity.setVariables(variables); - return null; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java deleted file mode 100644 index 1f3088b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import org.dromara.common.core.utils.StreamUtils; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.impl.persistence.entity.ExecutionEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -import java.io.Serializable; -import java.util.List; - -/** - * 获取并行网关执行后保留的执行实例数据 - * - * @author may - */ -public class ExecutionChildByExecutionIdCmd implements Command>, Serializable { - - /** - * 当前任务执行实例id - */ - private final String executionId; - - public ExecutionChildByExecutionIdCmd(String executionId) { - this.executionId = executionId; - } - - @Override - public List execute(CommandContext commandContext) { - ExecutionEntityManager executionEntityManager = CommandContextUtil.getExecutionEntityManager(); - // 获取当前执行数据 - ExecutionEntity executionEntity = executionEntityManager.findById(executionId); - // 通过当前执行数据的父执行，查询所有子执行数据 - List allChildrenExecution = - executionEntityManager.collectChildren(executionEntity.getParent()); - return StreamUtils.filter(allChildrenExecution, e -> !e.isActive()); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java deleted file mode 100644 index 3ba120a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import org.dromara.common.core.exception.ServiceException; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntity; -import org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntityManager; -import org.flowable.engine.impl.util.CommandContextUtil; - -/** - * 修改流程状态 - * - * @author may - */ -public class UpdateBusinessStatusCmd implements Command { - - private final String processInstanceId; - private final String status; - - public UpdateBusinessStatusCmd(String processInstanceId, String status) { - this.processInstanceId = processInstanceId; - this.status = status; - } - - @Override - public Boolean execute(CommandContext commandContext) { - try { - HistoricProcessInstanceEntityManager manager = CommandContextUtil.getHistoricProcessInstanceEntityManager(); - HistoricProcessInstanceEntity processInstance = manager.findById(processInstanceId); - processInstance.setBusinessStatus(status); - manager.update(processInstance); - return true; - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java deleted file mode 100644 index 42f6d1c..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.workflow.flowable.cmd; - -import org.dromara.common.core.exception.ServiceException; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.task.service.HistoricTaskService; -import org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntity; - -import java.util.Date; -import java.util.List; - - -/** - * 修改流程历史 - * - * @author may - */ -public class UpdateHiTaskInstCmd implements Command { - - private final List taskIds; - - private final String processDefinitionId; - - private final String processInstanceId; - - public UpdateHiTaskInstCmd(List taskIds, String processDefinitionId, String processInstanceId) { - this.taskIds = taskIds; - this.processDefinitionId = processDefinitionId; - this.processInstanceId = processInstanceId; - } - - @Override - public Boolean execute(CommandContext commandContext) { - try { - HistoricTaskService historicTaskService = CommandContextUtil.getHistoricTaskService(); - for (String taskId : taskIds) { - HistoricTaskInstanceEntity historicTask = historicTaskService.getHistoricTask(taskId); - if (historicTask != null) { - historicTask.setProcessDefinitionId(processDefinitionId); - historicTask.setProcessInstanceId(processInstanceId); - historicTask.setCreateTime(new Date()); - CommandContextUtil.getHistoricTaskService().updateHistoricTask(historicTask, true); - } - } - return true; - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java deleted file mode 100644 index 1494bf3..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dromara.workflow.flowable.config; - -import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; -import org.dromara.workflow.flowable.handler.TaskTimeoutJobHandler; -import org.flowable.spring.SpringProcessEngineConfiguration; -import org.flowable.spring.boot.EngineConfigurationConfigurer; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; - -import java.util.Collections; - - -/** - * flowable配置 - * - * @author may - */ -@Configuration -public class FlowableConfig implements EngineConfigurationConfigurer { - - @Autowired - private GlobalFlowableListener globalFlowableListener; - @Autowired - private IdentifierGenerator identifierGenerator; - - @Override - public void configure(SpringProcessEngineConfiguration processEngineConfiguration) { - processEngineConfiguration.setIdGenerator(() -> identifierGenerator.nextId(null).toString()); - processEngineConfiguration.setEventListeners(Collections.singletonList(globalFlowableListener)); - processEngineConfiguration.addCustomJobHandler(new TaskTimeoutJobHandler()); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java deleted file mode 100644 index 9bb971a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.dromara.workflow.flowable.config; - -import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.flowable.handler.TaskTimeoutJobHandler; -import org.dromara.workflow.utils.QueryUtils; -import org.flowable.bpmn.model.BoundaryEvent; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.FlowElement; -import org.flowable.common.engine.api.delegate.event.*; -import org.flowable.common.engine.impl.cfg.TransactionState; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; -import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.engine.runtime.Execution; -import org.flowable.engine.task.Comment; -import org.flowable.job.service.TimerJobService; -import org.flowable.job.service.impl.persistence.entity.JobEntity; -import org.flowable.job.service.impl.persistence.entity.TimerJobEntity; -import org.flowable.task.api.Task; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - - -/** - * 引擎调度监听 - * - * @author may - */ -@Component -public class GlobalFlowableListener implements FlowableEventListener { - - @Autowired - @Lazy - private TaskService taskService; - - @Autowired - @Lazy - private RuntimeService runtimeService; - - @Autowired - @Lazy - private RepositoryService repositoryService; - - @Value("${flowable.async-executor-activate}") - private boolean asyncExecutorActivate; - - @Override - public void onEvent(FlowableEvent flowableEvent) { - if (flowableEvent instanceof FlowableEngineEvent flowableEngineEvent) { - FlowableEngineEventType engineEventType = (FlowableEngineEventType) flowableEvent.getType(); - switch (engineEventType) { - case JOB_EXECUTION_SUCCESS -> jobExecutionSuccess((FlowableEngineEntityEvent) flowableEngineEvent); - case TASK_DUEDATE_CHANGED, TASK_CREATED -> { - FlowableEntityEvent flowableEntityEvent = (FlowableEntityEvent) flowableEngineEvent; - Object entityObject = flowableEntityEvent.getEntity(); - TaskEntity task = (TaskEntity) entityObject; - if (asyncExecutorActivate && task.getDueDate() != null && task.getDueDate().after(new Date())) { - //删除之前已经存在的定时任务 - TimerJobService timerJobService = CommandContextUtil.getTimerJobService(); - List timerJobEntityList = timerJobService.findTimerJobsByProcessInstanceId(task.getProcessInstanceId()); - if (!CollUtil.isEmpty(timerJobEntityList)) { - for (TimerJobEntity timerJobEntity : timerJobEntityList) { - String taskId = timerJobEntity.getJobHandlerConfiguration(); - if (task.getId().equals(taskId)) { - timerJobService.deleteTimerJob(timerJobEntity); - } - } - } - //创建job对象 - TimerJobEntity timer = timerJobService.createTimerJob(); - timer.setTenantId(TenantHelper.getTenantId()); - //设置job类型 - timer.setJobType(JobEntity.JOB_TYPE_TIMER); - timer.setJobHandlerType(TaskTimeoutJobHandler.TYPE); - timer.setDuedate(task.getDueDate()); - timer.setProcessInstanceId(task.getProcessInstanceId()); - //设置任务id - timer.setJobHandlerConfiguration(task.getId()); - //保存并触发事件 - timerJobService.scheduleTimerJob(timer); - } - } - } - } - } - - @Override - public boolean isFailOnException() { - return true; - } - - @Override - public boolean isFireOnTransactionLifecycleEvent() { - return false; - } - - @Override - public String getOnTransaction() { - return TransactionState.COMMITTED.name(); - } - - /** - * 处理边界定时事件自动审批记录 - * - * @param event 事件 - */ - protected void jobExecutionSuccess(FlowableEngineEntityEvent event) { - if (event != null && StringUtils.isNotBlank(event.getExecutionId())) { - Execution execution = runtimeService.createExecutionQuery().executionId(event.getExecutionId()).singleResult(); - if (execution != null) { - BpmnModel bpmnModel = repositoryService.getBpmnModel(event.getProcessDefinitionId()); - FlowElement flowElement = bpmnModel.getFlowElement(execution.getActivityId()); - if (flowElement instanceof BoundaryEvent) { - String attachedToRefId = ((BoundaryEvent) flowElement).getAttachedToRefId(); - List list = runtimeService.createExecutionQuery().activityId(attachedToRefId).list(); - for (Execution ex : list) { - Task task = QueryUtils.taskQuery().executionId(ex.getId()).singleResult(); - if (task != null) { - List taskComments = taskService.getTaskComments(task.getId()); - if (CollUtil.isEmpty(taskComments)) { - taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.PASS.getStatus(), "超时自动审批!"); - } - } - } - } - } - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java deleted file mode 100644 index 69ae70a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.dromara.workflow.flowable.handler; - -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.utils.SpringUtils; -import org.springframework.stereotype.Component; - -/** - * 流程监听服务 - * - * @author may - * @date 2024-06-02 - */ -@Component -public class FlowProcessEventHandler { - - /** - * 总体流程监听(例如: 提交 退回 撤销 终止 作废等) - * - * @param key 流程key - * @param businessKey 业务id - * @param status 状态 - * @param submit 当为true时为申请人节点办理 - */ - public void processHandler(String key, String businessKey, String status, boolean submit) { - ProcessEvent processEvent = new ProcessEvent(); - processEvent.setKey(key); - processEvent.setBusinessKey(businessKey); - processEvent.setStatus(status); - processEvent.setSubmit(submit); - SpringUtils.context().publishEvent(processEvent); - } - - /** - * 执行办理任务监听 - * - * @param key 流程key - * @param taskDefinitionKey 审批节点key - * @param taskId 任务id - * @param businessKey 业务id - */ - public void processTaskHandler(String key, String taskDefinitionKey, String taskId, String businessKey) { - ProcessTaskEvent processTaskEvent = new ProcessTaskEvent(); - processTaskEvent.setKey(key); - processTaskEvent.setTaskDefinitionKey(taskDefinitionKey); - processTaskEvent.setTaskId(taskId); - processTaskEvent.setBusinessKey(businessKey); - SpringUtils.context().publishEvent(processTaskEvent); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java deleted file mode 100644 index 61c9388..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.workflow.flowable.handler; - -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.TaskService; -import org.flowable.engine.impl.jobexecutor.TimerEventHandler; -import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.job.service.JobHandler; -import org.flowable.job.service.impl.persistence.entity.JobEntity; -import org.flowable.task.api.Task; -import org.flowable.variable.api.delegate.VariableScope; - -/** - * 办理超时(过期)任务 - * - * @author may - */ -public class TaskTimeoutJobHandler extends TimerEventHandler implements JobHandler { - - public static final String TYPE = "taskTimeout"; - - @Override - public String getType() { - return TYPE; - } - - @Override - public void execute(JobEntity job, String configuration, VariableScope variableScope, CommandContext commandContext) { - TaskService taskService = CommandContextUtil.getProcessEngineConfiguration(commandContext) - .getTaskService(); - Task task = taskService.createTaskQuery().taskId(configuration).singleResult(); - if (task != null) { - taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.TIMEOUT.getStatus(), "超时自动审批!"); - taskService.complete(configuration); - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java deleted file mode 100644 index a3a41c9..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.workflow.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.ActHiProcinst; - -/** - * 流程实例Mapper接口 - * - * @author may - * @date 2023-07-22 - */ -@InterceptorIgnore(tenantLine = "true") -public interface ActHiProcinstMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java deleted file mode 100644 index 63b394b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.workflow.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 流程历史任务Mapper接口 - * - * @author may - * @date 2024-03-02 - */ -@InterceptorIgnore(tenantLine = "true") -public interface ActHiTaskinstMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java deleted file mode 100644 index 63c5ecb..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.workflow.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.vo.TaskVo; - - -/** - * 任务信息Mapper接口 - * - * @author may - * @date 2024-03-02 - */ -@InterceptorIgnore(tenantLine = "true") -public interface ActTaskMapper extends BaseMapperPlus { - /** - * 获取待办信息 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 结果 - */ - Page getTaskWaitByPage(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 获取已办 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 结果 - */ - Page getTaskFinishByPage(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - /** - * 查询当前用户的抄送 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 结果 - */ - Page getTaskCopyByPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java deleted file mode 100644 index cd1edba..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.TestLeave; -import org.dromara.workflow.domain.vo.TestLeaveVo; - -/** - * 请假Mapper接口 - * - * @author may - * @date 2023-07-21 - */ -public interface TestLeaveMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java deleted file mode 100644 index 98aea02..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.vo.WfCategoryVo; - -/** - * 流程分类Mapper接口 - * - * @author may - * @date 2023-06-27 - */ -public interface WfCategoryMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java deleted file mode 100644 index ee20882..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 流程定义配置Mapper接口 - * - * @author may - * @date 2024-03-18 - */ -public interface WfDefinitionConfigMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java deleted file mode 100644 index acf8111..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 表单管理Mapper接口 - * - * @author may - * @date 2024-03-29 - */ -public interface WfFormManageMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java deleted file mode 100644 index d2aecac..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 节点配置Mapper接口 - * - * @author may - * @date 2024-03-30 - */ -public interface WfNodeConfigMapper extends BaseMapperPlus { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java deleted file mode 100644 index 9b291fe..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.WfTaskBackNode; - -/** - * 节点驳回记录Mapper接口 - * - * @author may - * @date 2024-03-13 - */ -public interface WfTaskBackNodeMapper extends BaseMapperPlus { -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java deleted file mode 100644 index e802c69..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dromara.workflow.service; - - -import org.dromara.workflow.domain.ActHiProcinst; - -import java.util.List; - -/** - * 流程实例Service接口 - * - * @author may - * @date 2023-07-22 - */ -public interface IActHiProcinstService { - - /** - * 按照业务id查询 - * - * @param businessKeys 业务id - * @return 结果 - */ - List selectByBusinessKeyIn(List businessKeys); - - /** - * 按照业务id查询 - * - * @param businessKey 业务id - * @return 结果 - */ - ActHiProcinst selectByBusinessKey(String businessKey); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java deleted file mode 100644 index ad286e2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.dromara.workflow.service; - - -/** - * 流程历史任务Service接口 - * - * @author may - * @date 2024-03-02 - */ -public interface IActHiTaskinstService { -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java deleted file mode 100644 index 4a6d170..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.dromara.workflow.service; - -import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.vo.ModelVo; -import org.flowable.engine.repository.Model; - -import java.util.List; - - -/** - * 模型管理 服务层 - * - * @author may - */ -public interface IActModelService { - /** - * 分页查询模型 - * - * @param modelBo 模型参数 - * @param pageQuery 参数 - * @return 返回分页列表 - */ - TableDataInfo page(ModelBo modelBo, PageQuery pageQuery); - - /** - * 新增模型 - * - * @param modelBo 模型请求对象 - * @return 结果 - */ - boolean saveNewModel(ModelBo modelBo); - - /** - * 查询模型 - * - * @param modelId 模型id - * @return 模型数据 - */ - ModelVo getInfo(String modelId); - - /** - * 修改模型信息 - * - * @param modelBo 模型数据 - * @return 结果 - */ - boolean update(ModelBo modelBo); - - /** - * 编辑模型XML - * - * @param modelBo 模型数据 - * @return 结果 - */ - boolean editModelXml(ModelBo modelBo); - - /** - * 模型部署 - * - * @param id 模型id - * @return 结果 - */ - boolean modelDeploy(String id); - - /** - * 导出模型zip压缩包 - * - * @param modelIds 模型id - * @param response 响应 - */ - void exportZip(List modelIds, HttpServletResponse response); - - /** - * 复制模型 - * - * @param modelBo 模型数据 - * @return 结果 - */ - boolean copyModel(ModelBo modelBo); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java deleted file mode 100644 index 5d00e41..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -/** - * 流程定义 服务层 - * - * @author may - */ -public interface IActProcessDefinitionService { - /** - * 分页查询 - * - * @param processDefinitionBo 参数 - * @param pageQuery 分页 - * @return 返回分页列表 - */ - TableDataInfo page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery); - - /** - * 查询历史流程定义列表 - * - * @param key 流程定义key - * @return 结果 - */ - List getListByKey(String key); - - /** - * 查看流程定义图片 - * - * @param processDefinitionId 流程定义id - * @return 结果 - */ - String definitionImage(String processDefinitionId); - - /** - * 查看流程定义xml文件 - * - * @param processDefinitionId 流程定义id - * @return 结果 - */ - String definitionXml(String processDefinitionId); - - /** - * 删除流程定义 - * - * @param deploymentIds 部署id - * @param processDefinitionIds 流程定义id - * @return 结果 - */ - boolean deleteDeployment(List deploymentIds, List processDefinitionIds); - - /** - * 激活或者挂起流程定义 - * - * @param processDefinitionId 流程定义id - * @return 结果 - */ - boolean updateDefinitionState(String processDefinitionId); - - /** - * 迁移流程定义 - * - * @param currentProcessDefinitionId 当前流程定义id - * @param fromProcessDefinitionId 需要迁移到的流程定义id - * @return 结果 - */ - boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId); - - /** - * 流程定义转换为模型 - * - * @param processDefinitionId 流程定义id - * @return 结果 - */ - boolean convertToModel(String processDefinitionId); - - /** - * 通过zip或xml部署流程定义 - * - * @param file 文件 - * @param categoryCode 分类 - */ - void deployByFile(MultipartFile file, String categoryCode); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java deleted file mode 100644 index ca3b6fb..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.ActHistoryInfoVo; -import org.dromara.workflow.domain.vo.ProcessInstanceVo; - -import java.util.List; -import java.util.Map; - -/** - * 流程实例 服务层 - * - * @author may - */ -public interface IActProcessInstanceService { - /** - * 通过流程实例id获取历史流程图 - * - * @param businessKey 流程实例id - * @return 结果 - */ - String getHistoryImage(String businessKey); - - /** - * 通过业务id获取历史流程图运行中，历史等节点 - * - * @param businessKey 业务id - * @return 结果 - */ - Map getHistoryList(String businessKey); - - /** - * 分页查询正在运行的流程实例 - * - * @param processInstanceBo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); - - /** - * 分页查询已结束的流程实例 - * - * @param processInstanceBo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); - - /** - * 获取审批记录 - * - * @param businessKey 业务id - * @return 结果 - */ - List getHistoryRecord(String businessKey); - - /** - * 作废流程实例，不会删除历史记录(删除运行中的实例) - * - * @param processInvalidBo 参数 - * @return 结果 - */ - boolean deleteRunInstance(ProcessInvalidBo processInvalidBo); - - /** - * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - * @return 结果 - */ - boolean deleteRunAndHisInstance(List businessKeys); - - /** - * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - * @return 结果 - */ - boolean deleteFinishAndHisInstance(List businessKeys); - - /** - * 撤销流程申请 - * - * @param businessKey 业务id - * @return 结果 - */ - boolean cancelProcessApply(String businessKey); - - /** - * 分页查询当前登录人单据 - * - * @param processInstanceBo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); - - /** - * 任务催办(给当前任务办理人发送站内信，邮件，短信等) - * - * @param taskUrgingBo 任务催办 - * @return 结果 - */ - boolean taskUrging(TaskUrgingBo taskUrgingBo); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java deleted file mode 100644 index 8e9f763..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.TaskVo; -import org.dromara.workflow.domain.vo.VariableVo; - -import java.util.List; -import java.util.Map; - -/** - * 任务 服务层 - * - * @author may - */ -public interface IActTaskService { - /** - * 启动任务 - * - * @param startProcessBo 启动流程参数 - * @return 结果 - */ - Map startWorkFlow(StartProcessBo startProcessBo); - - - /** - * 办理任务 - * - * @param completeTaskBo 办理任务参数 - * @return 结果 - */ - boolean completeTask(CompleteTaskBo completeTaskBo); - - /** - * 查询当前用户的待办任务 - * - * @param taskBo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery); - - /** - * 查询当前租户所有待办任务 - * - * @param taskBo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery); - - - /** - * 查询当前用户的已办任务 - * - * @param taskBo 参数 - * @param pageQuery 参数 - * @return 结果 - */ - TableDataInfo getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery); - - /** - * 查询当前用户的抄送 - * - * @param taskBo 参数 - * @param pageQuery 参数 - * @return 结果 - */ - TableDataInfo getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery); - - /** - * 查询当前租户所有已办任务 - * - * @param taskBo 参数 - * @param pageQuery 参数 - * @return 结果 - */ - TableDataInfo getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery); - - /** - * 委派任务 - * - * @param delegateBo 参数 - * @return 结果 - */ - boolean delegateTask(DelegateBo delegateBo); - - /** - * 终止任务 - * - * @param terminationBo 参数 - * @return 结果 - */ - boolean terminationTask(TerminationBo terminationBo); - - /** - * 转办任务 - * - * @param transmitBo 参数 - * @return 结果 - */ - boolean transferTask(TransmitBo transmitBo); - - /** - * 会签任务加签 - * - * @param addMultiBo 参数 - * @return 结果 - */ - boolean addMultiInstanceExecution(AddMultiBo addMultiBo); - - /** - * 会签任务减签 - * - * @param deleteMultiBo 参数 - * @return 结果 - */ - boolean deleteMultiInstanceExecution(DeleteMultiBo deleteMultiBo); - - /** - * 驳回审批 - * - * @param backProcessBo 参数 - * @return 流程实例id - */ - String backProcess(BackProcessBo backProcessBo); - - /** - * 修改任务办理人 - * - * @param taskIds 任务id - * @param userId 办理人id - * @return 结果 - */ - boolean updateAssignee(String[] taskIds, String userId); - - /** - * 查询流程变量 - * - * @param taskId 任务id - * @return 结果 - */ - List getInstanceVariable(String taskId); - - /** - * 查询工作流任务用户选择加签人员 - * - * @param taskId 任务id - * @return 结果 - */ - String getTaskUserIdsByAddMultiInstance(String taskId); - - /** - * 查询工作流选择减签人员 - * - * @param taskId 任务id - * @return 结果 - */ - List getListByDeleteMultiInstance(String taskId); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java deleted file mode 100644 index 943c919..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; - -import java.util.Collection; -import java.util.List; - -/** - * 请假Service接口 - * - * @author may - * @date 2023-07-21 - */ -public interface ITestLeaveService { - - /** - * 查询请假 - */ - TestLeaveVo queryById(Long id); - - /** - * 查询请假列表 - */ - TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery); - - /** - * 查询请假列表 - */ - List queryList(TestLeaveBo bo); - - /** - * 新增请假 - */ - TestLeaveVo insertByBo(TestLeaveBo bo); - - /** - * 修改请假 - */ - TestLeaveVo updateByBo(TestLeaveBo bo); - - /** - * 校验并批量删除请假信息 - */ - Boolean deleteWithValidByIds(Collection ids); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java deleted file mode 100644 index acf0aa2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; - -import java.util.Collection; -import java.util.List; - -/** - * 流程分类Service接口 - * - * @author may - * @date 2023-06-28 - */ -public interface IWfCategoryService { - - /** - * 查询流程分类 - */ - WfCategoryVo queryById(Long id); - - - /** - * 查询流程分类列表 - */ - List queryList(WfCategoryBo bo); - - /** - * 新增流程分类 - */ - Boolean insertByBo(WfCategoryBo bo); - - /** - * 修改流程分类 - */ - Boolean updateByBo(WfCategoryBo bo); - - /** - * 校验并批量删除流程分类信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 按照类别编码查询 - * - * @param categoryCode 分类比吗 - * @return 结果 - */ - WfCategory queryByCategoryCode(String categoryCode); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java deleted file mode 100644 index fe5cf7a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; - -import java.util.Collection; -import java.util.List; - -/** - * 流程定义配置Service接口 - * - * @author may - * @date 2024-03-18 - */ -public interface IWfDefinitionConfigService { - - /** - * 查询流程定义配置 - * - * @param definitionId 流程定义id - * @return 结果 - */ - WfDefinitionConfigVo getByDefId(String definitionId); - - /** - * 查询流程定义配置 - * - * @param tableName 表名 - * @return 结果 - */ - WfDefinitionConfigVo getByTableNameLastVersion(String tableName); - - /** - * 查询流程定义配置 - * - * @param definitionId 流程定义id - * @param tableName 表名 - * @return 结果 - */ - WfDefinitionConfigVo getByDefIdAndTableName(String definitionId, String tableName); - - /** - * 查询流程定义配置排除当前查询的流程定义 - * - * @param definitionId 流程定义id - * @param tableName 表名 - * @return 结果 - */ - List getByTableNameNotDefId(String tableName, String definitionId); - - /** - * 查询流程定义配置列表 - * - * @param definitionIds 流程定义id - * @return 结果 - */ - List queryList(List definitionIds); - - - /** - * 新增流程定义配置 - * - * @param bo 参数 - * @return 结果 - */ - Boolean saveOrUpdate(WfDefinitionConfigBo bo); - - /** - * 删除 - * - * @param ids id - * @return 结果 - */ - Boolean deleteByIds(Collection ids); - - /** - * 按照流程定义id删除 - * - * @param ids 流程定义id - * @return 结果 - */ - Boolean deleteByDefIds(Collection ids); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java deleted file mode 100644 index 2ca2264..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 表单管理Service接口 - * - * @author may - * @date 2024-03-29 - */ -public interface IWfFormManageService { - - /** - * 查询表单管理 - * - * @param id 主键 - * @return 结果 - */ - WfFormManageVo queryById(Long id); - - /** - * 查询表单管理 - * - * @param ids 主键 - * @return 结果 - */ - List queryByIds(List ids); - - /** - * 查询表单管理列表 - * - * @param bo 参数 - * @param pageQuery 分页 - * @return 结果 - */ - TableDataInfo queryPageList(WfFormManageBo bo, PageQuery pageQuery); - - /** - * 查询表单管理列表 - * - * @return 结果 - */ - List selectList(); - /** - * 查询表单管理列表 - * - * @param bo 参数 - * @return 结果 - */ - List queryList(WfFormManageBo bo); - - /** - * 新增表单管理 - * - * @param bo 参数 - * @return 结果 - */ - Boolean insertByBo(WfFormManageBo bo); - - /** - * 修改表单管理 - * - * @param bo 参数 - * @return 结果 - */ - Boolean updateByBo(WfFormManageBo bo); - - /** - * 批量删除表单管理信息 - * - * @param ids 主键 - * @return 结果 - */ - Boolean deleteByIds(Collection ids); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java deleted file mode 100644 index 5e64d64..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; - -import java.util.Collection; -import java.util.List; - -/** - * 节点配置Service接口 - * - * @author may - * @date 2024-03-30 - */ -public interface IWfNodeConfigService { - - /** - * 查询节点配置 - * - * @param id 主键 - * @return 结果 - */ - WfNodeConfigVo queryById(Long id); - - /** - * 保存节点配置 - * - * @param list 参数 - * @return 结果 - */ - Boolean saveOrUpdate(List list); - - /** - * 批量删除节点配置信息 - * - * @param ids 主键 - * @return 结果 - */ - Boolean deleteByIds(Collection ids); - - /** - * 按照流程定义id删除 - * - * @param ids 流程定义id - * @return 结果 - */ - Boolean deleteByDefIds(Collection ids); - - /** - * 按照流程定义id查询 - * - * @param ids 流程定义id - * @return 结果 - */ - List selectByDefIds(Collection ids); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java deleted file mode 100644 index 97f9406..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.dromara.workflow.service; - - -import org.dromara.workflow.domain.WfTaskBackNode; -import org.flowable.task.api.Task; - -import java.util.List; - -/** - * 节点驳回记录Service接口 - * - * @author may - * @date 2024-03-13 - */ -public interface IWfTaskBackNodeService { - - /** - * 记录审批节点 - * - * @param task 任务 - */ - void recordExecuteNode(Task task); - - /** - * 按流程实例id查询 - * - * @param processInstanceId 流程实例id - * @return 结果 - */ - List getListByInstanceId(String processInstanceId); - - /** - * 按照流程实例id，节点id查询 - * - * @param processInstanceId 流程实例id - * @param nodeId 节点id - * @return 结果 - */ - WfTaskBackNode getListByInstanceIdAndNodeId(String processInstanceId, String nodeId); - - /** - * 删除驳回后的节点 - * - * @param processInstanceId 流程实例id - * @param targetActivityId 节点id - * @return 结果 - */ - boolean deleteBackTaskNode(String processInstanceId, String targetActivityId); - - /** - * 按流程实例id删除 - * - * @param processInstanceId 流程实例id - * @return 结果 - */ - boolean deleteByInstanceId(String processInstanceId); - - /** - * 按流程实例id删除 - * - * @param processInstanceIds 流程实例id - * @return 结果 - */ - boolean deleteByInstanceIds(List processInstanceIds); -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java deleted file mode 100644 index 06d607b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.workflow.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.mapper.ActHiProcinstMapper; -import org.dromara.workflow.service.IActHiProcinstService; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * 流程实例Service业务层处理 - * - * @author may - * @date 2023-07-22 - */ -@RequiredArgsConstructor -@Service -public class ActHiProcinstServiceImpl implements IActHiProcinstService { - - private final ActHiProcinstMapper baseMapper; - - /** - * 按照业务id查询 - * - * @param businessKeys 业务id - */ - @Override - public List selectByBusinessKeyIn(List businessKeys) { - return baseMapper.selectList(new LambdaQueryWrapper() - .in(ActHiProcinst::getBusinessKey, businessKeys) - .eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId())); - } - - /** - * 按照业务id查询 - * - * @param businessKey 业务id - */ - @Override - public ActHiProcinst selectByBusinessKey(String businessKey) { - return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(ActHiProcinst::getBusinessKey, businessKey) - .eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId())); - - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java deleted file mode 100644 index 5548f22..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.workflow.service.impl; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.dromara.workflow.service.IActHiTaskinstService; - - -/** - * 流程历史任务Service业务层处理 - * - * @author may - * @date 2024-03-02 - */ -@RequiredArgsConstructor -@Service -public class ActHiTaskinstServiceImpl implements IActHiTaskinstService { - -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java deleted file mode 100644 index 217538e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java +++ /dev/null @@ -1,431 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.excel.util.StringUtils; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.batik.transcoder.TranscoderInput; -import org.apache.batik.transcoder.TranscoderOutput; -import org.apache.batik.transcoder.image.PNGTranscoder; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.ModelVo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IActModelService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; -import org.flowable.bpmn.converter.BpmnXMLConverter; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.UserTask; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.repository.Deployment; -import org.flowable.engine.repository.Model; -import org.flowable.engine.repository.ModelQuery; -import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ValidationError; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * 模型管理 服务层实现 - * - * @author may - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class ActModelServiceImpl implements IActModelService { - - @Autowired(required = false) - private RepositoryService repositoryService; - private final IWfNodeConfigService wfNodeConfigService; - private final IWfDefinitionConfigService wfDefinitionConfigService; - - /** - * 分页查询模型 - * - * @param modelBo 模型参数 - * @return 返回分页列表 - */ - @Override - public TableDataInfo page(ModelBo modelBo, PageQuery pageQuery) { - ModelQuery query = QueryUtils.modelQuery(); - if (StringUtils.isNotBlank(modelBo.getName())) { - query.modelNameLike("%" + modelBo.getName() + "%"); - } - if (StringUtils.isNotBlank(modelBo.getKey())) { - query.modelKey(modelBo.getKey()); - } - if (StringUtils.isNotBlank(modelBo.getCategoryCode())) { - query.modelCategory(modelBo.getCategoryCode()); - } - query.orderByLastUpdateTime().desc(); - // 创建时间降序排列 - query.orderByCreateTime().desc(); - // 分页查询 - List modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - // 总记录数 - long total = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(modelList); - build.setTotal(total); - return build; - } - - /** - * 新增模型 - * - * @param modelBo 模型请求对象 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean saveNewModel(ModelBo modelBo) { - try { - int version = 0; - String key = modelBo.getKey(); - String name = modelBo.getName(); - String description = modelBo.getDescription(); - String categoryCode = modelBo.getCategoryCode(); - String xml = modelBo.getXml(); - Model checkModel = QueryUtils.modelQuery().modelKey(key).singleResult(); - if (ObjectUtil.isNotNull(checkModel)) { - throw new ServiceException("模型key已存在！"); - } - //初始空的模型 - Model model = repositoryService.newModel(); - model.setKey(key); - model.setName(name); - model.setVersion(version); - model.setCategory(categoryCode); - model.setMetaInfo(description); - model.setTenantId(TenantHelper.getTenantId()); - //保存初始化的模型基本信息数据 - repositoryService.saveModel(model); - repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml)); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 查询模型 - * - * @param id 模型id - * @return 模型数据 - */ - @Override - public ModelVo getInfo(String id) { - ModelVo modelVo = new ModelVo(); - Model model = repositoryService.getModel(id); - if (model != null) { - try { - byte[] modelEditorSource = repositoryService.getModelEditorSource(model.getId()); - modelVo.setXml(StrUtil.utf8Str(modelEditorSource)); - modelVo.setId(model.getId()); - modelVo.setKey(model.getKey()); - modelVo.setName(model.getName()); - modelVo.setCategoryCode(model.getCategory()); - modelVo.setDescription(model.getMetaInfo()); - return modelVo; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - return modelVo; - } - - /** - * 修改模型信息 - * - * @param modelBo 模型数据 - * @return 结果 - */ - @Override - public boolean update(ModelBo modelBo) { - try { - Model model = repositoryService.getModel(modelBo.getId()); - List list = QueryUtils.modelQuery().modelKey(modelBo.getKey()).list(); - list.stream().filter(e -> !e.getId().equals(model.getId())).findFirst().ifPresent(e -> { - throw new ServiceException("模型KEY已存在！"); - }); - model.setCategory(modelBo.getCategoryCode()); - model.setMetaInfo(modelBo.getDescription()); - repositoryService.saveModel(model); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - return true; - } - - /** - * 编辑模型XML - * - * @param modelBo 模型数据 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean editModelXml(ModelBo modelBo) { - try { - String xml = modelBo.getXml(); - String svg = modelBo.getSvg(); - String modelId = modelBo.getId(); - String key = modelBo.getKey(); - String name = modelBo.getName(); - BpmnModel bpmnModel = ModelUtils.xmlToBpmnModel(xml); - ModelUtils.checkBpmnModel(bpmnModel); - Model model = repositoryService.getModel(modelId); - List list = QueryUtils.modelQuery().modelKey(key).list(); - list.stream().filter(e -> !e.getId().equals(model.getId())).findFirst().ifPresent(e -> { - throw new ServiceException("模型KEY已存在！"); - }); - // 校验key命名规范 - if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, key)) { - throw new ServiceException("模型标识KEY只能字符或者下划线开头！"); - } - model.setKey(key); - model.setName(name); - model.setVersion(model.getVersion() + 1); - repositoryService.saveModel(model); - repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml)); - // 转换图片 - InputStream svgStream = new ByteArrayInputStream(StrUtil.utf8Bytes(svg)); - TranscoderInput input = new TranscoderInput(svgStream); - - PNGTranscoder transcoder = new PNGTranscoder(); - ByteArrayOutputStream outStream = new ByteArrayOutputStream(); - TranscoderOutput output = new TranscoderOutput(outStream); - - transcoder.transcode(input, output); - final byte[] result = outStream.toByteArray(); - repositoryService.addModelEditorSourceExtra(model.getId(), result); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 模型部署 - * - * @param id 模型id - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean modelDeploy(String id) { - try { - // 查询流程定义模型xml - byte[] xmlBytes = repositoryService.getModelEditorSource(id); - if (ArrayUtil.isEmpty(xmlBytes)) { - throw new ServiceException("模型数据为空，请先设计流程定义模型，再进行部署！"); - } - if (JSONUtil.isTypeJSON(new String(xmlBytes, StandardCharsets.UTF_8))) { - byte[] bytes = ModelUtils.bpmnJsonToXmlBytes(xmlBytes); - if (ArrayUtil.isEmpty(bytes)) { - throw new ServiceException("模型不能为空，请至少设计一条主线流程！"); - } - } - BpmnModel bpmnModel = ModelUtils.xmlToBpmnModel(xmlBytes); - // 校验模型 - ModelUtils.checkBpmnModel(bpmnModel); - List validationErrors = repositoryService.validateProcess(bpmnModel); - if (CollUtil.isNotEmpty(validationErrors)) { - String errorMsg = validationErrors.stream().map(ValidationError::getProblem).distinct().collect(Collectors.joining(",")); - throw new ServiceException(errorMsg); - } - // 查询模型的基本信息 - Model model = repositoryService.getModel(id); - ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey(model.getKey()).latestVersion().singleResult(); - // xml资源的名称 ，对应act_ge_bytearray表中的name_字段 - String processName = model.getName() + ".bpmn20.xml"; - // 调用部署相关的api方法进行部署流程定义 - Deployment deployment = repositoryService.createDeployment() - // 部署名称 - .name(model.getName()) - // 部署标识key - .key(model.getKey()) - // 部署流程分类 - .category(model.getCategory()) - // bpmn20.xml资源 - .addBytes(processName, xmlBytes) - // 租户id - .tenantId(TenantHelper.getTenantId()) - .deploy(); - - // 更新 部署id 到流程定义模型数据表中 - model.setDeploymentId(deployment.getId()); - repositoryService.saveModel(model); - // 更新分类 - ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult(); - repositoryService.setProcessDefinitionCategory(definition.getId(), model.getCategory()); - //更新流程定义配置 - if (processDefinition != null) { - WfDefinitionConfigVo definitionVo = wfDefinitionConfigService.getByDefId(processDefinition.getId()); - if (definitionVo != null) { - wfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinition.getId())); - WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo(); - wfFormDefinition.setDefinitionId(definition.getId()); - wfFormDefinition.setProcessKey(definition.getKey()); - wfFormDefinition.setTableName(definitionVo.getTableName()); - wfFormDefinition.setVersion(definition.getVersion()); - wfFormDefinition.setRemark(definitionVo.getRemark()); - wfDefinitionConfigService.saveOrUpdate(wfFormDefinition); - } - } - //更新流程节点配置表单 - List userTasks = ModelUtils.getUserTaskFlowElements(definition.getId()); - UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId()); - List wfNodeConfigList = new ArrayList<>(); - for (UserTask userTask : userTasks) { - if (StringUtils.isNotBlank(userTask.getFormKey()) && userTask.getFormKey().contains(StrUtil.COLON)) { - WfNodeConfig wfNodeConfig = new WfNodeConfig(); - wfNodeConfig.setNodeId(userTask.getId()); - wfNodeConfig.setNodeName(userTask.getName()); - wfNodeConfig.setDefinitionId(definition.getId()); - String[] split = userTask.getFormKey().split(StrUtil.COLON); - wfNodeConfig.setFormType(split[0]); - wfNodeConfig.setFormId(Long.valueOf(split[1])); - wfNodeConfig.setApplyUserTask(applyUserTask.getId().equals(userTask.getId()) ? FlowConstant.TRUE : FlowConstant.FALSE); - wfNodeConfigList.add(wfNodeConfig); - } - } - if (CollUtil.isNotEmpty(wfNodeConfigList)) { - wfNodeConfigService.saveOrUpdate(wfNodeConfigList); - } - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 导出模型zip压缩包 - * - * @param modelIds 模型id - * @param response 相应 - */ - @Override - public void exportZip(List modelIds, HttpServletResponse response) { - try (ZipOutputStream zos = ZipUtil.getZipOutputStream(response.getOutputStream(), StandardCharsets.UTF_8)) { - // 压缩包文件名 - String zipName = "模型不存在"; - // 查询模型基本信息 - for (String modelId : modelIds) { - Model model = repositoryService.getModel(modelId); - byte[] xmlBytes = repositoryService.getModelEditorSource(modelId); - if (ObjectUtil.isNotNull(model)) { - if (JSONUtil.isTypeJSON(new String(xmlBytes, StandardCharsets.UTF_8)) && ArrayUtil.isEmpty(ModelUtils.bpmnJsonToXmlBytes(xmlBytes))) { - zipName = "模型不能为空，请至少设计一条主线流程！"; - zos.putNextEntry(new ZipEntry(zipName + ".txt")); - zos.write(zipName.getBytes(StandardCharsets.UTF_8)); - } else if (ArrayUtil.isEmpty(xmlBytes)) { - zipName = "模型数据为空，请先设计流程定义模型，再进行部署！"; - zos.putNextEntry(new ZipEntry(zipName + ".txt")); - zos.write(zipName.getBytes(StandardCharsets.UTF_8)); - } else { - String fileName = model.getName() + "-" + model.getKey(); - // 压缩包文件名 - zipName = fileName + ".zip"; - // 将xml添加到压缩包中(指定xml文件名：请假流程.bpmn20.xml - zos.putNextEntry(new ZipEntry(fileName + ".bpmn20.xml")); - zos.write(xmlBytes); - } - } - } - response.setHeader("Content-Disposition", - "attachment; filename=" + URLEncoder.encode(zipName, StandardCharsets.UTF_8) + ".zip"); - response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - // 刷出响应流 - response.flushBuffer(); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } - - /** - * 复制模型 - * - * @param modelBo 模型数据 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean copyModel(ModelBo modelBo) { - try { - String key = modelBo.getKey(); - if (StringUtils.isNotBlank(key)) { - // 查询模型 - Model model = repositoryService.createModelQuery().modelId(modelBo.getId()).singleResult(); - if (ObjectUtil.isNotNull(model)) { - byte[] modelEditorSource = repositoryService.getModelEditorSource(model.getId()); - List list = QueryUtils.modelQuery().modelKey(key).list(); - if (CollUtil.isNotEmpty(list)) { - throw new ServiceException("模型KEY已存在！"); - } - // 校验key命名规范 - if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, key)) { - throw new ServiceException("模型标识KEY只能字符或者下划线开头！"); - } - // 复制模型数据 - Model newModel = repositoryService.newModel(); - newModel.setKey(modelBo.getKey()); - newModel.setName(modelBo.getName()); - newModel.setCategory(modelBo.getCategoryCode()); - newModel.setVersion(1); - newModel.setMetaInfo(modelBo.getDescription()); - newModel.setTenantId(TenantHelper.getTenantId()); - String xml = StrUtil.utf8Str(modelEditorSource); - BpmnModel bpmnModel = ModelUtils.xmlToBpmnModel(xml); - Process mainProcess = bpmnModel.getMainProcess(); - mainProcess.setId(modelBo.getKey()); - mainProcess.setName(modelBo.getName()); - byte[] xmlBytes = new BpmnXMLConverter().convertToXML(bpmnModel); - repositoryService.saveModel(newModel); - repositoryService.addModelEditorSource(newModel.getId(), xmlBytes); - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - return true; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java deleted file mode 100644 index 77fb257..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ /dev/null @@ -1,444 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.codec.Base64; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.mapper.WfDefinitionConfigMapper; -import org.dromara.workflow.service.IActProcessDefinitionService; -import org.dromara.workflow.service.IWfCategoryService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; -import org.flowable.bpmn.model.UserTask; -import org.flowable.engine.ProcessMigrationService; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.impl.bpmn.deployer.ResourceNameUtil; -import org.flowable.engine.repository.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -/** - * 流程定义 服务层实现 - * - * @author may - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionService { - - @Autowired(required = false) - private RepositoryService repositoryService; - @Autowired(required = false) - private ProcessMigrationService processMigrationService; - private final IWfCategoryService wfCategoryService; - private final IWfDefinitionConfigService wfDefinitionConfigService; - private final WfDefinitionConfigMapper wfDefinitionConfigMapper; - private final IWfNodeConfigService wfNodeConfigService; - - /** - * 分页查询 - * - * @param bo 参数 - * @return 返回分页列表 - */ - @Override - public TableDataInfo page(ProcessDefinitionBo bo, PageQuery pageQuery) { - ProcessDefinitionQuery query = QueryUtils.definitionQuery(); - if (StringUtils.isNotEmpty(bo.getKey())) { - query.processDefinitionKey(bo.getKey()); - } - if (StringUtils.isNotEmpty(bo.getCategoryCode())) { - query.processDefinitionCategory(bo.getCategoryCode()); - } - if (StringUtils.isNotEmpty(bo.getName())) { - query.processDefinitionNameLike("%" + bo.getName() + "%"); - } - query.orderByDeploymentId().desc(); - // 分页查询 - List processDefinitionVoList = new ArrayList<>(); - List definitionList = query.latestVersion().listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - List deploymentList = null; - if (CollUtil.isNotEmpty(definitionList)) { - List deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId); - deploymentList = QueryUtils.deploymentQuery(deploymentIds).list(); - } - if (CollUtil.isNotEmpty(definitionList)) { - List ids = StreamUtils.toList(definitionList, ProcessDefinition::getId); - List wfDefinitionConfigVos = wfDefinitionConfigService.queryList(ids); - for (ProcessDefinition processDefinition : definitionList) { - ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class); - if (CollUtil.isNotEmpty(deploymentList)) { - // 部署时间 - deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> { - processDefinitionVo.setDeploymentTime(e.getDeploymentTime()); - }); - } - if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) { - wfDefinitionConfigVos.stream().filter(e -> e.getDefinitionId().equals(processDefinition.getId())).findFirst().ifPresent(processDefinitionVo::setWfDefinitionConfigVo); - } - processDefinitionVoList.add(processDefinitionVo); - } - } - // 总记录数 - long total = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(processDefinitionVoList); - build.setTotal(total); - return build; - } - - /** - * 查询历史流程定义列表 - * - * @param key 流程定义key - */ - @Override - public List getListByKey(String key) { - List processDefinitionVoList = new ArrayList<>(); - ProcessDefinitionQuery query = QueryUtils.definitionQuery(); - List definitionList = query.processDefinitionKey(key).list(); - List deploymentList = null; - if (CollUtil.isNotEmpty(definitionList)) { - List deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId); - deploymentList = QueryUtils.deploymentQuery(deploymentIds).list(); - } - if (CollUtil.isNotEmpty(definitionList)) { - List ids = StreamUtils.toList(definitionList, ProcessDefinition::getId); - List wfDefinitionConfigVos = wfDefinitionConfigService.queryList(ids); - for (ProcessDefinition processDefinition : definitionList) { - ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class); - if (CollUtil.isNotEmpty(deploymentList)) { - // 部署时间 - deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> { - processDefinitionVo.setDeploymentTime(e.getDeploymentTime()); - }); - if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) { - wfDefinitionConfigVos.stream().filter(e -> e.getDefinitionId().equals(processDefinition.getId())).findFirst().ifPresent(processDefinitionVo::setWfDefinitionConfigVo); - } - } - processDefinitionVoList.add(processDefinitionVo); - } - } - return CollUtil.reverse(processDefinitionVoList); - } - - /** - * 查看流程定义图片 - * - * @param processDefinitionId 流程定义id - */ - @SneakyThrows - @Override - public String definitionImage(String processDefinitionId) { - InputStream inputStream = repositoryService.getProcessDiagram(processDefinitionId); - return Base64.encode(IoUtil.readBytes(inputStream)); - } - - /** - * 查看流程定义xml文件 - * - * @param processDefinitionId 流程定义id - */ - @Override - public String definitionXml(String processDefinitionId) { - StringBuilder xml = new StringBuilder(); - ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId); - InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName()); - xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8)); - return xml.toString(); - } - - /** - * 删除流程定义 - * - * @param deploymentIds 部署id - * @param processDefinitionIds 流程定义id - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteDeployment(List deploymentIds, List processDefinitionIds) { - try { - List historicProcessInstances = QueryUtils.hisInstanceQuery().deploymentIdIn(deploymentIds).list(); - if (CollUtil.isNotEmpty(historicProcessInstances)) { - Set defIds = StreamUtils.toSet(historicProcessInstances, HistoricProcessInstance::getProcessDefinitionId); - List processDefinitions = QueryUtils.definitionQuery().processDefinitionIds(defIds).list(); - if (CollUtil.isNotEmpty(processDefinitions)) { - Set keys = StreamUtils.toSet(processDefinitions, ProcessDefinition::getKey); - throw new ServiceException("当前【" + String.join(",", keys) + "】流程定义已被使用不可删除！"); - } - } - //删除流程定义 - for (String deploymentId : deploymentIds) { - repositoryService.deleteDeployment(deploymentId); - } - //删除流程定义配置 - wfDefinitionConfigService.deleteByDefIds(processDefinitionIds); - //删除节点配置 - wfNodeConfigService.deleteByDefIds(processDefinitionIds); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 激活或者挂起流程定义 - * - * @param processDefinitionId 流程定义id - */ - @Override - public boolean updateDefinitionState(String processDefinitionId) { - try { - ProcessDefinition processDefinition = QueryUtils.definitionQuery() - .processDefinitionId(processDefinitionId).singleResult(); - //将当前为挂起状态更新为激活状态 - //参数说明：参数1：流程定义id,参数2：是否激活（true是否级联对应流程实例，激活了则对应流程实例都可以审批）， - //参数3：什么时候激活，如果为null则立即激活，如果为具体时间则到达此时间后激活 - if (processDefinition.isSuspended()) { - repositoryService.activateProcessDefinitionById(processDefinitionId, true, null); - } else { - repositoryService.suspendProcessDefinitionById(processDefinitionId, true, null); - } - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException("操作失败:" + e.getMessage()); - } - } - - /** - * 迁移流程定义 - * - * @param currentProcessDefinitionId 当前流程定义id - * @param fromProcessDefinitionId 需要迁移到的流程定义id - */ - - @Override - public boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) { - try { - // 迁移验证 - boolean migrationValid = processMigrationService.createProcessInstanceMigrationBuilder() - .migrateToProcessDefinition(currentProcessDefinitionId) - .validateMigrationOfProcessInstances(fromProcessDefinitionId) - .isMigrationValid(); - if (!migrationValid) { - throw new ServiceException("流程定义差异过大无法迁移，请修改流程图"); - } - // 已结束的流程实例不会迁移 - processMigrationService.createProcessInstanceMigrationBuilder() - .migrateToProcessDefinition(currentProcessDefinitionId) - .migrateProcessInstances(fromProcessDefinitionId); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 流程定义转换为模型 - * - * @param processDefinitionId 流程定义id - */ - @Override - public boolean convertToModel(String processDefinitionId) { - ProcessDefinition pd = QueryUtils.definitionQuery() - .processDefinitionId(processDefinitionId).singleResult(); - InputStream inputStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName()); - ModelQuery query = QueryUtils.modelQuery(); - Model model = query.modelKey(pd.getKey()).singleResult(); - try { - if (ObjectUtil.isNotNull(model)) { - repositoryService.addModelEditorSource(model.getId(), IoUtil.readBytes(inputStream)); - } else { - Model modelData = repositoryService.newModel(); - modelData.setKey(pd.getKey()); - modelData.setName(pd.getName()); - modelData.setCategory(pd.getCategory()); - modelData.setTenantId(pd.getTenantId()); - repositoryService.saveModel(modelData); - repositoryService.addModelEditorSource(modelData.getId(), IoUtil.readBytes(inputStream)); - } - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 通过zip或xml部署流程定义 - * - * @param file 文件 - * @param categoryCode 分类 - */ - @SneakyThrows - @Override - @Transactional(rollbackFor = Exception.class) - public void deployByFile(MultipartFile file, String categoryCode) { - - WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode); - if (wfCategory == null) { - throw new ServiceException("流程分类不存在"); - } - // 文件后缀名 - String suffix = FileUtil.extName(file.getOriginalFilename()); - InputStream inputStream = file.getInputStream(); - if (FlowConstant.ZIP.equalsIgnoreCase(suffix)) { - ZipInputStream zipInputStream = null; - try { - zipInputStream = new ZipInputStream(inputStream); - ZipEntry zipEntry; - while ((zipEntry = zipInputStream.getNextEntry()) != null) { - String filename = zipEntry.getName(); - String[] splitFilename = filename.substring(0, filename.lastIndexOf(".")).split("-"); - //流程名称 - String processName = splitFilename[0]; - //流程key - String processKey = splitFilename[1]; - ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult(); - DeploymentBuilder builder = repositoryService.createDeployment(); - Deployment deployment = builder.addInputStream(filename, zipInputStream) - .tenantId(TenantHelper.getTenantId()) - .name(processName).key(processKey).category(categoryCode).deploy(); - ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult(); - repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode); - setWfConfig(oldProcessDefinition, definition); - zipInputStream.closeEntry(); - } - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - if (zipInputStream != null) { - zipInputStream.close(); - } - } - //初始化配置数据（demo使用，不用可删除） - initWfDefConfig(); - } else { - String originalFilename = file.getOriginalFilename(); - if (StringUtils.containsAny(originalFilename, ResourceNameUtil.BPMN_RESOURCE_SUFFIXES)) { - // 文件名 = 流程名称-流程key - String[] splitFilename = originalFilename.substring(0, originalFilename.lastIndexOf(".")).split("-"); - if (splitFilename.length < 2) { - throw new ServiceException("文件名 = 流程名称-流程KEY"); - } - //流程名称 - String processName = splitFilename[0]; - //流程key - String processKey = splitFilename[1]; - ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult(); - DeploymentBuilder builder = repositoryService.createDeployment(); - Deployment deployment = builder.addInputStream(originalFilename, inputStream) - .tenantId(TenantHelper.getTenantId()) - .name(processName).key(processKey).category(categoryCode).deploy(); - // 更新分类 - ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult(); - repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode); - setWfConfig(oldProcessDefinition, definition); - } else { - throw new ServiceException("文件类型上传错误！"); - } - } - - } - - /** - * 初始化配置数据（demo使用，不用可删除） - */ - private void initWfDefConfig() { - List wfDefinitionConfigs = wfDefinitionConfigMapper.selectList(); - if (CollUtil.isEmpty(wfDefinitionConfigs)) { - ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey("leave1").latestVersion().singleResult(); - if (processDefinition != null) { - WfDefinitionConfigBo wfDefinitionConfigBo = new WfDefinitionConfigBo(); - wfDefinitionConfigBo.setDefinitionId(processDefinition.getId()); - wfDefinitionConfigBo.setProcessKey(processDefinition.getKey()); - wfDefinitionConfigBo.setTableName("test_leave"); - wfDefinitionConfigBo.setVersion(processDefinition.getVersion()); - wfDefinitionConfigService.saveOrUpdate(wfDefinitionConfigBo); - } - } - - } - - /** - * 设置表单内容 - * - * @param oldProcessDefinition 部署前最新流程定义 - * @param definition 部署后最新流程定义 - */ - private void setWfConfig(ProcessDefinition oldProcessDefinition, ProcessDefinition definition) { - //更新流程定义表单 - if (oldProcessDefinition != null) { - WfDefinitionConfigVo definitionVo = wfDefinitionConfigService.getByDefId(oldProcessDefinition.getId()); - if (definitionVo != null) { - wfDefinitionConfigService.deleteByDefIds(Collections.singletonList(oldProcessDefinition.getId())); - WfDefinitionConfigBo wfDefinitionConfigBo = new WfDefinitionConfigBo(); - wfDefinitionConfigBo.setDefinitionId(definition.getId()); - wfDefinitionConfigBo.setProcessKey(definition.getKey()); - wfDefinitionConfigBo.setTableName(definitionVo.getTableName()); - wfDefinitionConfigBo.setVersion(definition.getVersion()); - wfDefinitionConfigBo.setRemark(definitionVo.getRemark()); - wfDefinitionConfigService.saveOrUpdate(wfDefinitionConfigBo); - } - } - //更新流程节点配置表单 - List userTasks = ModelUtils.getUserTaskFlowElements(definition.getId()); - UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId()); - List wfNodeConfigList = new ArrayList<>(); - for (UserTask userTask : userTasks) { - if (StringUtils.isNotBlank(userTask.getFormKey()) && userTask.getFormKey().contains(StrUtil.COLON)) { - WfNodeConfig wfNodeConfig = new WfNodeConfig(); - wfNodeConfig.setNodeId(userTask.getId()); - wfNodeConfig.setNodeName(userTask.getName()); - wfNodeConfig.setDefinitionId(definition.getId()); - String[] split = userTask.getFormKey().split(StrUtil.COLON); - wfNodeConfig.setFormType(split[0]); - wfNodeConfig.setFormId(Long.valueOf(split[1])); - wfNodeConfig.setApplyUserTask(applyUserTask.getId().equals(userTask.getId()) ? FlowConstant.TRUE : FlowConstant.FALSE); - wfNodeConfigList.add(wfNodeConfig); - } - } - if (CollUtil.isNotEmpty(wfNodeConfigList)) { - wfNodeConfigService.saveOrUpdate(wfNodeConfigList); - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java deleted file mode 100644 index 8b9b113..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java +++ /dev/null @@ -1,691 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.codec.Base64; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.ObjectUtil; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.*; -import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator; -import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd; -import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd; -import org.dromara.workflow.flowable.handler.FlowProcessEventHandler; -import org.dromara.workflow.service.IActHiProcinstService; -import org.dromara.workflow.service.IActProcessInstanceService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.QueryUtils; -import org.dromara.workflow.utils.WorkflowUtils; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.engine.*; -import org.flowable.engine.history.HistoricActivityInstance; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.history.HistoricProcessInstanceQuery; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.engine.runtime.ProcessInstanceQuery; -import org.flowable.engine.task.Attachment; -import org.flowable.engine.task.Comment; -import org.flowable.task.api.Task; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.awt.*; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.*; - -/** - * 流程实例 服务层实现 - * - * @author may - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class ActProcessInstanceServiceImpl implements IActProcessInstanceService { - - @Autowired(required = false) - private RepositoryService repositoryService; - @Autowired(required = false) - private RuntimeService runtimeService; - @Autowired(required = false) - private HistoryService historyService; - @Autowired(required = false) - private TaskService taskService; - @Autowired(required = false) - private ManagementService managementService; - private final IActHiProcinstService actHiProcinstService; - private final IWfTaskBackNodeService wfTaskBackNodeService; - private final IWfNodeConfigService wfNodeConfigService; - private final FlowProcessEventHandler flowProcessEventHandler; - private final UserService userService; - - @Value("${flowable.activity-font-name}") - private String activityFontName; - - @Value("${flowable.label-font-name}") - private String labelFontName; - - @Value("${flowable.annotation-font-name}") - private String annotationFontName; - - /** - * 分页查询正在运行的流程实例 - * - * @param bo 参数 - */ - @Override - public TableDataInfo getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) { - List list = new ArrayList<>(); - ProcessInstanceQuery query = QueryUtils.instanceQuery(); - if (StringUtils.isNotBlank(bo.getName())) { - query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%"); - } - if (StringUtils.isNotBlank(bo.getKey())) { - query.processDefinitionKey(bo.getKey()); - } - if (StringUtils.isNotBlank(bo.getStartUserId())) { - query.startedBy(bo.getStartUserId()); - } - if (StringUtils.isNotBlank(bo.getBusinessKey())) { - query.processInstanceBusinessKey(bo.getBusinessKey()); - } - if (StringUtils.isNotBlank(bo.getCategoryCode())) { - query.processDefinitionCategory(bo.getCategoryCode()); - } - query.orderByStartTime().desc(); - List processInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - for (ProcessInstance processInstance : processInstances) { - ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class); - processInstanceVo.setIsSuspended(processInstance.isSuspended()); - processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstance.getBusinessStatus())); - list.add(processInstanceVo); - } - if (CollUtil.isNotEmpty(list)) { - List processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (ProcessInstanceVo processInstanceVo : list) { - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo); - } - } - } - long count = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(list); - build.setTotal(count); - return build; - } - - /** - * 分页查询已结束的流程实例 - * - * @param bo 参数 - */ - @Override - public TableDataInfo getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) { - List list = new ArrayList<>(); - HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery() - .finished().orderByProcessInstanceEndTime().desc(); - if (StringUtils.isNotEmpty(bo.getName())) { - query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%"); - } - if (StringUtils.isNotBlank(bo.getKey())) { - query.processDefinitionKey(bo.getKey()); - } - if (StringUtils.isNotEmpty(bo.getStartUserId())) { - query.startedBy(bo.getStartUserId()); - } - if (StringUtils.isNotBlank(bo.getBusinessKey())) { - query.processInstanceBusinessKey(bo.getBusinessKey()); - } - if (StringUtils.isNotBlank(bo.getCategoryCode())) { - query.processDefinitionCategory(bo.getCategoryCode()); - } - List historicProcessInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) { - ProcessInstanceVo processInstanceVo = BeanUtil.toBean(historicProcessInstance, ProcessInstanceVo.class); - processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(historicProcessInstance.getBusinessStatus())); - list.add(processInstanceVo); - } - if (CollUtil.isNotEmpty(list)) { - List processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (ProcessInstanceVo processInstanceVo : list) { - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo); - } - } - } - long count = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(list); - build.setTotal(count); - return build; - } - - /** - * 通过业务id获取历史流程图 - * - * @param businessKey 业务id - */ - @SneakyThrows - @Override - public String getHistoryImage(String businessKey) { - String processDefinitionId; - // 获取当前的流程实例 - ProcessInstance processInstance = QueryUtils.businessKeyQuery(businessKey).singleResult(); - // 如果流程已经结束，则得到结束节点 - if (Objects.isNull(processInstance)) { - HistoricProcessInstance pi = QueryUtils.hisInstanceQuery().processInstanceBusinessKey(businessKey).singleResult(); - processDefinitionId = pi.getProcessDefinitionId(); - } else { - // 根据流程实例ID获得当前处于活动状态的ActivityId合集 - ProcessInstance pi = QueryUtils.instanceQuery(processInstance.getProcessInstanceId()).singleResult(); - processDefinitionId = pi.getProcessDefinitionId(); - } - - // 获得活动的节点 - List highLightedFlowList = QueryUtils.hisActivityInstanceQuery(processInstance.getProcessInstanceId()).orderByHistoricActivityInstanceStartTime().asc().list(); - - List highLightedFlows = new ArrayList<>(); - List highLightedNodes = new ArrayList<>(); - //高亮 - for (HistoricActivityInstance tempActivity : highLightedFlowList) { - if (FlowConstant.SEQUENCE_FLOW.equals(tempActivity.getActivityType())) { - //高亮线 - highLightedFlows.add(tempActivity.getActivityId()); - } else { - //高亮节点 - if (tempActivity.getEndTime() == null) { - highLightedNodes.add(Color.RED.toString() + tempActivity.getActivityId()); - } else { - highLightedNodes.add(tempActivity.getActivityId()); - } - } - } - List highLightedNodeList = new ArrayList<>(); - //运行中的节点 - List redNodeCollect = StreamUtils.filter(highLightedNodes, e -> e.contains(Color.RED.toString())); - //排除与运行中相同的节点 - for (String nodeId : highLightedNodes) { - if (!nodeId.contains(Color.RED.toString()) && !redNodeCollect.contains(Color.RED + nodeId)) { - highLightedNodeList.add(nodeId); - } - } - highLightedNodeList.addAll(redNodeCollect); - BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId); - CustomDefaultProcessDiagramGenerator diagramGenerator = new CustomDefaultProcessDiagramGenerator(); - InputStream inputStream = diagramGenerator.generateDiagram(bpmnModel, "png", highLightedNodeList, highLightedFlows, activityFontName, labelFontName, annotationFontName, null, 1.0, true); - return Base64.encode(IoUtil.readBytes(inputStream)); - } - - /** - * 通过业务id获取历史流程图运行中，历史等节点 - * - * @param businessKey 业务id - */ - @Override - public Map getHistoryList(String businessKey) { - Map map = new HashMap<>(); - List> taskList = new ArrayList<>(); - HistoricProcessInstance historicProcessInstance = QueryUtils.hisBusinessKeyQuery(businessKey).singleResult(); - String processInstanceId = historicProcessInstance.getId(); - StringBuilder xml = new StringBuilder(); - ProcessDefinition processDefinition = repositoryService.getProcessDefinition(historicProcessInstance.getProcessDefinitionId()); - // 获取节点 - List highLightedFlowList = QueryUtils.hisActivityInstanceQuery(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list(); - for (HistoricActivityInstance tempActivity : highLightedFlowList) { - Map task = new HashMap<>(); - switch (tempActivity.getActivityType()) { - case FlowConstant.SEQUENCE_FLOW, FlowConstant.PARALLEL_GATEWAY, - FlowConstant.EXCLUSIVE_GATEWAY, FlowConstant.INCLUSIVE_GATEWAY -> {} - default -> { - task.put("key", tempActivity.getActivityId()); - task.put("completed", tempActivity.getEndTime() != null); - task.put("activityType", tempActivity.getActivityType()); - taskList.add(task); - } - } - } - ProcessInstance processInstance = QueryUtils.instanceQuery(processInstanceId).singleResult(); - if (processInstance != null) { - taskList = StreamUtils.filter(taskList, e -> !e.get("activityType").equals(FlowConstant.END_EVENT)); - } - //查询出运行中节点 - List> runtimeNodeList = StreamUtils.filter(taskList, e -> !(Boolean) e.get("completed")); - if (CollUtil.isNotEmpty(runtimeNodeList)) { - Iterator> iterator = taskList.iterator(); - while (iterator.hasNext()) { - Map next = iterator.next(); - runtimeNodeList.stream().filter(t -> t.get("key").equals(next.get("key")) && (Boolean) next.get("completed")).findFirst().ifPresent(t -> iterator.remove()); - } - } - map.put("taskList", taskList); - List historyTaskList = getHistoryTaskList(processInstanceId, processDefinition.getVersion()); - map.put("historyList", historyTaskList); - InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName()); - xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8)); - map.put("xml", xml.toString()); - return map; - } - - /** - * 获取历史任务节点信息 - * - * @param processInstanceId 流程实例id - * @param version 版本 - */ - private List getHistoryTaskList(String processInstanceId, Integer version) { - //查询任务办理记录 - List list = QueryUtils.hisTaskInstanceQuery(processInstanceId).orderByHistoricTaskInstanceEndTime().desc().list(); - list = StreamUtils.sorted(list, Comparator.comparing(HistoricTaskInstance::getEndTime, Comparator.nullsFirst(Date::compareTo)).reversed()); - List actHistoryInfoVoList = new ArrayList<>(); - for (HistoricTaskInstance historicTaskInstance : list) { - ActHistoryInfoVo actHistoryInfoVo = new ActHistoryInfoVo(); - BeanUtils.copyProperties(historicTaskInstance, actHistoryInfoVo); - actHistoryInfoVo.setStatus(actHistoryInfoVo.getEndTime() == null ? "待处理" : "已处理"); - if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) { - actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis())); - } - actHistoryInfoVo.setVersion(version); - actHistoryInfoVoList.add(actHistoryInfoVo); - } - List historyInfoVoList = new ArrayList<>(); - Map> groupByKey = StreamUtils.groupByKey(actHistoryInfoVoList, ActHistoryInfoVo::getTaskDefinitionKey); - for (Map.Entry> entry : groupByKey.entrySet()) { - ActHistoryInfoVo historyInfoVo = new ActHistoryInfoVo(); - if (entry.getValue().size() > 1) { - List historyInfoVos = StreamUtils.filter(entry.getValue(), e -> StringUtils.isNotBlank(e.getAssignee())); - if (CollUtil.isNotEmpty(historyInfoVos)) { - ActHistoryInfoVo infoVo = historyInfoVos.get(0); - BeanUtils.copyProperties(infoVo, historyInfoVo); - historyInfoVo.setStatus(infoVo.getEndTime() == null ? "待处理" : "已处理"); - historyInfoVo.setStartTime(infoVo.getStartTime()); - historyInfoVo.setEndTime(infoVo.getEndTime() == null ? null : infoVo.getEndTime()); - historyInfoVo.setRunDuration(infoVo.getEndTime() == null ? null : infoVo.getRunDuration()); - if (ObjectUtil.isEmpty(infoVo.getAssignee())) { - ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(infoVo.getId(), userService); - if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) { - historyInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr)); - } - } - } - } else { - actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey())).findFirst() - .ifPresent(e -> { - BeanUtils.copyProperties(e, historyInfoVo); - historyInfoVo.setStatus(e.getEndTime() == null ? "待处理" : "已处理"); - historyInfoVo.setStartTime(e.getStartTime()); - historyInfoVo.setEndTime(e.getEndTime() == null ? null : e.getEndTime()); - historyInfoVo.setRunDuration(e.getEndTime() == null ? null : e.getRunDuration()); - if (ObjectUtil.isEmpty(e.getAssignee())) { - ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(e.getId(), userService); - if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) { - historyInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr)); - } - } - }); - - } - historyInfoVoList.add(historyInfoVo); - - } - return historyInfoVoList; - } - - /** - * 获取审批记录 - * - * @param businessKey 业务id - */ - @Override - public List getHistoryRecord(String businessKey) { - // 查询任务办理记录 - List list = QueryUtils.hisTaskBusinessKeyQuery(businessKey).orderByHistoricTaskInstanceEndTime().desc().list(); - list = StreamUtils.sorted(list, Comparator.comparing(HistoricTaskInstance::getEndTime, Comparator.nullsFirst(Date::compareTo)).reversed()); - HistoricProcessInstance historicProcessInstance = QueryUtils.hisBusinessKeyQuery(businessKey).singleResult(); - String processInstanceId = historicProcessInstance.getId(); - List actHistoryInfoVoList = new ArrayList<>(); - List processInstanceComments = taskService.getProcessInstanceComments(processInstanceId); - //附件 - List attachmentList = taskService.getProcessInstanceAttachments(processInstanceId); - for (HistoricTaskInstance historicTaskInstance : list) { - ActHistoryInfoVo actHistoryInfoVo = new ActHistoryInfoVo(); - BeanUtils.copyProperties(historicTaskInstance, actHistoryInfoVo); - if (actHistoryInfoVo.getEndTime() == null) { - actHistoryInfoVo.setStatus(TaskStatusEnum.WAITING.getStatus()); - actHistoryInfoVo.setStatusName(TaskStatusEnum.WAITING.getDesc()); - } - if (CollUtil.isNotEmpty(processInstanceComments)) { - processInstanceComments.stream().filter(e -> e.getTaskId().equals(historicTaskInstance.getId())).findFirst().ifPresent(e -> { - actHistoryInfoVo.setComment(e.getFullMessage()); - actHistoryInfoVo.setStatus(e.getType()); - actHistoryInfoVo.setStatusName(TaskStatusEnum.findByStatus(e.getType())); - }); - } - if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) { - actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis())); - } - //附件 - if (CollUtil.isNotEmpty(attachmentList)) { - List attachments = StreamUtils.filter(attachmentList, e -> e.getTaskId().equals(historicTaskInstance.getId())); - if (CollUtil.isNotEmpty(attachments)) { - actHistoryInfoVo.setAttachmentList(attachments); - } - } - //设置人员id - if (ObjectUtil.isEmpty(historicTaskInstance.getAssignee())) { - ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(historicTaskInstance.getId(), userService); - if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) { - actHistoryInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr)); - } - } - actHistoryInfoVoList.add(actHistoryInfoVo); - } - // 审批记录 - Map> groupByKey = StreamUtils.groupByKey(actHistoryInfoVoList, ActHistoryInfoVo::getTaskDefinitionKey); - for (Map.Entry> entry : groupByKey.entrySet()) { - ActHistoryInfoVo actHistoryInfoVo = BeanUtil.toBean(entry.getValue().get(0), ActHistoryInfoVo.class); - actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey()) && e.getEndTime() != null).findFirst() - .ifPresent(e -> { - actHistoryInfoVo.setStatus("已处理"); - actHistoryInfoVo.setStartTime(e.getStartTime()); - }); - actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey()) && e.getEndTime() == null).findFirst() - .ifPresent(e -> { - actHistoryInfoVo.setStatus("待处理"); - actHistoryInfoVo.setStartTime(e.getStartTime()); - actHistoryInfoVo.setEndTime(null); - actHistoryInfoVo.setRunDuration(null); - }); - } - List recordList = new ArrayList<>(); - // 待办理 - recordList.addAll(StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() == null)); - // 已办理 - recordList.addAll(StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() != null)); - - return recordList; - } - - /** - * 任务完成时间处理 - * - * @param time 时间 - */ - private String getDuration(long time) { - - long day = time / (24 * 60 * 60 * 1000); - long hour = (time / (60 * 60 * 1000) - day * 24); - long minute = ((time / (60 * 1000)) - day * 24 * 60 - hour * 60); - long second = (time / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60); - - if (day > 0) { - return day + "天" + hour + "小时" + minute + "分钟"; - } - if (hour > 0) { - return hour + "小时" + minute + "分钟"; - } - if (minute > 0) { - return minute + "分钟"; - } - if (second > 0) { - return second + "秒"; - } else { - return 0 + "秒"; - } - } - - /** - * 作废流程实例，不会删除历史记录(删除运行中的实例) - * - * @param processInvalidBo 参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteRunInstance(ProcessInvalidBo processInvalidBo) { - try { - List list = QueryUtils.taskQuery().processInstanceBusinessKey(processInvalidBo.getBusinessKey()).list(); - String processInstanceId = list.get(0).getProcessInstanceId(); - List subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId())); - if (CollUtil.isNotEmpty(subTasks)) { - subTasks.forEach(e -> taskService.deleteTask(e.getId())); - } - String deleteReason = LoginHelper.getLoginUser().getNickname() + "作废了当前申请！"; - if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) { - deleteReason = LoginHelper.getLoginUser().getNickname() + "作废理由:" + processInvalidBo.getDeleteReason(); - } - for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) { - taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason); - } - HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInstanceId).singleResult(); - BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus()); - runtimeService.updateBusinessStatus(processInstanceId, BusinessStatusEnum.INVALID.getStatus()); - runtimeService.deleteProcessInstance(processInstanceId, deleteReason); - //流程作废监听 - flowProcessEventHandler.processHandler(historicProcessInstance.getProcessDefinitionKey(), - historicProcessInstance.getBusinessKey(), BusinessStatusEnum.INVALID.getStatus(), false); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteRunAndHisInstance(List businessKeys) { - try { - // 1.删除运行中流程实例 - List actHiProcinsts = actHiProcinstService.selectByBusinessKeyIn(businessKeys); - if (CollUtil.isEmpty(actHiProcinsts)) { - log.warn("当前业务ID:{}查询到流程实例为空！", businessKeys); - return false; - } - List processInstanceIds = StreamUtils.toList(actHiProcinsts, ActHiProcinst::getId); - List list = QueryUtils.taskQuery(processInstanceIds).list(); - List subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId())); - if (CollUtil.isNotEmpty(subTasks)) { - subTasks.forEach(e -> taskService.deleteTask(e.getId())); - } - runtimeService.bulkDeleteProcessInstances(processInstanceIds, LoginHelper.getUserId() + "删除了当前流程申请"); - // 2.删除历史记录 - List historicProcessInstanceList = QueryUtils.hisInstanceQuery(new HashSet<>(processInstanceIds)).list(); - if (ObjectUtil.isNotEmpty(historicProcessInstanceList)) { - historyService.bulkDeleteHistoricProcessInstances(processInstanceIds); - } - wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteFinishAndHisInstance(List businessKeys) { - try { - List actHiProcinsts = actHiProcinstService.selectByBusinessKeyIn(businessKeys); - if (CollUtil.isEmpty(actHiProcinsts)) { - log.warn("当前业务ID:{}查询到流程实例为空！", businessKeys); - return false; - } - List processInstanceIds = StreamUtils.toList(actHiProcinsts, ActHiProcinst::getId); - historyService.bulkDeleteHistoricProcessInstances(processInstanceIds); - wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 撤销流程申请 - * - * @param businessKey 业务id - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean cancelProcessApply(String businessKey) { - try { - ProcessInstance processInstance = QueryUtils.businessKeyQuery(businessKey) - .startedBy(String.valueOf(LoginHelper.getUserId())).singleResult(); - if (ObjectUtil.isNull(processInstance)) { - throw new ServiceException("您不是流程发起人,撤销失败!"); - } - if (processInstance.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - String processInstanceId = processInstance.getId(); - BusinessStatusEnum.checkCancelStatus(processInstance.getBusinessStatus()); - List taskList = QueryUtils.taskQuery(processInstanceId).list(); - for (Task task : taskList) { - taskService.setAssignee(task.getId(), null); - taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "：撤销申请"); - } - HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0); - List nodeIds = StreamUtils.toList(taskList, Task::getTaskDefinitionKey); - runtimeService.createChangeActivityStateBuilder() - .processInstanceId(processInstanceId) - .moveActivityIdsToSingleActivityId(nodeIds, historicTaskInstance.getTaskDefinitionKey()).changeState(); - Task task = QueryUtils.taskQuery(processInstanceId).list().get(0); - taskService.setAssignee(task.getId(), historicTaskInstance.getAssignee()); - //获取并行网关执行后保留的执行实例数据 - ExecutionChildByExecutionIdCmd childByExecutionIdCmd = new ExecutionChildByExecutionIdCmd(task.getExecutionId()); - List executionEntities = managementService.executeCommand(childByExecutionIdCmd); - //删除流程实例垃圾数据 - for (ExecutionEntity executionEntity : executionEntities) { - DeleteExecutionCmd deleteExecutionCmd = new DeleteExecutionCmd(executionEntity.getId()); - managementService.executeCommand(deleteExecutionCmd); - } - runtimeService.updateBusinessStatus(processInstanceId, BusinessStatusEnum.CANCEL.getStatus()); - //流程作废监听 - flowProcessEventHandler.processHandler(processInstance.getProcessDefinitionKey(), - processInstance.getBusinessKey(), BusinessStatusEnum.CANCEL.getStatus(), false); - return true; - } catch (Exception e) { - log.error("撤销失败:" + e.getMessage(), e); - throw new ServiceException("撤销失败:" + e.getMessage()); - } - } - - /** - * 分页查询当前登录人单据 - * - * @param bo 参数 - */ - @Override - public TableDataInfo getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) { - List list = new ArrayList<>(); - HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery(); - query.startedBy(String.valueOf(LoginHelper.getUserId())); - if (StringUtils.isNotBlank(bo.getName())) { - query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%"); - } - if (StringUtils.isNotBlank(bo.getKey())) { - query.processDefinitionKey(bo.getKey()); - } - if (StringUtils.isNotBlank(bo.getBusinessKey())) { - query.processInstanceBusinessKey(bo.getBusinessKey()); - } - if (StringUtils.isNotBlank(bo.getCategoryCode())) { - query.processDefinitionCategory(bo.getCategoryCode()); - } - query.orderByProcessInstanceStartTime().desc(); - List historicProcessInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - List taskVoList = new ArrayList<>(); - if (CollUtil.isNotEmpty(historicProcessInstanceList)) { - List processInstanceIds = StreamUtils.toList(historicProcessInstanceList, HistoricProcessInstance::getId); - List taskList = QueryUtils.taskQuery(processInstanceIds).list(); - for (Task task : taskList) { - taskVoList.add(BeanUtil.toBean(task, TaskVo.class)); - } - } - for (HistoricProcessInstance processInstance : historicProcessInstanceList) { - ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class); - processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstance.getBusinessStatus())); - if (CollUtil.isNotEmpty(taskVoList)) { - List collect = StreamUtils.filter(taskVoList, e -> e.getProcessInstanceId().equals(processInstance.getId())); - processInstanceVo.setTaskVoList(CollUtil.isNotEmpty(collect) ? collect : Collections.emptyList()); - } - list.add(processInstanceVo); - } - if (CollUtil.isNotEmpty(list)) { - List processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (ProcessInstanceVo processInstanceVo : list) { - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo); - } - } - } - long count = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(list); - build.setTotal(count); - return build; - } - - /** - * 任务催办(给当前任务办理人发送站内信，邮件，短信等) - * - * @param taskUrgingBo 任务催办 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean taskUrging(TaskUrgingBo taskUrgingBo) { - try { - ProcessInstance processInstance = QueryUtils.instanceQuery(taskUrgingBo.getProcessInstanceId()).singleResult(); - if (processInstance == null) { - throw new ServiceException("任务已结束！"); - } - String message = taskUrgingBo.getMessage(); - if (StringUtils.isBlank(message)) { - message = "您的【" + processInstance.getName() + "】单据还未审批，请您及时处理。"; - } - List list = QueryUtils.taskQuery(taskUrgingBo.getProcessInstanceId()).list(); - WorkflowUtils.sendMessage(list, processInstance.getName(), taskUrgingBo.getMessageType(), message, userService); - } catch (ServiceException e) { - throw new ServiceException(e.getMessage()); - } - return true; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java deleted file mode 100644 index d9a674a..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ /dev/null @@ -1,861 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.*; -import org.dromara.workflow.flowable.cmd.*; -import org.dromara.workflow.flowable.handler.FlowProcessEventHandler; -import org.dromara.workflow.mapper.ActHiTaskinstMapper; -import org.dromara.workflow.mapper.ActTaskMapper; -import org.dromara.workflow.service.IActTaskService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; -import org.dromara.workflow.utils.WorkflowUtils; -import org.flowable.common.engine.api.FlowableObjectNotFoundException; -import org.flowable.common.engine.impl.identity.Authentication; -import org.flowable.engine.*; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.history.HistoricProcessInstanceQuery; -import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; -import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; -import org.flowable.engine.impl.persistence.entity.ExecutionEntity; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.identitylink.api.history.HistoricIdentityLink; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; -import org.flowable.variable.api.persistence.entity.VariableInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -import static org.dromara.workflow.common.constant.FlowConstant.*; - -/** - * 任务 服务层实现 - * - * @author may - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class ActTaskServiceImpl implements IActTaskService { - - @Autowired(required = false) - private RuntimeService runtimeService; - @Autowired(required = false) - private TaskService taskService; - @Autowired(required = false) - private HistoryService historyService; - @Autowired(required = false) - private IdentityService identityService; - @Autowired(required = false) - private ManagementService managementService; - private final ActTaskMapper actTaskMapper; - private final IWfTaskBackNodeService wfTaskBackNodeService; - private final ActHiTaskinstMapper actHiTaskinstMapper; - private final IWfNodeConfigService wfNodeConfigService; - private final IWfDefinitionConfigService wfDefinitionConfigService; - private final FlowProcessEventHandler flowProcessEventHandler; - private final UserService userService; - private final OssService ossService; - - /** - * 启动任务 - * - * @param startProcessBo 启动流程参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Map startWorkFlow(StartProcessBo startProcessBo) { - Map map = new HashMap<>(); - if (StringUtils.isBlank(startProcessBo.getBusinessKey())) { - throw new ServiceException("启动工作流时必须包含业务ID"); - } - // 判断当前业务是否启动过流程 - HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery(); - HistoricProcessInstance historicProcessInstance = query.processInstanceBusinessKey(startProcessBo.getBusinessKey()).singleResult(); - if (ObjectUtil.isNotEmpty(historicProcessInstance)) { - BusinessStatusEnum.checkStartStatus(historicProcessInstance.getBusinessStatus()); - } - List taskResult = QueryUtils.taskQuery().processInstanceBusinessKey(startProcessBo.getBusinessKey()).list(); - if (CollUtil.isNotEmpty(taskResult)) { - if (CollUtil.isNotEmpty(startProcessBo.getVariables())) { - taskService.setVariables(taskResult.get(0).getId(), startProcessBo.getVariables()); - } - map.put(PROCESS_INSTANCE_ID, taskResult.get(0).getProcessInstanceId()); - map.put("taskId", taskResult.get(0).getId()); - return map; - } - WfDefinitionConfigVo wfDefinitionConfigVo = wfDefinitionConfigService.getByTableNameLastVersion(startProcessBo.getTableName()); - if (wfDefinitionConfigVo == null) { - throw new ServiceException("请到流程定义绑定业务表名与流程KEY！"); - } - // 设置启动人 - identityService.setAuthenticatedUserId(String.valueOf(LoginHelper.getUserId())); - Authentication.setAuthenticatedUserId(String.valueOf(LoginHelper.getUserId())); - // 启动流程实例（提交申请） - Map variables = startProcessBo.getVariables(); - // 启动跳过表达式 - variables.put(FLOWABLE_SKIP_EXPRESSION_ENABLED, true); - // 流程发起人 - variables.put(INITIATOR, (String.valueOf(LoginHelper.getUserId()))); - ProcessInstance pi; - try { - if (TenantHelper.isEnable()) { - pi = runtimeService.startProcessInstanceByKeyAndTenantId(wfDefinitionConfigVo.getProcessKey(), startProcessBo.getBusinessKey(), variables, TenantHelper.getTenantId()); - } else { - pi = runtimeService.startProcessInstanceByKey(wfDefinitionConfigVo.getProcessKey(), startProcessBo.getBusinessKey(), variables); - } - } catch (FlowableObjectNotFoundException e) { - throw new ServiceException("找不到当前【" + wfDefinitionConfigVo.getProcessKey() + "】流程定义！"); - } - // 将流程定义名称 作为 流程实例名称 - runtimeService.setProcessInstanceName(pi.getProcessInstanceId(), pi.getProcessDefinitionName()); - // 申请人执行流程 - List taskList = QueryUtils.taskQuery(pi.getId()).list(); - if (taskList.size() > 1) { - throw new ServiceException("请检查流程第一个环节是否为申请人！"); - } - - runtimeService.updateBusinessStatus(pi.getProcessInstanceId(), BusinessStatusEnum.DRAFT.getStatus()); - taskService.setAssignee(taskList.get(0).getId(), LoginHelper.getUserId().toString()); - taskService.setVariable(taskList.get(0).getId(), PROCESS_INSTANCE_ID, pi.getProcessInstanceId()); - taskService.setVariable(taskList.get(0).getId(), BUSINESS_KEY, pi.getBusinessKey()); - map.put("processInstanceId", pi.getProcessInstanceId()); - map.put("taskId", taskList.get(0).getId()); - return map; - } - - /** - * 办理任务 - * - * @param completeTaskBo 办理任务参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean completeTask(CompleteTaskBo completeTaskBo) { - try { - String userId = String.valueOf(LoginHelper.getUserId()); - Task task = WorkflowUtils.getTaskByCurrentUser(completeTaskBo.getTaskId()); - if (task == null) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - ProcessInstance processInstance = QueryUtils.instanceQuery(task.getProcessInstanceId()).singleResult(); - //办理委托任务 - if (ObjectUtil.isNotEmpty(task.getDelegationState()) && FlowConstant.PENDING.equals(task.getDelegationState().name())) { - taskService.resolveTask(completeTaskBo.getTaskId()); - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.PASS.getStatus(), StringUtils.isNotBlank(completeTaskBo.getMessage()) ? completeTaskBo.getMessage() : StrUtil.EMPTY); - taskService.complete(newTask.getId()); - return true; - } - //附件上传 - AttachmentCmd attachmentCmd = new AttachmentCmd(completeTaskBo.getFileId(), task.getId(), task.getProcessInstanceId(), ossService); - managementService.executeCommand(attachmentCmd); - String businessStatus = WorkflowUtils.getBusinessStatus(processInstance.getBusinessKey()); - //流程提交监听 - if (BusinessStatusEnum.DRAFT.getStatus().equals(businessStatus) || BusinessStatusEnum.BACK.getStatus().equals(businessStatus) || BusinessStatusEnum.CANCEL.getStatus().equals(businessStatus)) { - flowProcessEventHandler.processHandler(processInstance.getProcessDefinitionKey(), processInstance.getBusinessKey(), businessStatus, true); - } - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.WAITING.getStatus()); - //办理监听 - flowProcessEventHandler.processTaskHandler(processInstance.getProcessDefinitionKey(), task.getTaskDefinitionKey(), - task.getId(), processInstance.getBusinessKey()); - //办理意见 - taskService.addComment(completeTaskBo.getTaskId(), task.getProcessInstanceId(), TaskStatusEnum.PASS.getStatus(), StringUtils.isBlank(completeTaskBo.getMessage()) ? "同意" : completeTaskBo.getMessage()); - //办理任务 - taskService.setAssignee(task.getId(), userId); - if (CollUtil.isNotEmpty(completeTaskBo.getVariables())) { - taskService.complete(completeTaskBo.getTaskId(), completeTaskBo.getVariables()); - } else { - taskService.complete(completeTaskBo.getTaskId()); - } - //记录执行过的流程任务节点 - wfTaskBackNodeService.recordExecuteNode(task); - ProcessInstance pi = QueryUtils.instanceQuery(task.getProcessInstanceId()).singleResult(); - if (pi == null) { - UpdateBusinessStatusCmd updateBusinessStatusCmd = new UpdateBusinessStatusCmd(task.getProcessInstanceId(), BusinessStatusEnum.FINISH.getStatus()); - managementService.executeCommand(updateBusinessStatusCmd); - flowProcessEventHandler.processHandler(processInstance.getProcessDefinitionKey(), processInstance.getBusinessKey(), - BusinessStatusEnum.FINISH.getStatus(), false); - } else { - List list = QueryUtils.taskQuery(task.getProcessInstanceId()).list(); - for (Task t : list) { - if (ModelUtils.isUserTask(t.getProcessDefinitionId(), t.getTaskDefinitionKey())) { - List links = historyService.getHistoricIdentityLinksForTask(t.getId()); - if (CollUtil.isEmpty(links) && StringUtils.isBlank(t.getAssignee())) { - throw new ServiceException("下一节点【" + t.getName() + "】没有办理人!"); - } - } - } - - if (CollUtil.isNotEmpty(list) && CollUtil.isNotEmpty(completeTaskBo.getWfCopyList())) { - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.COPY.getStatus(), LoginHelper.getLoginUser().getNickname() + "【抄送】给" + String.join(",", StreamUtils.toList(completeTaskBo.getWfCopyList(), WfCopy::getUserName))); - taskService.complete(newTask.getId()); - List taskList = QueryUtils.taskQuery(task.getProcessInstanceId()).list(); - WorkflowUtils.createCopyTask(taskList, StreamUtils.toList(completeTaskBo.getWfCopyList(), WfCopy::getUserId)); - } - sendMessage(list, processInstance.getName(), completeTaskBo.getMessageType(), null); - } - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 发送消息 - * - * @param list 任务 - * @param name 流程名称 - * @param messageType 消息类型 - * @param message 消息内容，为空则发送默认配置的消息内容 - */ - @Async - public void sendMessage(List list, String name, List messageType, String message) { - WorkflowUtils.sendMessage(list, name, messageType, message, userService); - } - - /** - * 查询当前用户的待办任务 - * - * @param taskBo 参数 - */ - @Override - public TableDataInfo getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - List roles = LoginHelper.getLoginUser().getRoles(); - List roleIds = StreamUtils.toList(roles, e -> String.valueOf(e.getRoleId())); - String userId = String.valueOf(LoginHelper.getUserId()); - queryWrapper.eq("t.business_status_", BusinessStatusEnum.WAITING.getStatus()); - queryWrapper.eq(TenantHelper.isEnable(), "t.tenant_id_", TenantHelper.getTenantId()); - String ids = StreamUtils.join(roleIds, x -> "'" + x + "'"); - queryWrapper.and(w1 -> w1.eq("t.assignee_", userId).or(w2 -> w2.isNull("t.assignee_").apply("exists ( select LINK.ID_ from ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = t.ID_ and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = {0} or ( LINK.GROUP_ID_ IN (" + ids + ") ) ))", userId))); - if (StringUtils.isNotBlank(taskBo.getName())) { - queryWrapper.like("t.name_", taskBo.getName()); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionName())) { - queryWrapper.like("t.processDefinitionName", taskBo.getProcessDefinitionName()); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) { - queryWrapper.eq("t.processDefinitionKey", taskBo.getProcessDefinitionKey()); - } - queryWrapper.orderByDesc("t.CREATE_TIME_"); - Page page = actTaskMapper.getTaskWaitByPage(pageQuery.build(), queryWrapper); - - List taskList = page.getRecords(); - if (CollUtil.isNotEmpty(taskList)) { - List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (TaskVo task : taskList) { - task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); - task.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId(), userService)); - task.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null); - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey()) && FlowConstant.FALSE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - } - } - } - return TableDataInfo.build(page); - } - - /** - * 查询当前租户所有待办任务 - * - * @param taskBo 参数 - */ - @Override - public TableDataInfo getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) { - TaskQuery query = QueryUtils.taskQuery(); - if (StringUtils.isNotBlank(taskBo.getName())) { - query.taskNameLike("%" + taskBo.getName() + "%"); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionName())) { - query.processDefinitionNameLike("%" + taskBo.getProcessDefinitionName() + "%"); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) { - query.processDefinitionKey(taskBo.getProcessDefinitionKey()); - } - query.orderByTaskCreateTime().desc(); - List taskList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); - List processInstanceList = null; - if (CollUtil.isNotEmpty(taskList)) { - Set processInstanceIds = StreamUtils.toSet(taskList, Task::getProcessInstanceId); - processInstanceList = QueryUtils.instanceQuery(processInstanceIds).list(); - } - List list = new ArrayList<>(); - if (CollUtil.isNotEmpty(taskList)) { - List processDefinitionIds = StreamUtils.toList(taskList, Task::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (Task task : taskList) { - TaskVo taskVo = BeanUtil.toBean(task, TaskVo.class); - if (CollUtil.isNotEmpty(processInstanceList)) { - processInstanceList.stream().filter(e -> e.getId().equals(task.getProcessInstanceId())).findFirst().ifPresent(e -> { - taskVo.setBusinessStatus(e.getBusinessStatus()); - taskVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(taskVo.getBusinessStatus())); - taskVo.setProcessDefinitionKey(e.getProcessDefinitionKey()); - taskVo.setProcessDefinitionName(e.getProcessDefinitionName()); - taskVo.setProcessDefinitionVersion(e.getProcessDefinitionVersion()); - taskVo.setBusinessKey(e.getBusinessKey()); - }); - } - taskVo.setAssignee(StringUtils.isNotBlank(task.getAssignee()) ? Long.valueOf(task.getAssignee()) : null); - taskVo.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId(), userService)); - taskVo.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null); - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(taskVo::setWfNodeConfigVo); - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey()) && FlowConstant.FALSE.equals(e.getApplyUserTask())).findFirst().ifPresent(taskVo::setWfNodeConfigVo); - } - list.add(taskVo); - } - } - long count = query.count(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(list); - build.setTotal(count); - return build; - } - - /** - * 查询当前用户的已办任务 - * - * @param taskBo 参数 - */ - @Override - public TableDataInfo getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) { - String userId = String.valueOf(LoginHelper.getUserId()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StringUtils.isNotBlank(taskBo.getName()), "t.name_", taskBo.getName()); - queryWrapper.like(StringUtils.isNotBlank(taskBo.getProcessDefinitionName()), "t.processDefinitionName", taskBo.getProcessDefinitionName()); - queryWrapper.eq(StringUtils.isNotBlank(taskBo.getProcessDefinitionKey()), "t.processDefinitionKey", taskBo.getProcessDefinitionKey()); - queryWrapper.eq("t.assignee_", userId); - queryWrapper.orderByDesc("t.START_TIME_"); - Page page = actTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); - - List taskList = page.getRecords(); - if (CollUtil.isNotEmpty(taskList)) { - List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (TaskVo task : taskList) { - task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey()) && FlowConstant.FALSE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - } - } - } - return TableDataInfo.build(page); - } - - /** - * 查询当前用户的抄送 - * - * @param taskBo 参数 - */ - @Override - public TableDataInfo getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - String userId = String.valueOf(LoginHelper.getUserId()); - if (StringUtils.isNotBlank(taskBo.getName())) { - queryWrapper.like("t.name_", taskBo.getName()); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionName())) { - queryWrapper.like("t.processDefinitionName", taskBo.getProcessDefinitionName()); - } - if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) { - queryWrapper.eq("t.processDefinitionKey", taskBo.getProcessDefinitionKey()); - } - queryWrapper.eq("t.assignee_", userId); - queryWrapper.orderByDesc("t.START_TIME_"); - Page page = actTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper); - - List taskList = page.getRecords(); - if (CollUtil.isNotEmpty(taskList)) { - List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (TaskVo task : taskList) { - task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey()) && FlowConstant.FALSE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - } - } - } - return TableDataInfo.build(page); - } - - /** - * 查询当前租户所有已办任务 - * - * @param taskBo 参数 - */ - @Override - public TableDataInfo getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StringUtils.isNotBlank(taskBo.getName()), "t.name_", taskBo.getName()); - queryWrapper.like(StringUtils.isNotBlank(taskBo.getProcessDefinitionName()), "t.processDefinitionName", taskBo.getProcessDefinitionName()); - queryWrapper.eq(StringUtils.isNotBlank(taskBo.getProcessDefinitionKey()), "t.processDefinitionKey", taskBo.getProcessDefinitionKey()); - Page page = actTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); - - List taskList = page.getRecords(); - if (CollUtil.isNotEmpty(taskList)) { - List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); - List wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds); - for (TaskVo task : taskList) { - task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus())); - if (CollUtil.isNotEmpty(wfNodeConfigVoList)) { - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey()) && FlowConstant.FALSE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo); - } - } - } - return TableDataInfo.build(page); - } - - /** - * 委派任务 - * - * @param delegateBo 参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean delegateTask(DelegateBo delegateBo) { - Task task = WorkflowUtils.getTaskByCurrentUser(delegateBo.getTaskId()); - - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - try { - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.PENDING.getStatus(), "【" + LoginHelper.getLoginUser().getNickname() + "】委派给【" + delegateBo.getNickName() + "】"); - //委托任务 - taskService.delegateTask(delegateBo.getTaskId(), delegateBo.getUserId()); - //办理生成的任务记录 - taskService.complete(newTask.getId()); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 终止任务 - * - * @param terminationBo 参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean terminationTask(TerminationBo terminationBo) { - TaskQuery query = QueryUtils.taskQuery(); - Task task = query.taskId(terminationBo.getTaskId()).singleResult(); - - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult(); - BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus()); - try { - if (StringUtils.isBlank(terminationBo.getComment())) { - terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "终止了申请"); - } else { - terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "终止了申请：" + terminationBo.getComment()); - } - taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.TERMINATION.getStatus(), terminationBo.getComment()); - List list = QueryUtils.taskQuery(task.getProcessInstanceId()).list(); - if (CollUtil.isNotEmpty(list)) { - List subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId())); - if (CollUtil.isNotEmpty(subTasks)) { - subTasks.forEach(e -> taskService.deleteTask(e.getId())); - } - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus()); - runtimeService.deleteProcessInstance(task.getProcessInstanceId(), StrUtil.EMPTY); - } - //流程终止监听 - flowProcessEventHandler.processHandler(historicProcessInstance.getProcessDefinitionKey(), - historicProcessInstance.getBusinessKey(), BusinessStatusEnum.TERMINATION.getStatus(), false); - return true; - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - } - - /** - * 转办任务 - * - * @param transmitBo 参数 - */ - @Override - public boolean transferTask(TransmitBo transmitBo) { - Task task = WorkflowUtils.getTaskByCurrentUser(transmitBo.getTaskId()); - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - try { - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.TRANSFER.getStatus(), StringUtils.isNotBlank(transmitBo.getComment()) ? transmitBo.getComment() : LoginHelper.getUsername() + "转办了任务"); - taskService.complete(newTask.getId()); - taskService.setAssignee(task.getId(), transmitBo.getUserId()); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 会签任务加签 - * - * @param addMultiBo 参数 - */ - @Override - public boolean addMultiInstanceExecution(AddMultiBo addMultiBo) { - TaskQuery taskQuery = QueryUtils.taskQuery(); - taskQuery.taskId(addMultiBo.getTaskId()); - if (!LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin()) { - taskQuery.taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())); - } - Task task = taskQuery.singleResult(); - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - String taskDefinitionKey = task.getTaskDefinitionKey(); - String processInstanceId = task.getProcessInstanceId(); - String processDefinitionId = task.getProcessDefinitionId(); - - try { - MultiInstanceVo multiInstanceVo = WorkflowUtils.isMultiInstance(processDefinitionId, taskDefinitionKey); - if (multiInstanceVo == null) { - throw new ServiceException("当前环节不是会签节点"); - } - if (multiInstanceVo.getType() instanceof ParallelMultiInstanceBehavior) { - for (Long assignee : addMultiBo.getAssignees()) { - runtimeService.addMultiInstanceExecution(taskDefinitionKey, processInstanceId, Collections.singletonMap(multiInstanceVo.getAssignee(), assignee)); - } - } else if (multiInstanceVo.getType() instanceof SequentialMultiInstanceBehavior) { - AddSequenceMultiInstanceCmd addSequenceMultiInstanceCmd = new AddSequenceMultiInstanceCmd(task.getExecutionId(), multiInstanceVo.getAssigneeList(), addMultiBo.getAssignees()); - managementService.executeCommand(addSequenceMultiInstanceCmd); - } - List assigneeNames = addMultiBo.getAssigneeNames(); - String username = LoginHelper.getUsername(); - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), processInstanceId, TaskStatusEnum.SIGN.getStatus(), username + "加签【" + String.join(StringUtils.SEPARATOR, assigneeNames) + "】"); - taskService.complete(newTask.getId()); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 会签任务减签 - * - * @param deleteMultiBo 参数 - */ - @Override - public boolean deleteMultiInstanceExecution(DeleteMultiBo deleteMultiBo) { - TaskQuery taskQuery = QueryUtils.taskQuery(); - taskQuery.taskId(deleteMultiBo.getTaskId()); - if (!LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin()) { - taskQuery.taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())); - } - Task task = taskQuery.singleResult(); - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - String taskDefinitionKey = task.getTaskDefinitionKey(); - String processInstanceId = task.getProcessInstanceId(); - String processDefinitionId = task.getProcessDefinitionId(); - try { - MultiInstanceVo multiInstanceVo = WorkflowUtils.isMultiInstance(processDefinitionId, taskDefinitionKey); - if (multiInstanceVo == null) { - throw new ServiceException("当前环节不是会签节点"); - } - if (multiInstanceVo.getType() instanceof ParallelMultiInstanceBehavior) { - for (String executionId : deleteMultiBo.getExecutionIds()) { - runtimeService.deleteMultiInstanceExecution(executionId, false); - } - for (String taskId : deleteMultiBo.getTaskIds()) { - historyService.deleteHistoricTaskInstance(taskId); - } - } else if (multiInstanceVo.getType() instanceof SequentialMultiInstanceBehavior) { - DeleteSequenceMultiInstanceCmd deleteSequenceMultiInstanceCmd = new DeleteSequenceMultiInstanceCmd(task.getAssignee(), task.getExecutionId(), multiInstanceVo.getAssigneeList(), deleteMultiBo.getAssigneeIds()); - managementService.executeCommand(deleteSequenceMultiInstanceCmd); - } - List assigneeNames = deleteMultiBo.getAssigneeNames(); - String username = LoginHelper.getUsername(); - TaskEntity newTask = WorkflowUtils.createNewTask(task); - taskService.addComment(newTask.getId(), processInstanceId, TaskStatusEnum.SIGN_OFF.getStatus(), username + "减签【" + String.join(StringUtils.SEPARATOR, assigneeNames) + "】"); - taskService.complete(newTask.getId()); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - } - - /** - * 驳回审批 - * - * @param backProcessBo 参数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public String backProcess(BackProcessBo backProcessBo) { - String userId = String.valueOf(LoginHelper.getUserId()); - Task task = WorkflowUtils.getTaskByCurrentUser(backProcessBo.getTaskId()); - - if (ObjectUtil.isEmpty(task)) { - throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL); - } - if (task.isSuspended()) { - throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); - } - try { - String processInstanceId = task.getProcessInstanceId(); - ProcessInstance processInstance = QueryUtils.instanceQuery(task.getProcessInstanceId()).singleResult(); - //获取并行网关执行后保留的执行实例数据 - ExecutionChildByExecutionIdCmd childByExecutionIdCmd = new ExecutionChildByExecutionIdCmd(task.getExecutionId()); - List executionEntities = managementService.executeCommand(childByExecutionIdCmd); - //校验单据 - BusinessStatusEnum.checkBackStatus(processInstance.getBusinessStatus()); - //判断是否有多个任务 - List taskList = QueryUtils.taskQuery(processInstanceId).list(); - String backTaskDefinitionKey = backProcessBo.getTargetActivityId(); - taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.BACK.getStatus(), StringUtils.isNotBlank(backProcessBo.getMessage()) ? backProcessBo.getMessage() : "退回"); - if (taskList.size() > 1) { - //当前多个任务驳回到单个节点 - runtimeService.createChangeActivityStateBuilder().processInstanceId(processInstanceId).moveActivityIdsToSingleActivityId(taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList()), backTaskDefinitionKey).changeState(); - ActHiTaskinst actHiTaskinst = new ActHiTaskinst(); - actHiTaskinst.setAssignee(userId); - actHiTaskinst.setId(task.getId()); - actHiTaskinstMapper.updateById(actHiTaskinst); - } else { - //当前单个节点驳回单个节点 - runtimeService.createChangeActivityStateBuilder().processInstanceId(processInstanceId).moveActivityIdTo(task.getTaskDefinitionKey(), backTaskDefinitionKey).changeState(); - } - //删除并行环节未办理记录 - MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()); - if (multiInstance == null && taskList.size() > 1) { - List tasks = StreamUtils.filter(taskList, e -> !e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey())); - if (CollUtil.isNotEmpty(tasks)) { - actHiTaskinstMapper.deleteByIds(StreamUtils.toList(tasks, Task::getId)); - } - } - - - List instanceList = QueryUtils.hisTaskInstanceQuery(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().desc().list(); - List list = QueryUtils.taskQuery(processInstanceId).list(); - for (Task t : list) { - instanceList.stream().filter(e -> e.getTaskDefinitionKey().equals(t.getTaskDefinitionKey())).findFirst().ifPresent(e -> { - taskService.setAssignee(t.getId(), e.getAssignee()); - }); - } - //发送消息 - String message = "您的【" + processInstance.getName() + "】单据已经被驳回，请您注意查收。"; - sendMessage(list, processInstance.getName(), backProcessBo.getMessageType(), message); - //删除流程实例垃圾数据 - for (ExecutionEntity executionEntity : executionEntities) { - DeleteExecutionCmd deleteExecutionCmd = new DeleteExecutionCmd(executionEntity.getId()); - managementService.executeCommand(deleteExecutionCmd); - } - - WfTaskBackNode wfTaskBackNode = wfTaskBackNodeService.getListByInstanceIdAndNodeId(task.getProcessInstanceId(), backProcessBo.getTargetActivityId()); - if (ObjectUtil.isNotNull(wfTaskBackNode) && wfTaskBackNode.getOrderNo() == 0) { - runtimeService.updateBusinessStatus(processInstanceId, BusinessStatusEnum.BACK.getStatus()); - flowProcessEventHandler.processHandler(processInstance.getProcessDefinitionKey(), - processInstance.getBusinessKey(), BusinessStatusEnum.BACK.getStatus(), false); - } - //删除驳回后的流程节点 - wfTaskBackNodeService.deleteBackTaskNode(processInstanceId, backProcessBo.getTargetActivityId()); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(e.getMessage()); - } - return task.getProcessInstanceId(); - } - - /** - * 修改任务办理人 - * - * @param taskIds 任务id - * @param userId 办理人id - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean updateAssignee(String[] taskIds, String userId) { - try { - List list = QueryUtils.taskQuery().taskIds(Arrays.asList(taskIds)).list(); - for (Task task : list) { - taskService.setAssignee(task.getId(), userId); - } - } catch (Exception e) { - log.error("修改失败：" + e.getMessage(), e); - throw new ServiceException("修改失败：" + e.getMessage()); - } - return true; - } - - /** - * 查询流程变量 - * - * @param taskId 任务id - */ - @Override - public List getInstanceVariable(String taskId) { - List variableVoList = new ArrayList<>(); - Map variableInstances = taskService.getVariableInstances(taskId); - if (CollUtil.isNotEmpty(variableInstances)) { - for (Map.Entry entry : variableInstances.entrySet()) { - VariableVo variableVo = new VariableVo(); - variableVo.setKey(entry.getKey()); - variableVo.setValue(entry.getValue().getValue().toString()); - variableVoList.add(variableVo); - } - } - return variableVoList; - } - - /** - * 查询工作流任务用户选择加签人员 - * - * @param taskId 任务id - * @return - */ - @Override - @SuppressWarnings("unchecked") - public String getTaskUserIdsByAddMultiInstance(String taskId) { - Task task = QueryUtils.taskQuery().taskId(taskId).singleResult(); - if (task == null) { - throw new ServiceException("任务不存在"); - } - MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()); - if (multiInstance == null) { - return ""; - } - List userIds; - if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) { - userIds = (List) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList()); - } else { - List list = QueryUtils.taskQuery(task.getProcessInstanceId()).list(); - userIds = StreamUtils.toList(list, e -> Long.valueOf(e.getAssignee())); - } - return StringUtils.join(userIds, StringUtils.SEPARATOR); - } - - /** - * 查询工作流选择减签人员 - * - * @param taskId 任务id 任务id - */ - @Override - @SuppressWarnings("unchecked") - public List getListByDeleteMultiInstance(String taskId) { - Task task = QueryUtils.taskQuery().taskId(taskId).singleResult(); - List taskList = QueryUtils.taskQuery(task.getProcessInstanceId()).list(); - MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()); - List taskListVo = new ArrayList<>(); - if (multiInstance == null) { - return List.of(); - } - List assigneeList = new ArrayList<>(); - if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) { - List variable = (List) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList()); - for (Object o : variable) { - assigneeList.add(Long.valueOf(o.toString())); - } - } - - if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) { - List userIds = StreamUtils.filter(assigneeList, e -> !String.valueOf(e).equals(task.getAssignee())); - List userList = userService.selectListByIds(userIds); - for (Long userId : userIds) { - TaskVo taskVo = new TaskVo(); - taskVo.setId("串行会签"); - taskVo.setExecutionId("串行会签"); - taskVo.setProcessInstanceId(task.getProcessInstanceId()); - taskVo.setName(task.getName()); - taskVo.setAssignee(userId); - if (CollUtil.isNotEmpty(userList)) { - userList.stream().filter(u -> u.getUserId().toString().equals(userId.toString())).findFirst().ifPresent(u -> taskVo.setAssigneeName(u.getNickName())); - } - taskListVo.add(taskVo); - } - return taskListVo; - } else if (multiInstance.getType() instanceof ParallelMultiInstanceBehavior) { - List tasks = StreamUtils.filter(taskList, e -> StringUtils.isBlank(e.getParentTaskId()) && !e.getExecutionId().equals(task.getExecutionId()) && e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey())); - if (CollUtil.isNotEmpty(tasks)) { - List userIds = StreamUtils.toList(tasks, e -> Long.valueOf(e.getAssignee())); - List userList = userService.selectListByIds(userIds); - for (Task t : tasks) { - TaskVo taskVo = new TaskVo(); - taskVo.setId(t.getId()); - taskVo.setExecutionId(t.getExecutionId()); - taskVo.setProcessInstanceId(t.getProcessInstanceId()); - taskVo.setName(t.getName()); - taskVo.setAssignee(Long.valueOf(t.getAssignee())); - if (CollUtil.isNotEmpty(userList)) { - userList.stream().filter(u -> u.getUserId().toString().equals(t.getAssignee())).findFirst().ifPresent(e -> taskVo.setAssigneeName(e.getNickName())); - } - taskListVo.add(taskVo); - } - return taskListVo; - } - } - return List.of(); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java deleted file mode 100644 index f81c85f..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.dromara.workflow.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.TestLeave; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.mapper.TestLeaveMapper; -import org.dromara.workflow.service.ITestLeaveService; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.List; - -/** - * 请假Service业务层处理 - * - * @author may - * @date 2023-07-21 - */ -@RequiredArgsConstructor -@Service -@Slf4j -public class TestLeaveServiceImpl implements ITestLeaveService { - - private final TestLeaveMapper baseMapper; - private final WorkflowService workflowService; - - /** - * 查询请假 - */ - @Override - public TestLeaveVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - /** - * 查询请假列表 - */ - @Override - public TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询请假列表 - */ - @Override - public List queryList(TestLeaveBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(TestLeaveBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), TestLeave::getLeaveType, bo.getLeaveType()); - lqw.ge(bo.getStartLeaveDays() != null, TestLeave::getLeaveDays, bo.getStartLeaveDays()); - lqw.le(bo.getEndLeaveDays() != null, TestLeave::getLeaveDays, bo.getEndLeaveDays()); - lqw.orderByDesc(BaseEntity::getCreateTime); - return lqw; - } - - /** - * 新增请假 - */ - @Override - public TestLeaveVo insertByBo(TestLeaveBo bo) { - TestLeave add = MapstructUtils.convert(bo, TestLeave.class); - if (StringUtils.isBlank(add.getStatus())) { - add.setStatus(BusinessStatusEnum.DRAFT.getStatus()); - } - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return MapstructUtils.convert(add, TestLeaveVo.class); - } - - /** - * 修改请假 - */ - @Override - public TestLeaveVo updateByBo(TestLeaveBo bo) { - TestLeave update = MapstructUtils.convert(bo, TestLeave.class); - baseMapper.updateById(update); - return MapstructUtils.convert(update, TestLeaveVo.class); - } - - /** - * 批量删除请假 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean deleteWithValidByIds(Collection ids) { - List idList = StreamUtils.toList(ids, String::valueOf); - workflowService.deleteRunAndHisInstance(idList); - return baseMapper.deleteByIds(ids) > 0; - } - - /** - * 总体流程监听(例如: 提交 退回 撤销 终止 作废等) - * 正常使用只需#processEvent.key=='leave1' - * 示例为了方便则使用startsWith匹配了全部示例key - * - * @param processEvent 参数 - */ - @EventListener(condition = "#processEvent.key.startsWith('leave')") - public void processHandler(ProcessEvent processEvent) { - log.info("当前任务执行了{}", processEvent.toString()); - TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey())); - testLeave.setStatus(processEvent.getStatus()); - if (processEvent.isSubmit()) { - testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus()); - } - baseMapper.updateById(testLeave); - } - - /** - * 执行办理任务监听 - * 示例：也可通过 @EventListener(condition = "#processTaskEvent.key=='leave1'")进行判断 - * 在方法中判断流程节点key - * if ("xxx".equals(processTaskEvent.getTaskDefinitionKey())) { - * //执行业务逻辑 - * } - * - * @param processTaskEvent 参数 - */ - @EventListener(condition = "#processTaskEvent.key.startsWith('leave')") - public void processTaskHandler(ProcessTaskEvent processTaskEvent) { - // 所有demo案例的申请人节点id - String[] ids = {"Activity_14633hx", "Activity_19b1i4j", "Activity_0uscrk3", - "Activity_0uscrk3", "Activity_0x6b71j", "Activity_0zy3g6j", "Activity_06a55t0"}; - if (StringUtils.equalsAny(processTaskEvent.getTaskDefinitionKey(), ids)) { - log.info("当前任务执行了{}", processTaskEvent.toString()); - TestLeave testLeave = baseMapper.selectById(Long.valueOf(processTaskEvent.getBusinessKey())); - testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus()); - baseMapper.updateById(testLeave); - } - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java deleted file mode 100644 index e562823..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.dromara.workflow.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; -import org.dromara.workflow.mapper.WfCategoryMapper; -import org.dromara.workflow.service.IWfCategoryService; -import org.dromara.workflow.utils.QueryUtils; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.repository.Deployment; -import org.flowable.engine.repository.Model; -import org.flowable.engine.repository.ProcessDefinition; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.List; - -/** - * 流程分类Service业务层处理 - * - * @author may - * @date 2023-06-28 - */ -@RequiredArgsConstructor -@Service -public class WfCategoryServiceImpl implements IWfCategoryService { - - private final WfCategoryMapper baseMapper; - @Autowired(required = false) - private RepositoryService repositoryService; - - /** - * 查询流程分类 - */ - @Override - public WfCategoryVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - - /** - * 查询流程分类列表 - */ - @Override - public List queryList(WfCategoryBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(WfCategoryBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), WfCategory::getCategoryName, bo.getCategoryName()); - lqw.eq(StringUtils.isNotBlank(bo.getCategoryCode()), WfCategory::getCategoryCode, bo.getCategoryCode()); - return lqw; - } - - /** - * 新增流程分类 - */ - @Override - public Boolean insertByBo(WfCategoryBo bo) { - WfCategory add = MapstructUtils.convert(bo, WfCategory.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改流程分类 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(WfCategoryBo bo) { - WfCategory update = MapstructUtils.convert(bo, WfCategory.class); - validEntityBeforeSave(update); - WfCategoryVo wfCategoryVo = baseMapper.selectVoById(bo.getId()); - List processDefinitionList = QueryUtils.definitionQuery().processDefinitionCategory(wfCategoryVo.getCategoryCode()).list(); - for (ProcessDefinition processDefinition : processDefinitionList) { - repositoryService.setProcessDefinitionCategory(processDefinition.getId(), bo.getCategoryCode()); - } - List deploymentList = QueryUtils.deploymentQuery().deploymentCategory(wfCategoryVo.getCategoryCode()).list(); - for (Deployment deployment : deploymentList) { - repositoryService.setDeploymentCategory(deployment.getId(), bo.getCategoryCode()); - } - List modelList = QueryUtils.modelQuery().modelCategory(wfCategoryVo.getCategoryCode()).list(); - for (Model model : modelList) { - model.setCategory(bo.getCategoryCode()); - repositoryService.saveModel(model); - } - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(WfCategory entity) { - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 批量删除流程分类 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } - - /** - * 按照类别编码查询 - * - * @param categoryCode 分类比吗 - */ - @Override - public WfCategory queryByCategoryCode(String categoryCode) { - return baseMapper.selectOne(new LambdaQueryWrapper().eq(WfCategory::getCategoryCode, categoryCode)); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java deleted file mode 100644 index b2ffb9e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.utils.MapstructUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.springframework.stereotype.Service; -import org.dromara.workflow.mapper.WfDefinitionConfigMapper; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Collection; - -/** - * 流程定义配置Service业务层处理 - * - * @author may - * @date 2024-03-18 - */ -@RequiredArgsConstructor -@Service -public class WfDefinitionConfigServiceImpl implements IWfDefinitionConfigService { - - private final WfDefinitionConfigMapper baseMapper; - - /** - * 查询流程定义配置 - */ - @Override - public WfDefinitionConfigVo getByDefId(String definitionId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(WfDefinitionConfig::getDefinitionId, definitionId)); - } - - /** - * 查询流程定义配置 - * - * @param tableName 表名 - * @return 结果 - */ - @Override - public WfDefinitionConfigVo getByTableNameLastVersion(String tableName) { - List wfDefinitionConfigVos = baseMapper.selectVoList( - new LambdaQueryWrapper().eq(WfDefinitionConfig::getTableName, tableName).orderByDesc(WfDefinitionConfig::getVersion)); - if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) { - return wfDefinitionConfigVos.get(0); - } - return null; - } - - /** - * 查询流程定义配置 - * - * @param definitionId 流程定义id - * @param tableName 表名 - * @return 结果 - */ - @Override - public WfDefinitionConfigVo getByDefIdAndTableName(String definitionId, String tableName) { - return baseMapper.selectVoOne(new LambdaQueryWrapper() - .eq(WfDefinitionConfig::getDefinitionId, definitionId) - .eq(WfDefinitionConfig::getTableName, tableName)); - } - - /** - * 查询流程定义配置排除当前查询的流程定义 - * - * @param tableName 表名 - * @param definitionId 流程定义id - */ - @Override - public List getByTableNameNotDefId(String tableName, String definitionId) { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .eq(WfDefinitionConfig::getTableName, tableName) - .ne(WfDefinitionConfig::getDefinitionId, definitionId)); - } - - /** - * 查询流程定义配置列表 - */ - @Override - public List queryList(List definitionIds) { - return baseMapper.selectVoList(new LambdaQueryWrapper().in(WfDefinitionConfig::getDefinitionId, definitionIds)); - } - - /** - * 新增流程定义配置 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveOrUpdate(WfDefinitionConfigBo bo) { - WfDefinitionConfig add = MapstructUtils.convert(bo, WfDefinitionConfig.class); - baseMapper.delete(new LambdaQueryWrapper().eq(WfDefinitionConfig::getTableName, bo.getTableName())); - add.setTableName(add.getTableName().toLowerCase()); - boolean flag = baseMapper.insertOrUpdate(add); - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 批量删除流程定义配置 - */ - @Override - public Boolean deleteByIds(Collection ids) { - return baseMapper.deleteByIds(ids) > 0; - } - - @Override - public Boolean deleteByDefIds(Collection ids) { - return baseMapper.delete(new LambdaQueryWrapper().in(WfDefinitionConfig::getDefinitionId, ids)) > 0; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java deleted file mode 100644 index 55e4911..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.dromara.workflow.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.dromara.workflow.common.enums.FormTypeEnum; -import org.springframework.stereotype.Service; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.workflow.mapper.WfFormManageMapper; -import org.dromara.workflow.service.IWfFormManageService; - -import java.util.List; -import java.util.Collection; - -/** - * 表单管理Service业务层处理 - * - * @author may - * @date 2024-03-29 - */ -@RequiredArgsConstructor -@Service -public class WfFormManageServiceImpl implements IWfFormManageService { - - private final WfFormManageMapper baseMapper; - - /** - * 查询表单管理 - */ - @Override - public WfFormManageVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - @Override - public List queryByIds(List ids) { - return baseMapper.selectVoByIds(ids); - } - - /** - * 查询表单管理列表 - */ - @Override - public TableDataInfo queryPageList(WfFormManageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - @Override - public List selectList() { - List wfFormManageVos = baseMapper.selectVoList(new LambdaQueryWrapper().orderByDesc(WfFormManage::getUpdateTime)); - for (WfFormManageVo wfFormManageVo : wfFormManageVos) { - wfFormManageVo.setFormTypeName(FormTypeEnum.findByType(wfFormManageVo.getFormType())); - } - return wfFormManageVos; - } - - /** - * 查询表单管理列表 - */ - @Override - public List queryList(WfFormManageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(WfFormManageBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getFormName()), WfFormManage::getFormName, bo.getFormName()); - lqw.eq(StringUtils.isNotBlank(bo.getFormType()), WfFormManage::getFormType, bo.getFormType()); - return lqw; - } - - /** - * 新增表单管理 - */ - @Override - public Boolean insertByBo(WfFormManageBo bo) { - WfFormManage add = MapstructUtils.convert(bo, WfFormManage.class); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改表单管理 - */ - @Override - public Boolean updateByBo(WfFormManageBo bo) { - WfFormManage update = MapstructUtils.convert(bo, WfFormManage.class); - return baseMapper.updateById(update) > 0; - } - - /** - * 批量删除表单管理 - */ - @Override - public Boolean deleteByIds(Collection ids) { - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java deleted file mode 100644 index 2f71482..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.service.IWfFormManageService; -import org.springframework.stereotype.Service; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.mapper.WfNodeConfigMapper; -import org.dromara.workflow.service.IWfNodeConfigService; - -import java.util.Collection; -import java.util.List; - -/** - * 节点配置Service业务层处理 - * - * @author may - * @date 2024-03-30 - */ -@RequiredArgsConstructor -@Service -public class WfNodeConfigServiceImpl implements IWfNodeConfigService { - - private final WfNodeConfigMapper baseMapper; - private final IWfFormManageService wfFormManageService; - - /** - * 查询节点配置 - */ - @Override - public WfNodeConfigVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - /** - * 保存节点配置 - */ - @Override - public Boolean saveOrUpdate(List list) { - return baseMapper.insertOrUpdateBatch(list); - } - - /** - * 批量删除节点配置 - */ - @Override - public Boolean deleteByIds(Collection ids) { - return baseMapper.deleteByIds(ids) > 0; - } - - - - @Override - public Boolean deleteByDefIds(Collection ids) { - return baseMapper.delete(new LambdaQueryWrapper().in(WfNodeConfig::getDefinitionId, ids)) > 0; - } - - @Override - public List selectByDefIds(Collection ids) { - List wfNodeConfigVos = baseMapper.selectVoList(new LambdaQueryWrapper().in(WfNodeConfig::getDefinitionId, ids)); - if (CollUtil.isNotEmpty(wfNodeConfigVos)) { - List formIds = StreamUtils.toList(wfNodeConfigVos, WfNodeConfigVo::getFormId); - List wfFormManageVos = wfFormManageService.queryByIds(formIds); - for (WfNodeConfigVo wfNodeConfigVo : wfNodeConfigVos) { - wfFormManageVos.stream().filter(e -> ObjectUtil.equals(e.getId(), wfNodeConfigVo.getFormId())).findFirst().ifPresent(wfNodeConfigVo::setWfFormManageVo); - } - } - return wfNodeConfigVos; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java deleted file mode 100644 index 6c255d3..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.dromara.workflow.mapper.WfTaskBackNodeMapper; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.WorkflowUtils; -import org.flowable.task.api.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -import static org.dromara.workflow.common.constant.FlowConstant.MULTI_INSTANCE; -import static org.dromara.workflow.common.constant.FlowConstant.USER_TASK; - - -/** - * 节点驳回记录Service业务层处理 - * - * @author may - * @date 2024-03-13 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class WfTaskBackNodeServiceImpl implements IWfTaskBackNodeService { - - private final WfTaskBackNodeMapper wfTaskBackNodeMapper; - - @Override - @Transactional(rollbackFor = Exception.class) - public void recordExecuteNode(Task task) { - List list = getListByInstanceId(task.getProcessInstanceId()); - WfTaskBackNode wfTaskBackNode = new WfTaskBackNode(); - wfTaskBackNode.setNodeId(task.getTaskDefinitionKey()); - wfTaskBackNode.setNodeName(task.getName()); - wfTaskBackNode.setInstanceId(task.getProcessInstanceId()); - wfTaskBackNode.setAssignee(String.valueOf(LoginHelper.getUserId())); - MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()); - if (ObjectUtil.isNotEmpty(multiInstance)) { - wfTaskBackNode.setTaskType(MULTI_INSTANCE); - } else { - wfTaskBackNode.setTaskType(USER_TASK); - } - if (CollUtil.isEmpty(list)) { - wfTaskBackNode.setOrderNo(0); - wfTaskBackNodeMapper.insert(wfTaskBackNode); - } else { - WfTaskBackNode taskNode = StreamUtils.findFirst(list, e -> e.getNodeId().equals(wfTaskBackNode.getNodeId()) && e.getOrderNo() == 0); - if (ObjectUtil.isEmpty(taskNode)) { - wfTaskBackNode.setOrderNo(list.get(0).getOrderNo() + 1); - WfTaskBackNode node = getListByInstanceIdAndNodeId(wfTaskBackNode.getInstanceId(), wfTaskBackNode.getNodeId()); - if (ObjectUtil.isNotEmpty(node)) { - node.setAssignee(node.getAssignee() + StringUtils.SEPARATOR + LoginHelper.getUserId()); - wfTaskBackNodeMapper.updateById(node); - } else { - wfTaskBackNodeMapper.insert(wfTaskBackNode); - } - } - } - } - - @Override - public List getListByInstanceId(String processInstanceId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); - wrapper.orderByDesc(WfTaskBackNode::getOrderNo); - return wfTaskBackNodeMapper.selectList(wrapper); - } - - @Override - public WfTaskBackNode getListByInstanceIdAndNodeId(String processInstanceId, String nodeId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); - queryWrapper.eq(WfTaskBackNode::getNodeId, nodeId); - return wfTaskBackNodeMapper.selectOne(queryWrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteBackTaskNode(String processInstanceId, String targetActivityId) { - try { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); - queryWrapper.eq(WfTaskBackNode::getNodeId, targetActivityId); - WfTaskBackNode actTaskNode = wfTaskBackNodeMapper.selectOne(queryWrapper); - if (ObjectUtil.isNotNull(actTaskNode)) { - Integer orderNo = actTaskNode.getOrderNo(); - List taskNodeList = getListByInstanceId(processInstanceId); - List ids = new ArrayList<>(); - if (CollUtil.isNotEmpty(taskNodeList)) { - for (WfTaskBackNode taskNode : taskNodeList) { - if (taskNode.getOrderNo() >= orderNo) { - ids.add(taskNode.getId()); - } - } - } - if (CollUtil.isNotEmpty(ids)) { - wfTaskBackNodeMapper.deleteByIds(ids); - } - } - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException("删除失败"); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteByInstanceId(String processInstanceId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); - List list = wfTaskBackNodeMapper.selectList(wrapper); - int delete = wfTaskBackNodeMapper.delete(wrapper); - if (list.size() != delete) { - throw new ServiceException("删除失败"); - } - return true; - } - - @Override - public boolean deleteByInstanceIds(List processInstanceIds) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(WfTaskBackNode::getInstanceId, processInstanceIds); - List list = wfTaskBackNodeMapper.selectList(wrapper); - int delete = wfTaskBackNodeMapper.delete(wrapper); - if (list.size() != delete) { - throw new ServiceException("删除失败"); - } - return true; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java deleted file mode 100644 index b036584..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.dromara.workflow.service.impl; - -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.service.IActHiProcinstService; -import org.dromara.workflow.service.IActProcessInstanceService; -import org.dromara.workflow.utils.WorkflowUtils; -import org.flowable.engine.TaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 通用 工作流服务实现 - * - * @author may - */ -@RequiredArgsConstructor -@Service -public class WorkflowServiceImpl implements WorkflowService { - - @Autowired(required = false) - private TaskService taskService; - private final IActProcessInstanceService actProcessInstanceService; - private final IActHiProcinstService actHiProcinstService; - /** - * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息 - * - * @param businessKeys 业务id - * @return 结果 - */ - @Override - public boolean deleteRunAndHisInstance(List businessKeys) { - return actProcessInstanceService.deleteRunAndHisInstance(businessKeys); - } - - /** - * 获取当前流程状态 - * - * @param taskId 任务id - */ - @Override - public String getBusinessStatusByTaskId(String taskId) { - return WorkflowUtils.getBusinessStatusByTaskId(taskId); - } - - /** - * 获取当前流程状态 - * - * @param businessKey 业务id - */ - @Override - public String getBusinessStatus(String businessKey) { - return WorkflowUtils.getBusinessStatus(businessKey); - } - - /** - * 设置流程变量(全局变量) - * - * @param taskId 任务id - * @param variableName 变量名称 - * @param value 变量值 - */ - @Override - public void setVariable(String taskId, String variableName, Object value) { - taskService.setVariable(taskId, variableName, value); - } - - /** - * 设置流程变量(全局变量) - * - * @param taskId 任务id - * @param variables 流程变量 - */ - @Override - public void setVariables(String taskId, Map variables) { - taskService.setVariables(taskId, variables); - } - - /** - * 设置流程变量(本地变量,非全局变量) - * - * @param taskId 任务id - * @param variableName 变量名称 - * @param value 变量值 - */ - @Override - public void setVariableLocal(String taskId, String variableName, Object value) { - taskService.setVariableLocal(taskId, variableName, value); - } - - /** - * 设置流程变量(本地变量,非全局变量) - * - * @param taskId 任务id - * @param variables 流程变量 - */ - @Override - public void setVariablesLocal(String taskId, Map variables) { - taskService.setVariablesLocal(taskId, variables); - } - - /** - * 按照业务id查询流程实例id - * - * @param businessKey 业务id - * @return 结果 - */ - @Override - public String getInstanceIdByBusinessKey(String businessKey) { - ActHiProcinst actHiProcinst = actHiProcinstService.selectByBusinessKey(businessKey); - if (actHiProcinst == null) { - return StrUtil.EMPTY; - } - return actHiProcinst.getId(); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java deleted file mode 100644 index 7c5377e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java +++ /dev/null @@ -1,289 +0,0 @@ -package org.dromara.workflow.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.flowable.bpmn.converter.BpmnXMLConverter; -import org.flowable.bpmn.model.*; -import org.flowable.bpmn.model.Process; -import org.flowable.editor.language.json.converter.BpmnJsonConverter; -import org.flowable.engine.ProcessEngine; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.rmi.ServerException; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 模型工具 - * - * @author may - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ModelUtils { - - private static final ProcessEngine PROCESS_ENGINE = SpringUtils.getBean(ProcessEngine.class); - - public static BpmnModel xmlToBpmnModel(String xml) throws IOException { - if (xml == null) { - throw new ServerException("xml不能为空"); - } - try { - InputStream inputStream = new ByteArrayInputStream(StrUtil.utf8Bytes(xml)); - XMLInputFactory factory = XMLInputFactory.newInstance(); - XMLStreamReader reader = factory.createXMLStreamReader(inputStream); - return new BpmnXMLConverter().convertToBpmnModel(reader); - } catch (XMLStreamException e) { - throw new ServerException(e.getMessage()); - } - } - - /** - * bpmnModel转为xml - * - * @param jsonBytes json - */ - public static byte[] bpmnJsonToXmlBytes(byte[] jsonBytes) throws IOException { - if (jsonBytes == null) { - return new byte[0]; - } - // 1. json字节码转成 BpmnModel 对象 - ObjectMapper objectMapper = JsonUtils.getObjectMapper(); - JsonNode jsonNode = objectMapper.readTree(jsonBytes); - BpmnModel bpmnModel = new BpmnJsonConverter().convertToBpmnModel(jsonNode); - - if (bpmnModel.getProcesses().isEmpty()) { - return new byte[0]; - } - // 2.将bpmnModel转为xml - return new BpmnXMLConverter().convertToXML(bpmnModel); - } - - /** - * xml转为bpmnModel - * - * @param xmlBytes xml - */ - public static BpmnModel xmlToBpmnModel(byte[] xmlBytes) throws XMLStreamException { - ByteArrayInputStream byteArrayInputStream = IoUtil.toStream(xmlBytes); - XMLInputFactory xif = XMLInputFactory.newInstance(); - XMLStreamReader xtr = xif.createXMLStreamReader(byteArrayInputStream); - return new BpmnXMLConverter().convertToBpmnModel(xtr); - } - - /** - * 校验模型 - * - * @param bpmnModel bpmn模型 - */ - public static void checkBpmnModel(BpmnModel bpmnModel) throws ServerException { - Collection flowElements = bpmnModel.getMainProcess().getFlowElements(); - - checkBpmnNode(flowElements, false); - - List subProcessList = flowElements.stream().filter(SubProcess.class::isInstance).map(SubProcess.class::cast).collect(Collectors.toList()); - if (!CollUtil.isEmpty(subProcessList)) { - for (SubProcess subProcess : subProcessList) { - Collection subProcessFlowElements = subProcess.getFlowElements(); - checkBpmnNode(subProcessFlowElements, true); - } - } - List multiInstanceVoList = new ArrayList<>(); - for (FlowElement flowElement : flowElements) { - if (flowElement instanceof UserTask && ObjectUtil.isNotEmpty(((UserTask) flowElement).getLoopCharacteristics()) && StringUtils.isNotBlank(((UserTask) flowElement).getLoopCharacteristics().getInputDataItem())) { - MultiInstanceVo multiInstanceVo = new MultiInstanceVo(); - multiInstanceVo.setAssigneeList(((UserTask) flowElement).getLoopCharacteristics().getInputDataItem()); - multiInstanceVoList.add(multiInstanceVo); - } - } - - if (CollectionUtil.isNotEmpty(multiInstanceVoList) && multiInstanceVoList.size() > 1) { - Map> assigneeListGroup = StreamUtils.groupByKey(multiInstanceVoList, MultiInstanceVo::getAssigneeList); - for (Map.Entry> entry : assigneeListGroup.entrySet()) { - List value = entry.getValue(); - if (CollectionUtil.isNotEmpty(value) && value.size() > 1) { - String key = entry.getKey(); - throw new ServerException("会签人员集合【" + key + "】重复,请重新设置集合KEY"); - } - } - } - } - - /** - * 校验bpmn节点是否合法 - * - * @param flowElements 节点集合 - * @param subtask 是否子流程 - */ - private static void checkBpmnNode(Collection flowElements, boolean subtask) throws ServerException { - - if (CollUtil.isEmpty(flowElements)) { - throw new ServerException(subtask ? "子流程必须存在节点" : "必须存在节点！"); - } - - List startEventList = flowElements.stream().filter(StartEvent.class::isInstance).map(StartEvent.class::cast).collect(Collectors.toList()); - if (CollUtil.isEmpty(startEventList)) { - throw new ServerException(subtask ? "子流程必须存在开始节点" : "必须存在开始节点！"); - } - - if (startEventList.size() > 1) { - throw new ServerException(subtask ? "子流程只能存在一个开始节点" : "只能存在一个开始节点！"); - } - - StartEvent startEvent = startEventList.get(0); - List outgoingFlows = startEvent.getOutgoingFlows(); - if (CollUtil.isEmpty(outgoingFlows)) { - throw new ServerException(subtask ? "子流程流程节点为空，请至少设计一条主线流程！" : "流程节点为空，请至少设计一条主线流程！"); - } - - FlowElement targetFlowElement = outgoingFlows.get(0).getTargetFlowElement(); - if (!(targetFlowElement instanceof UserTask) && !subtask) { - throw new ServerException("开始节点后第一个节点必须是用户任务！"); - } - //开始节点后第一个节点申请人节点 - if ((targetFlowElement instanceof UserTask) && !subtask) { - UserTask userTask = (UserTask) targetFlowElement; - if (StringUtils.isBlank(userTask.getFormKey())) { - throw new ServerException("申请人节点必须选择表单！"); - } - } - List endEventList = flowElements.stream().filter(EndEvent.class::isInstance).map(EndEvent.class::cast).collect(Collectors.toList()); - if (CollUtil.isEmpty(endEventList)) { - throw new ServerException(subtask ? "子流程必须存在结束节点！" : "必须存在结束节点！"); - } - } - - /** - * 获取流程全部用户节点 - * - * @param processDefinitionId 流程定义id - */ - public static List getUserTaskFlowElements(String processDefinitionId) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - List list = new ArrayList<>(); - List processes = bpmnModel.getProcesses(); - Collection flowElements = processes.get(0).getFlowElements(); - buildUserTaskFlowElements(flowElements, list); - return list; - } - - /** - * 递归获取所有节点 - * - * @param flowElements 节点信息 - * @param list 集合 - */ - private static void buildUserTaskFlowElements(Collection flowElements, List list) { - for (FlowElement flowElement : flowElements) { - if (flowElement instanceof SubProcess) { - Collection subFlowElements = ((SubProcess) flowElement).getFlowElements(); - buildUserTaskFlowElements(subFlowElements, list); - } else if (flowElement instanceof UserTask) { - list.add((UserTask) flowElement); - } - } - } - - /** - * 获取流程全部节点 - * - * @param processDefinitionId 流程定义id - */ - public static List getFlowElements(String processDefinitionId) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - List list = new ArrayList<>(); - List processes = bpmnModel.getProcesses(); - Collection flowElements = processes.get(0).getFlowElements(); - buildFlowElements(flowElements, list); - return list; - } - - /** - * 递归获取所有节点 - * - * @param flowElements 节点信息 - * @param list 集合 - */ - private static void buildFlowElements(Collection flowElements, List list) { - for (FlowElement flowElement : flowElements) { - list.add(flowElement); - if (flowElement instanceof SubProcess) { - Collection subFlowElements = ((SubProcess) flowElement).getFlowElements(); - buildFlowElements(subFlowElements, list); - } - } - } - - /** - * 获取全部扩展信息 - * - * @param processDefinitionId 流程定义id - */ - public static Map> getExtensionElements(String processDefinitionId) { - Map> map = new HashMap<>(); - List flowElements = getFlowElements(processDefinitionId); - for (FlowElement flowElement : flowElements) { - if (flowElement instanceof UserTask && CollUtil.isNotEmpty(flowElement.getExtensionElements())) { - map.putAll(flowElement.getExtensionElements()); - } - } - return map; - } - - /** - * 获取某个节点的扩展信息 - * - * @param processDefinitionId 流程定义id - * @param flowElementId 节点id - */ - public static Map> getExtensionElement(String processDefinitionId, String flowElementId) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - Process process = bpmnModel.getMainProcess(); - FlowElement flowElement = process.getFlowElement(flowElementId); - return flowElement.getExtensionElements(); - } - - /** - * 判断当前节点是否为用户任务 - * - * @param processDefinitionId 流程定义id - * @param taskDefinitionKey 流程定义id - */ - public static boolean isUserTask(String processDefinitionId, String taskDefinitionKey) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(taskDefinitionKey); - return flowNode instanceof UserTask; - } - - /** - * 获取申请人节点 - * - * @param processDefinitionId 流程定义id - * @return 结果 - */ - public static UserTask getApplyUserTask(String processDefinitionId) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - Collection flowElements = bpmnModel.getMainProcess().getFlowElements(); - List startEventList = flowElements.stream().filter(StartEvent.class::isInstance).map(StartEvent.class::cast).collect(Collectors.toList()); - StartEvent startEvent = startEventList.get(0); - List outgoingFlows = startEvent.getOutgoingFlows(); - FlowElement targetFlowElement = outgoingFlows.get(0).getTargetFlowElement(); - return (UserTask) targetFlowElement; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java deleted file mode 100644 index df928dc..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java +++ /dev/null @@ -1,169 +0,0 @@ -package org.dromara.workflow.utils; - -import cn.hutool.core.bean.BeanUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.domain.vo.TaskVo; -import org.flowable.engine.ProcessEngine; -import org.flowable.engine.history.HistoricActivityInstanceQuery; -import org.flowable.engine.history.HistoricProcessInstanceQuery; -import org.flowable.engine.repository.DeploymentQuery; -import org.flowable.engine.repository.ModelQuery; -import org.flowable.engine.repository.ProcessDefinitionQuery; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.engine.runtime.ProcessInstanceQuery; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstanceQuery; - -import java.util.Collection; -import java.util.List; -import java.util.Set; - -/** - * 查询工具 - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class QueryUtils { - - private static final ProcessEngine PROCESS_ENGINE = SpringUtils.getBean(ProcessEngine.class); - - public static ModelQuery modelQuery() { - ModelQuery query = PROCESS_ENGINE.getRepositoryService().createModelQuery(); - if (TenantHelper.isEnable()) { - query.modelTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static ProcessDefinitionQuery definitionQuery() { - ProcessDefinitionQuery query = PROCESS_ENGINE.getRepositoryService().createProcessDefinitionQuery(); - if (TenantHelper.isEnable()) { - query.processDefinitionTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static DeploymentQuery deploymentQuery() { - DeploymentQuery query = PROCESS_ENGINE.getRepositoryService().createDeploymentQuery(); - if (TenantHelper.isEnable()) { - query.deploymentTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static DeploymentQuery deploymentQuery(String deploymentId) { - return deploymentQuery().deploymentId(deploymentId); - } - - public static DeploymentQuery deploymentQuery(List deploymentIds) { - return deploymentQuery().deploymentIds(deploymentIds); - } - - public static HistoricTaskInstanceQuery hisTaskInstanceQuery() { - HistoricTaskInstanceQuery query = PROCESS_ENGINE.getHistoryService().createHistoricTaskInstanceQuery(); - if (TenantHelper.isEnable()) { - query.taskTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static HistoricTaskInstanceQuery hisTaskInstanceQuery(String processInstanceId) { - return hisTaskInstanceQuery().processInstanceId(processInstanceId); - } - - public static HistoricTaskInstanceQuery hisTaskBusinessKeyQuery(String businessKey) { - return hisTaskInstanceQuery().processInstanceBusinessKey(businessKey); - } - - public static ProcessInstanceQuery instanceQuery() { - ProcessInstanceQuery query = PROCESS_ENGINE.getRuntimeService().createProcessInstanceQuery(); - if (TenantHelper.isEnable()) { - query.processInstanceTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static ProcessInstanceQuery instanceQuery(String processInstanceId) { - return instanceQuery().processInstanceId(processInstanceId); - } - - public static ProcessInstanceQuery businessKeyQuery(String businessKey) { - return instanceQuery().processInstanceBusinessKey(businessKey); - } - - public static ProcessInstanceQuery instanceQuery(Set processInstanceIds) { - return instanceQuery().processInstanceIds(processInstanceIds); - } - - public static HistoricProcessInstanceQuery hisInstanceQuery() { - HistoricProcessInstanceQuery query = PROCESS_ENGINE.getHistoryService().createHistoricProcessInstanceQuery(); - if (TenantHelper.isEnable()) { - query.processInstanceTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static HistoricProcessInstanceQuery hisInstanceQuery(String processInstanceId) { - return hisInstanceQuery().processInstanceId(processInstanceId); - } - - public static HistoricProcessInstanceQuery hisBusinessKeyQuery(String businessKey) { - return hisInstanceQuery().processInstanceBusinessKey(businessKey); - } - - public static HistoricProcessInstanceQuery hisInstanceQuery(Set processInstanceIds) { - return hisInstanceQuery().processInstanceIds(processInstanceIds); - } - - public static HistoricActivityInstanceQuery hisActivityInstanceQuery() { - HistoricActivityInstanceQuery query = PROCESS_ENGINE.getHistoryService().createHistoricActivityInstanceQuery(); - if (TenantHelper.isEnable()) { - query.activityTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static HistoricActivityInstanceQuery hisActivityInstanceQuery(String processInstanceId) { - return hisActivityInstanceQuery().processInstanceId(processInstanceId); - } - - public static TaskQuery taskQuery() { - TaskQuery query = PROCESS_ENGINE.getTaskService().createTaskQuery(); - if (TenantHelper.isEnable()) { - query.taskTenantId(TenantHelper.getTenantId()); - } - return query; - } - - public static TaskQuery taskQuery(String processInstanceId) { - return taskQuery().processInstanceId(processInstanceId); - } - - public static TaskQuery taskQuery(Collection processInstanceIds) { - return taskQuery().processInstanceIdIn(processInstanceIds); - } - - /** - * 按照任务id查询当前任务 - * - * @param taskId 任务id - */ - public static TaskVo getTask(String taskId) { - Task task = PROCESS_ENGINE.getTaskService().createTaskQuery().taskId(taskId).singleResult(); - if (task == null) { - return null; - } - ProcessInstance processInstance = QueryUtils.instanceQuery(task.getProcessInstanceId()).singleResult(); - TaskVo taskVo = BeanUtil.toBean(task, TaskVo.class); - taskVo.setBusinessKey(processInstance.getBusinessKey()); - taskVo.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null); - String businessStatus = WorkflowUtils.getBusinessStatus(taskVo.getBusinessKey()); - taskVo.setBusinessStatus(businessStatus); - return taskVo; - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java deleted file mode 100644 index d7c4472..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java +++ /dev/null @@ -1,295 +0,0 @@ -package org.dromara.workflow.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.MessageTypeEnum; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.dromara.workflow.domain.vo.ParticipantVo; -import org.dromara.workflow.flowable.cmd.UpdateHiTaskInstCmd; -import org.dromara.workflow.mapper.ActHiTaskinstMapper; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.FlowNode; -import org.flowable.common.engine.api.delegate.Expression; -import org.flowable.engine.ProcessEngine; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; -import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; -import org.flowable.identitylink.api.history.HistoricIdentityLink; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; - -import java.util.*; - -/** - * 工作流工具 - * - * @author may - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class WorkflowUtils { - - private static final ProcessEngine PROCESS_ENGINE = SpringUtils.getBean(ProcessEngine.class); - private static final ActHiTaskinstMapper ACT_HI_TASKINST_MAPPER = SpringUtils.getBean(ActHiTaskinstMapper.class); - - /** - * 创建一个新任务 - * - * @param currentTask 参数 - */ - public static TaskEntity createNewTask(Task currentTask) { - TaskEntity task = null; - if (ObjectUtil.isNotEmpty(currentTask)) { - task = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask(); - task.setCategory(currentTask.getCategory()); - task.setDescription(currentTask.getDescription()); - task.setAssignee(currentTask.getAssignee()); - task.setName(currentTask.getName()); - task.setProcessDefinitionId(currentTask.getProcessDefinitionId()); - task.setProcessInstanceId(currentTask.getProcessInstanceId()); - task.setTaskDefinitionKey(currentTask.getTaskDefinitionKey()); - task.setPriority(currentTask.getPriority()); - task.setCreateTime(new Date()); - task.setTenantId(TenantHelper.getTenantId()); - PROCESS_ENGINE.getTaskService().saveTask(task); - } - if (ObjectUtil.isNotNull(task)) { - UpdateHiTaskInstCmd updateHiTaskInstCmd = new UpdateHiTaskInstCmd(Collections.singletonList(task.getId()), task.getProcessDefinitionId(), task.getProcessInstanceId()); - PROCESS_ENGINE.getManagementService().executeCommand(updateHiTaskInstCmd); - } - return task; - } - - /** - * 抄送任务 - * - * @param parentTaskList 父级任务 - * @param userIds 人员id - */ - public static void createCopyTask(List parentTaskList, List userIds) { - List list = new ArrayList<>(); - String tenantId = TenantHelper.getTenantId(); - for (Task parentTask : parentTaskList) { - for (Long userId : userIds) { - TaskEntity newTask = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask(); - newTask.setParentTaskId(parentTask.getId()); - newTask.setAssignee(userId.toString()); - newTask.setName("【抄送】-" + parentTask.getName()); - newTask.setProcessDefinitionId(parentTask.getProcessDefinitionId()); - newTask.setProcessInstanceId(parentTask.getProcessInstanceId()); - newTask.setTaskDefinitionKey(parentTask.getTaskDefinitionKey()); - newTask.setTenantId(tenantId); - list.add(newTask); - } - } - PROCESS_ENGINE.getTaskService().bulkSaveTasks(list); - if (CollUtil.isNotEmpty(list) && CollUtil.isNotEmpty(parentTaskList)) { - String processInstanceId = parentTaskList.get(0).getProcessInstanceId(); - String processDefinitionId = parentTaskList.get(0).getProcessDefinitionId(); - List taskIds = StreamUtils.toList(list, Task::getId); - ActHiTaskinst actHiTaskinst = new ActHiTaskinst(); - actHiTaskinst.setProcDefId(processDefinitionId); - actHiTaskinst.setProcInstId(processInstanceId); - actHiTaskinst.setScopeType(TaskStatusEnum.COPY.getStatus()); - actHiTaskinst.setTenantId(tenantId); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ActHiTaskinst::getId, taskIds); - ACT_HI_TASKINST_MAPPER.update(actHiTaskinst, updateWrapper); - for (Task task : list) { - PROCESS_ENGINE.getTaskService().addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.COPY.getStatus(), StrUtil.EMPTY); - } - } - } - - /** - * 获取当前任务参与者 - * - * @param taskId 任务id - */ - public static ParticipantVo getCurrentTaskParticipant(String taskId, UserService userService) { - ParticipantVo participantVo = new ParticipantVo(); - List linksForTask = PROCESS_ENGINE.getHistoryService().getHistoricIdentityLinksForTask(taskId); - Task task = QueryUtils.taskQuery().taskId(taskId).singleResult(); - if (task != null && CollUtil.isNotEmpty(linksForTask)) { - List groupList = StreamUtils.filter(linksForTask, e -> StringUtils.isNotBlank(e.getGroupId())); - if (CollUtil.isNotEmpty(groupList)) { - List groupIds = StreamUtils.toList(groupList, e -> Long.valueOf(e.getGroupId())); - List userIds = userService.selectUserIdsByRoleIds(groupIds); - if (CollUtil.isNotEmpty(userIds)) { - participantVo.setGroupIds(groupIds); - List userList = userService.selectListByIds(userIds); - if (CollUtil.isNotEmpty(userList)) { - List userIdList = StreamUtils.toList(userList, UserDTO::getUserId); - List nickNames = StreamUtils.toList(userList, UserDTO::getNickName); - participantVo.setCandidate(userIdList); - participantVo.setCandidateName(nickNames); - participantVo.setClaim(!StringUtils.isBlank(task.getAssignee())); - } - } - } else { - List candidateList = StreamUtils.filter(linksForTask, e -> FlowConstant.CANDIDATE.equals(e.getType())); - List userIdList = new ArrayList<>(); - for (HistoricIdentityLink historicIdentityLink : linksForTask) { - try { - userIdList.add(Long.valueOf(historicIdentityLink.getUserId())); - } catch (NumberFormatException ignored) { - - } - } - List userList = userService.selectListByIds(userIdList); - if (CollUtil.isNotEmpty(userList)) { - List userIds = StreamUtils.toList(userList, UserDTO::getUserId); - List nickNames = StreamUtils.toList(userList, UserDTO::getNickName); - participantVo.setCandidate(userIds); - participantVo.setCandidateName(nickNames); - // 判断当前任务是否具有多个办理人 - if (CollUtil.isNotEmpty(candidateList) && candidateList.size() > 1) { - // 如果 assignee 存在，则设置当前任务已经被认领 - participantVo.setClaim(StringUtils.isNotBlank(task.getAssignee())); - } - } - } - } - return participantVo; - } - - /** - * 判断当前节点是否为会签节点 - * - * @param processDefinitionId 流程定义id - * @param taskDefinitionKey 流程定义id - */ - public static MultiInstanceVo isMultiInstance(String processDefinitionId, String taskDefinitionKey) { - BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId); - FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(taskDefinitionKey); - MultiInstanceVo multiInstanceVo = new MultiInstanceVo(); - //判断是否为并行会签节点 - if (flowNode.getBehavior() instanceof ParallelMultiInstanceBehavior behavior && behavior.getCollectionExpression() != null) { - Expression collectionExpression = behavior.getCollectionExpression(); - String assigneeList = collectionExpression.getExpressionText(); - String assignee = behavior.getCollectionElementVariable(); - multiInstanceVo.setType(behavior); - multiInstanceVo.setAssignee(assignee); - multiInstanceVo.setAssigneeList(assigneeList); - return multiInstanceVo; - //判断是否为串行会签节点 - } else if (flowNode.getBehavior() instanceof SequentialMultiInstanceBehavior behavior && behavior.getCollectionExpression() != null) { - Expression collectionExpression = behavior.getCollectionExpression(); - String assigneeList = collectionExpression.getExpressionText(); - String assignee = behavior.getCollectionElementVariable(); - multiInstanceVo.setType(behavior); - multiInstanceVo.setAssignee(assignee); - multiInstanceVo.setAssigneeList(assigneeList); - return multiInstanceVo; - } - return null; - } - - /** - * 获取当前流程状态 - * - * @param taskId 任务id - */ - public static String getBusinessStatusByTaskId(String taskId) { - HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery().taskId(taskId).singleResult(); - HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(historicTaskInstance.getProcessInstanceId()).singleResult(); - return historicProcessInstance.getBusinessStatus(); - } - - /** - * 获取当前流程状态 - * - * @param businessKey 业务id - */ - public static String getBusinessStatus(String businessKey) { - HistoricProcessInstance historicProcessInstance = QueryUtils.hisBusinessKeyQuery(businessKey).singleResult(); - return historicProcessInstance.getBusinessStatus(); - } - - /** - * 发送消息 - * - * @param list 任务 - * @param name 流程名称 - * @param messageType 消息类型 - * @param message 消息内容，为空则发送默认配置的消息内容 - */ - public static void sendMessage(List list, String name, List messageType, String message, UserService userService) { - Set userIds = new HashSet<>(); - if (StringUtils.isBlank(message)) { - message = "有新的【" + name + "】单据已经提交至您的待办，请您及时处理。"; - } - for (Task t : list) { - ParticipantVo taskParticipant = WorkflowUtils.getCurrentTaskParticipant(t.getId(), userService); - if (CollUtil.isNotEmpty(taskParticipant.getGroupIds())) { - List userIdList = userService.selectUserIdsByRoleIds(taskParticipant.getGroupIds()); - if (CollUtil.isNotEmpty(userIdList)) { - userIds.addAll(userIdList); - } - } - List candidate = taskParticipant.getCandidate(); - if (CollUtil.isNotEmpty(candidate)) { - userIds.addAll(candidate); - } - } - if (CollUtil.isNotEmpty(userIds)) { - List userList = userService.selectListByIds(new ArrayList<>(userIds)); - for (String code : messageType) { - MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code); - if (ObjectUtil.isNotEmpty(messageTypeEnum)) { - switch (messageTypeEnum) { - case SYSTEM_MESSAGE: - WebSocketMessageDto dto = new WebSocketMessageDto(); - dto.setSessionKeys(new ArrayList<>(userIds)); - dto.setMessage(message); - WebSocketUtils.publishMessage(dto); - break; - case EMAIL_MESSAGE: - MailUtils.sendText(StreamUtils.join(userList, UserDTO::getEmail), "单据审批提醒", message); - break; - case SMS_MESSAGE: - //todo 短信发送 - break; - } - } - } - } - } - - /** - * 根据任务id查询 当前用户的任务，检查 当前人员 是否是该 taskId 的办理人 - * - * @param taskId 任务id - * @return 结果 - */ - public static Task getTaskByCurrentUser(String taskId) { - TaskQuery taskQuery = QueryUtils.taskQuery(); - taskQuery.taskId(taskId).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())); - - List roles = LoginHelper.getLoginUser().getRoles(); - if (CollUtil.isNotEmpty(roles)) { - List groupIds = StreamUtils.toList(roles, e -> String.valueOf(e.getRoleId())); - taskQuery.taskCandidateGroupIn(groupIds); - } - return taskQuery.singleResult(); - } -} diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md deleted file mode 100644 index c938b1e..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md +++ /dev/null @@ -1,3 +0,0 @@ -java包使用 `.` 分割 resource 目录使用 `/` 分割 -
-此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml deleted file mode 100644 index dd05785..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml deleted file mode 100644 index 7e73b60..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml deleted file mode 100644 index 3641900..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml deleted file mode 100644 index d52f6b0..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml deleted file mode 100644 index 4375cb2..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml deleted file mode 100644 index 8d579f7..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml deleted file mode 100644 index 59221f8..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml deleted file mode 100644 index b65194f..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml b/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml deleted file mode 100644 index 4a9179b..0000000 --- a/template/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/template/script/bpmn/模型.zip b/template/script/bpmn/模型.zip deleted file mode 100644 index 6f30952..0000000 Binary files a/template/script/bpmn/模型.zip and /dev/null differ diff --git a/template/script/docker/database.yml b/template/script/docker/database.yml deleted file mode 100644 index 0368fd2..0000000 --- a/template/script/docker/database.yml +++ /dev/null @@ -1,61 +0,0 @@ -version: '3' - -services: - # 此镜像仅用于测试 正式环境需自行安装数据库 - # SID: XE user: system password: oracle - oracle: - image: tekintian/oracle12c:latest - container_name: oracle - environment: - # 时区上海 - TZ: Asia/Shanghai - DBCA_TOTAL_MEMORY: 16192 - ports: - - "18080:8080" - - "1521:1521" - volumes: - # 数据挂载 - - "/docker/oracle/data:/u01/app/oracle" - network_mode: "host" - - # 此镜像仅用于测试 正式环境需自行安装数据库 - sqlserver: - image: mcr.microsoft.com/mssql/server:2017-latest - container_name: sqlserver - environment: - # 时区上海 - TZ: Asia/Shanghai - ACCEPT_EULA: "Y" - SA_PASSWORD: "Ruoyi@123" - ports: - - "1433:1433" - volumes: - # 数据挂载 - - "/docker/sqlserver/data:/var/opt/mssql" - network_mode: "host" - - postgres: - image: postgres:14.2 - container_name: postgres - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: root - POSTGRES_DB: postgres - ports: - - "5432:5432" - volumes: - - /docker/postgres/data:/var/lib/postgresql/data - network_mode: "host" - - postgres13: - image: postgres:13.6 - container_name: postgres13 - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: root - POSTGRES_DB: postgres - ports: - - "5433:5432" - volumes: - - /docker/postgres13/data:/var/lib/postgresql/data - network_mode: "host" diff --git a/template/script/docker/docker-compose.yml b/template/script/docker/docker-compose.yml deleted file mode 100644 index 0839e74..0000000 --- a/template/script/docker/docker-compose.yml +++ /dev/null @@ -1,156 +0,0 @@ -version: '3' - -services: - mysql: - image: mysql:8.0.33 - container_name: mysql - environment: - # 时区上海 - TZ: Asia/Shanghai - # root 密码 - MYSQL_ROOT_PASSWORD: root - # 初始化数据库(后续的初始化sql会在这个库执行) - MYSQL_DATABASE: ry-vue - ports: - - "3306:3306" - volumes: - # 数据挂载 - - /docker/mysql/data/:/var/lib/mysql/ - # 配置挂载 - - /docker/mysql/conf/:/etc/mysql/conf.d/ - command: - # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) - --default-authentication-plugin=mysql_native_password - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 - privileged: true - network_mode: "host" - - nginx-web: - image: nginx:1.23.4 - container_name: nginx-web - environment: - # 时区上海 - TZ: Asia/Shanghai - ports: - - "80:80" - - "443:443" - volumes: - # 证书映射 - - /docker/nginx/cert:/etc/nginx/cert - # 配置文件映射 - - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf - # 页面目录 - - /docker/nginx/html:/usr/share/nginx/html - # 日志目录 - - /docker/nginx/log:/var/log/nginx - privileged: true - network_mode: "host" - - redis: - image: redis:6.2.12 - container_name: redis - ports: - - "6379:6379" - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/redis/conf:/redis/config:rw - # 数据文件 - - /docker/redis/data/:/redis/data/:rw - command: "redis-server /redis/config/redis.conf" - privileged: true - network_mode: "host" - - minio: - image: minio/minio:RELEASE.2023-04-13T03-08-07Z - container_name: minio - ports: - # api 端口 - - "9000:9000" - # 控制台端口 - - "9001:9001" - environment: - # 时区上海 - TZ: Asia/Shanghai - # 管理后台用户名 - MINIO_ROOT_USER: ruoyi - # 管理后台密码，最小8个字符 - MINIO_ROOT_PASSWORD: ruoyi123 - # https需要指定域名 - #MINIO_SERVER_URL: "https://xxx.com:9000" - #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001" - # 开启压缩 on 开启 off 关闭 - MINIO_COMPRESS: "off" - # 扩展名 .pdf,.doc 为空 所有类型均压缩 - MINIO_COMPRESS_EXTENSIONS: "" - # mime 类型 application/pdf 为空 所有类型均压缩 - MINIO_COMPRESS_MIME_TYPES: "" - volumes: - # 映射当前目录下的data目录至容器内/data目录 - - /docker/minio/data:/data - # 映射配置目录 - - /docker/minio/config:/root/.minio/ - command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data - privileged: true - network_mode: "host" - - ruoyi-server1: - image: ruoyi/ruoyi-server:5.2.3 - container_name: ruoyi-server1 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8080 - volumes: - # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - - ruoyi-server2: - image: ruoyi/ruoyi-server:5.2.3 - container_name: ruoyi-server2 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8081 - volumes: - # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - - ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:5.2.3 - container_name: ruoyi-monitor-admin - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs - privileged: true - network_mode: "host" - - ruoyi-snailjob-server: - image: ruoyi/ruoyi-snailjob-server:5.2.3 - container_name: ruoyi-snailjob-server - environment: - # 时区上海 - TZ: Asia/Shanghai - ports: - - "8800:8800" - - "17888:17888" - volumes: - - /docker/snailjob/logs/:/ruoyi/snailjob/logs - privileged: true - network_mode: "host" diff --git a/template/script/docker/nginx/conf/nginx.conf b/template/script/docker/nginx/conf/nginx.conf deleted file mode 100644 index 3c79d97..0000000 --- a/template/script/docker/nginx/conf/nginx.conf +++ /dev/null @@ -1,115 +0,0 @@ -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - # 限制body大小 - client_max_body_size 100m; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - upstream server { - ip_hash; - server 127.0.0.1:8080; - server 127.0.0.1:8081; - } - - upstream monitor-admin { - server 127.0.0.1:9090; - } - - upstream snailjob-server { - server 127.0.0.1:8800; - } - - server { - listen 80; - server_name localhost; - - # https配置参考 start - #listen 443 ssl; - - # 证书直接存放 /docker/nginx/cert/ 目录下即可 更改证书名称即可 无需更改证书路径 - #ssl on; - #ssl_certificate /etc/nginx/cert/xxx.local.crt; # /etc/nginx/cert/ 为docker映射路径 不允许更改 - #ssl_certificate_key /etc/nginx/cert/xxx.local.key; # /etc/nginx/cert/ 为docker映射路径 不允许更改 - #ssl_session_timeout 5m; - #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - #ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - #ssl_prefer_server_ciphers on; - # https配置参考 end - - # 演示环境配置 拦截除 GET POST 之外的所有请求 - # if ($request_method !~* GET|POST) { - # rewrite ^/(.*)$ /403; - # } - - # location = /403 { - # default_type application/json; - # return 200 '{"msg":"演示模式，不允许操作","code":500}'; - # } - - # 限制外网访问内网 actuator 相关路径 - location ~ ^(/[^/]*)?/actuator.*(/.*)?$ { - return 403; - } - - location / { - root /usr/share/nginx/html; # docker映射路径 不允许更改 - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /prod-api/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_read_timeout 86400s; - # sse 与 websocket参数 - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_buffering off; - proxy_cache off; - proxy_pass http://server/; - } - - # https 会拦截内链所有的 http 请求 造成功能无法使用 - # 解决方案1 将 admin 服务 也配置成 https - # 解决方案2 将菜单配置为外链访问 走独立页面 http 访问 - location /admin/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://monitor-admin/admin/; - } - - location /snail-job/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://snailjob-server/snail-job/; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} diff --git a/template/script/docker/redis/conf/redis.conf b/template/script/docker/redis/conf/redis.conf deleted file mode 100644 index 72255c6..0000000 --- a/template/script/docker/redis/conf/redis.conf +++ /dev/null @@ -1,28 +0,0 @@ -# redis 密码 -requirepass ruoyi123 - -# key 监听器配置 -# notify-keyspace-events Ex - -# 配置持久化文件存储路径 -dir /redis/data -# 配置rdb -# 15分钟内有至少1个key被更改则进行快照 -save 900 1 -# 5分钟内有至少10个key被更改则进行快照 -save 300 10 -# 1分钟内有至少10000个key被更改则进行快照 -save 60 10000 -# 开启压缩 -rdbcompression yes -# rdb文件名 用默认的即可 -dbfilename dump.rdb - -# 开启aof -appendonly yes -# 文件名 -appendfilename "appendonly.aof" -# 持久化策略,no:不同步,everysec:每秒一次,always:总是同步,速度比较慢 -# appendfsync always -appendfsync everysec -# appendfsync no diff --git a/template/script/docker/redis/data/README.md b/template/script/docker/redis/data/README.md deleted file mode 100644 index fbc5474..0000000 --- a/template/script/docker/redis/data/README.md +++ /dev/null @@ -1 +0,0 @@ -数据目录 请执行 `chmod 777 /docker/redis/data` 赋予读写权限 否则将无法写入数据 \ No newline at end of file diff --git a/template/script/sql/oracle/oracle_ry_job.sql b/template/script/sql/oracle/oracle_ry_job.sql deleted file mode 100644 index da65dbb..0000000 --- a/template/script/sql/oracle/oracle_ry_job.sql +++ /dev/null @@ -1,906 +0,0 @@ -/* - SnailJob Database Transfer Tool - Source Server Type : MySQL - Target Server Type : Oracle - Date: 2024-07-06 12:49:36 -*/ - - --- sj_namespace -CREATE TABLE sj_namespace -( - id number GENERATED ALWAYS AS IDENTITY, - name varchar2(64) NULL, - unique_id varchar2(64) NULL, - description varchar2(256) DEFAULT '' NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_namespace - ADD CONSTRAINT pk_sj_namespace PRIMARY KEY (id); - -CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name); - -COMMENT ON COLUMN sj_namespace.id IS '主键'; -COMMENT ON COLUMN sj_namespace.name IS '名称'; -COMMENT ON COLUMN sj_namespace.unique_id IS '唯一id'; -COMMENT ON COLUMN sj_namespace.description IS '描述'; -COMMENT ON COLUMN sj_namespace.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_namespace.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_namespace.update_dt IS '修改时间'; -COMMENT ON TABLE sj_namespace IS '命名空间'; - -INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES ('Development', 'dev', '', 0, sysdate, sysdate); -INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES ('Production', 'prod', '', 0, sysdate, sysdate); - --- sj_group_config -CREATE TABLE sj_group_config -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) DEFAULT '' NULL, - description varchar2(256) DEFAULT '' NULL, - token varchar2(64) DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT' NULL, - group_status smallint DEFAULT 0 NOT NULL, - version number NOT NULL, - group_partition number NOT NULL, - id_generator_mode smallint DEFAULT 1 NOT NULL, - init_scene smallint DEFAULT 0 NOT NULL, - bucket_index number DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_group_config - ADD CONSTRAINT pk_sj_group_config PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name); - -COMMENT ON COLUMN sj_group_config.id IS '主键'; -COMMENT ON COLUMN sj_group_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_group_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_group_config.description IS '组描述'; -COMMENT ON COLUMN sj_group_config.token IS 'token'; -COMMENT ON COLUMN sj_group_config.group_status IS '组状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_group_config.version IS '版本号'; -COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; -COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; -COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_group_config IS '组配置'; - -INSERT INTO sj_group_config (namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES ('dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, sysdate, sysdate); -INSERT INTO sj_group_config (namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES ('prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, sysdate, sysdate); - --- sj_notify_config -CREATE TABLE sj_notify_config -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - business_id varchar2(64) NULL, - system_task_type smallint DEFAULT 3 NOT NULL, - notify_status smallint DEFAULT 0 NOT NULL, - recipient_ids varchar2(128) NULL, - notify_threshold number DEFAULT 0 NOT NULL, - notify_scene smallint DEFAULT 0 NOT NULL, - rate_limiter_status smallint DEFAULT 0 NOT NULL, - rate_limiter_threshold number DEFAULT 0 NOT NULL, - description varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_notify_config - ADD CONSTRAINT pk_sj_notify_config PRIMARY KEY (id); - -CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name, business_id); - -COMMENT ON COLUMN sj_notify_config.id IS '主键'; -COMMENT ON COLUMN sj_notify_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_notify_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_notify_config.business_id IS '业务id ( job_id或workflow_id或scene_name ) '; -COMMENT ON COLUMN sj_notify_config.system_task_type IS '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_notify_config.notify_status IS '通知状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_notify_config.recipient_ids IS '接收人id列表'; -COMMENT ON COLUMN sj_notify_config.notify_threshold IS '通知阈值'; -COMMENT ON COLUMN sj_notify_config.notify_scene IS '通知场景'; -COMMENT ON COLUMN sj_notify_config.rate_limiter_status IS '限流状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_notify_config.rate_limiter_threshold IS '每秒限流阈值'; -COMMENT ON COLUMN sj_notify_config.description IS '描述'; -COMMENT ON COLUMN sj_notify_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_notify_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_notify_config IS '通知配置'; - --- sj_notify_recipient -CREATE TABLE sj_notify_recipient -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - recipient_name varchar2(64) NULL, - notify_type smallint DEFAULT 0 NOT NULL, - notify_attribute varchar2(512) NULL, - description varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_notify_recipient - ADD CONSTRAINT pk_sj_notify_recipient PRIMARY KEY (id); - -CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id); - -COMMENT ON COLUMN sj_notify_recipient.id IS '主键'; -COMMENT ON COLUMN sj_notify_recipient.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_notify_recipient.recipient_name IS '接收人名称'; -COMMENT ON COLUMN sj_notify_recipient.notify_type IS '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook'; -COMMENT ON COLUMN sj_notify_recipient.notify_attribute IS '配置属性'; -COMMENT ON COLUMN sj_notify_recipient.description IS '描述'; -COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; -COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; - --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_name varchar2(64) NULL, - idempotent_id varchar2(64) NULL, - biz_no varchar2(64) DEFAULT '' NULL, - executor_name varchar2(512) DEFAULT '' NULL, - args_str clob NULL, - ext_attrs clob NULL, - task_type smallint DEFAULT 1 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_dead_letter_0 - ADD CONSTRAINT pk_sj_retry_dead_letter_0 PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); - -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); - -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_name varchar2(64) NULL, - idempotent_id varchar2(64) NULL, - biz_no varchar2(64) DEFAULT '' NULL, - executor_name varchar2(512) DEFAULT '' NULL, - args_str clob NULL, - ext_attrs clob NULL, - next_trigger_at date NOT NULL, - retry_count number DEFAULT 0 NOT NULL, - retry_status smallint DEFAULT 0 NOT NULL, - task_type smallint DEFAULT 1 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_task_0 - ADD CONSTRAINT pk_sj_retry_task_0 PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); - -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); - -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; - --- sj_retry_task_log -CREATE TABLE sj_retry_task_log -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_name varchar2(64) NULL, - idempotent_id varchar2(64) NULL, - biz_no varchar2(64) DEFAULT '' NULL, - executor_name varchar2(512) DEFAULT '' NULL, - args_str clob NULL, - ext_attrs clob NULL, - retry_status smallint DEFAULT 0 NOT NULL, - task_type smallint DEFAULT 1 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_task_log - ADD CONSTRAINT pk_sj_retry_task_log PRIMARY KEY (id); - -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); - -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; - --- sj_retry_task_log_message -CREATE TABLE sj_retry_task_log_message -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - unique_id varchar2(64) NULL, - message clob NULL, - log_num number DEFAULT 1 NOT NULL, - real_time number DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_task_log_message - ADD CONSTRAINT pk_sj_retry_task_log_message PRIMARY KEY (id); - -CREATE INDEX idx_sj_rt_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); -CREATE INDEX idx_sj_rt_log_message_02 ON sj_retry_task_log_message (create_dt); - -COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; -COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; -COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; -COMMENT ON COLUMN sj_retry_task_log_message.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表'; - --- sj_retry_scene_config -CREATE TABLE sj_retry_scene_config -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - scene_name varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_status smallint DEFAULT 0 NOT NULL, - max_retry_count number DEFAULT 5 NOT NULL, - back_off smallint DEFAULT 1 NOT NULL, - trigger_interval varchar2(16) DEFAULT '' NULL, - deadline_request number DEFAULT 60000 NOT NULL, - executor_timeout number DEFAULT 5 NOT NULL, - route_key smallint DEFAULT 4 NOT NULL, - description varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_scene_config - ADD CONSTRAINT pk_sj_retry_scene_config PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name); - -COMMENT ON COLUMN sj_retry_scene_config.id IS '主键'; -COMMENT ON COLUMN sj_retry_scene_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_scene_config.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_scene_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_scene_config.scene_status IS '组状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_retry_scene_config.max_retry_count IS '最大重试次数'; -COMMENT ON COLUMN sj_retry_scene_config.back_off IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; -COMMENT ON COLUMN sj_retry_scene_config.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; -COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; -COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; -COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_scene_config IS '场景配置'; - --- sj_server_node -CREATE TABLE sj_server_node -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - host_id varchar2(64) NULL, - host_ip varchar2(64) NULL, - host_port number NOT NULL, - expire_at date NOT NULL, - node_type smallint NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_server_node - ADD CONSTRAINT pk_sj_server_node PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip); - -CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name); -CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type); - -COMMENT ON COLUMN sj_server_node.id IS '主键'; -COMMENT ON COLUMN sj_server_node.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_server_node.group_name IS '组名称'; -COMMENT ON COLUMN sj_server_node.host_id IS '主机id'; -COMMENT ON COLUMN sj_server_node.host_ip IS '机器ip'; -COMMENT ON COLUMN sj_server_node.host_port IS '机器端口'; -COMMENT ON COLUMN sj_server_node.expire_at IS '过期时间'; -COMMENT ON COLUMN sj_server_node.node_type IS '节点类型 1、客户端 2、是服务端'; -COMMENT ON COLUMN sj_server_node.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_server_node.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_server_node.update_dt IS '修改时间'; -COMMENT ON TABLE sj_server_node IS '服务器节点'; - --- sj_distributed_lock -CREATE TABLE sj_distributed_lock -( - name varchar2(64) NOT NULL, - lock_until timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL, - locked_at timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL, - locked_by varchar2(255) NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_distributed_lock - ADD CONSTRAINT pk_sj_distributed_lock PRIMARY KEY (name); - -COMMENT ON COLUMN sj_distributed_lock.name IS '锁名称'; -COMMENT ON COLUMN sj_distributed_lock.lock_until IS '锁定时长'; -COMMENT ON COLUMN sj_distributed_lock.locked_at IS '锁定时间'; -COMMENT ON COLUMN sj_distributed_lock.locked_by IS '锁定者'; -COMMENT ON COLUMN sj_distributed_lock.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_distributed_lock.update_dt IS '修改时间'; -COMMENT ON TABLE sj_distributed_lock IS '锁定表'; - --- sj_system_user -CREATE TABLE sj_system_user -( - id number GENERATED ALWAYS AS IDENTITY, - username varchar2(64) NULL, - password varchar2(128) NULL, - role smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_system_user - ADD CONSTRAINT pk_sj_system_user PRIMARY KEY (id); - -COMMENT ON COLUMN sj_system_user.id IS '主键'; -COMMENT ON COLUMN sj_system_user.username IS '账号'; -COMMENT ON COLUMN sj_system_user.password IS '密码'; -COMMENT ON COLUMN sj_system_user.role IS '角色：1-普通用户、2-管理员'; -COMMENT ON COLUMN sj_system_user.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_system_user.update_dt IS '修改时间'; -COMMENT ON TABLE sj_system_user IS '系统用户表'; - --- pwd: admin -INSERT INTO sj_system_user(username, password, role, create_dt, update_dt) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, sysdate, sysdate); - --- sj_system_user_permission -CREATE TABLE sj_system_user_permission -( - id number GENERATED ALWAYS AS IDENTITY, - group_name varchar2(64) NULL, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - system_user_id number NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_system_user_permission - ADD CONSTRAINT pk_sj_system_user_permission PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_su_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id); - -COMMENT ON COLUMN sj_system_user_permission.id IS '主键'; -COMMENT ON COLUMN sj_system_user_permission.group_name IS '组名称'; -COMMENT ON COLUMN sj_system_user_permission.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_system_user_permission.system_user_id IS '系统用户id'; -COMMENT ON COLUMN sj_system_user_permission.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_system_user_permission.update_dt IS '修改时间'; -COMMENT ON TABLE sj_system_user_permission IS '系统用户权限表'; - --- sj_sequence_alloc -CREATE TABLE sj_sequence_alloc -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) DEFAULT '' NULL, - max_id number DEFAULT 1 NOT NULL, - step number DEFAULT 100 NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_sequence_alloc - ADD CONSTRAINT pk_sj_sequence_alloc PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name); - -COMMENT ON COLUMN sj_sequence_alloc.id IS '主键'; -COMMENT ON COLUMN sj_sequence_alloc.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_sequence_alloc.group_name IS '组名称'; -COMMENT ON COLUMN sj_sequence_alloc.max_id IS '最大id'; -COMMENT ON COLUMN sj_sequence_alloc.step IS '步长'; -COMMENT ON COLUMN sj_sequence_alloc.update_dt IS '更新时间'; -COMMENT ON TABLE sj_sequence_alloc IS '号段模式序号ID分配表'; - --- sj_job -CREATE TABLE sj_job -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - job_name varchar2(64) NULL, - args_str clob DEFAULT NULL NULL, - args_type smallint DEFAULT 1 NOT NULL, - next_trigger_at number NOT NULL, - job_status smallint DEFAULT 1 NOT NULL, - task_type smallint DEFAULT 1 NOT NULL, - route_key smallint DEFAULT 4 NOT NULL, - executor_type smallint DEFAULT 1 NOT NULL, - executor_info varchar2(255) DEFAULT NULL NULL, - trigger_type smallint NOT NULL, - trigger_interval varchar2(255) NULL, - block_strategy smallint DEFAULT 1 NOT NULL, - executor_timeout number DEFAULT 0 NOT NULL, - max_retry_times number DEFAULT 0 NOT NULL, - parallel_num number DEFAULT 1 NOT NULL, - retry_interval number DEFAULT 0 NOT NULL, - bucket_index number DEFAULT 0 NOT NULL, - resident smallint DEFAULT 0 NOT NULL, - description varchar2(256) DEFAULT '' NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_job - ADD CONSTRAINT pk_sj_job PRIMARY KEY (id); - -CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name); -CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index); -CREATE INDEX idx_sj_job_03 ON sj_job (create_dt); - -COMMENT ON COLUMN sj_job.id IS '主键'; -COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job.group_name IS '组名称'; -COMMENT ON COLUMN sj_job.job_name IS '名称'; -COMMENT ON COLUMN sj_job.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_job.args_type IS '参数类型 '; -COMMENT ON COLUMN sj_job.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_job.job_status IS '任务状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_job.task_type IS '任务类型 1、集群 2、广播 3、切片'; -COMMENT ON COLUMN sj_job.route_key IS '路由策略'; -COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; -COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; -COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; -COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; -COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; -COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; -COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; -COMMENT ON COLUMN sj_job.description IS '描述'; -COMMENT ON COLUMN sj_job.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_job.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job IS '任务信息'; - -INSERT INTO sj_job(namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, description, ext_attrs, deleted, create_dt, update_dt) VALUES ('dev', 'ruoyi_group', 'demo-job', NULL, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', 0, sysdate, sysdate); - --- sj_job_log_message -CREATE TABLE sj_job_log_message -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - job_id number NOT NULL, - task_batch_id number NOT NULL, - task_id number NOT NULL, - message clob NULL, - log_num number DEFAULT 1 NOT NULL, - real_time number DEFAULT 0 NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_job_log_message - ADD CONSTRAINT pk_sj_job_log_message PRIMARY KEY (id); - -CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id); -CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt); -CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name); - -COMMENT ON COLUMN sj_job_log_message.id IS '主键'; -COMMENT ON COLUMN sj_job_log_message.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_log_message.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_job_log_message.task_batch_id IS '任务批次id'; -COMMENT ON COLUMN sj_job_log_message.task_id IS '调度任务id'; -COMMENT ON COLUMN sj_job_log_message.message IS '调度信息'; -COMMENT ON COLUMN sj_job_log_message.log_num IS '日志数量'; -COMMENT ON COLUMN sj_job_log_message.real_time IS '上报时间'; -COMMENT ON COLUMN sj_job_log_message.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_log_message.create_dt IS '创建时间'; -COMMENT ON TABLE sj_job_log_message IS '调度日志'; - --- sj_job_task -CREATE TABLE sj_job_task -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - job_id number NOT NULL, - task_batch_id number NOT NULL, - parent_id number DEFAULT 0 NOT NULL, - task_status smallint DEFAULT 0 NOT NULL, - retry_count number DEFAULT 0 NOT NULL, - mr_stage smallint DEFAULT NULL NULL, - leaf smallint DEFAULT '1' NOT NULL, - task_name varchar2(255) DEFAULT '' NULL, - client_info varchar2(128) DEFAULT NULL NULL, - wf_context clob DEFAULT NULL NULL, - result_message clob NULL, - args_str clob DEFAULT NULL NULL, - args_type smallint DEFAULT 1 NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_job_task - ADD CONSTRAINT pk_sj_job_task PRIMARY KEY (id); - -CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status); -CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt); -CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name); - -COMMENT ON COLUMN sj_job_task.id IS '主键'; -COMMENT ON COLUMN sj_job_task.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_task.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_task.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_job_task.task_batch_id IS '调度任务id'; -COMMENT ON COLUMN sj_job_task.parent_id IS '父执行器id'; -COMMENT ON COLUMN sj_job_task.task_status IS '执行的状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_job_task.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_job_task.mr_stage IS '动态分片所处阶段 1:map 2:reduce 3:mergeReduce'; -COMMENT ON COLUMN sj_job_task.leaf IS '叶子节点'; -COMMENT ON COLUMN sj_job_task.task_name IS '任务名称'; -COMMENT ON COLUMN sj_job_task.client_info IS '客户端地址 clientId#ip:port'; -COMMENT ON COLUMN sj_job_task.wf_context IS '工作流全局上下文'; -COMMENT ON COLUMN sj_job_task.result_message IS '执行结果'; -COMMENT ON COLUMN sj_job_task.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_job_task.args_type IS '参数类型 '; -COMMENT ON COLUMN sj_job_task.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_task.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_task.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_task IS '任务实例'; - --- sj_job_task_batch -CREATE TABLE sj_job_task_batch -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - job_id number NOT NULL, - workflow_node_id number DEFAULT 0 NOT NULL, - parent_workflow_node_id number DEFAULT 0 NOT NULL, - workflow_task_batch_id number DEFAULT 0 NOT NULL, - task_batch_status smallint DEFAULT 0 NOT NULL, - operation_reason smallint DEFAULT 0 NOT NULL, - execution_at number DEFAULT 0 NOT NULL, - system_task_type smallint DEFAULT 3 NOT NULL, - parent_id varchar2(64) DEFAULT '' NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_job_task_batch - ADD CONSTRAINT pk_sj_job_task_batch PRIMARY KEY (id); - -CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status); -CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt); -CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name); -CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id); - -COMMENT ON COLUMN sj_job_task_batch.id IS '主键'; -COMMENT ON COLUMN sj_job_task_batch.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_task_batch.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_task_batch.job_id IS '任务id'; -COMMENT ON COLUMN sj_job_task_batch.workflow_node_id IS '工作流节点id'; -COMMENT ON COLUMN sj_job_task_batch.parent_workflow_node_id IS '工作流任务父批次id'; -COMMENT ON COLUMN sj_job_task_batch.workflow_task_batch_id IS '工作流任务批次id'; -COMMENT ON COLUMN sj_job_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_job_task_batch.operation_reason IS '操作原因'; -COMMENT ON COLUMN sj_job_task_batch.execution_at IS '任务执行时间'; -COMMENT ON COLUMN sj_job_task_batch.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_job_task_batch.parent_id IS '父节点'; -COMMENT ON COLUMN sj_job_task_batch.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_task_batch.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_job_task_batch.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_task_batch IS '任务批次'; - --- sj_job_summary -CREATE TABLE sj_job_summary -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) DEFAULT '' NULL, - business_id number NOT NULL, - system_task_type smallint DEFAULT 3 NOT NULL, - trigger_at date DEFAULT CURRENT_TIMESTAMP NOT NULL, - success_num number DEFAULT 0 NOT NULL, - fail_num number DEFAULT 0 NOT NULL, - fail_reason varchar2(512) DEFAULT '' NULL, - stop_num number DEFAULT 0 NOT NULL, - stop_reason varchar2(512) DEFAULT '' NULL, - cancel_num number DEFAULT 0 NOT NULL, - cancel_reason varchar2(512) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_job_summary - ADD CONSTRAINT pk_sj_job_summary PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id); - -CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id); - -COMMENT ON COLUMN sj_job_summary.id IS '主键'; -COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; -COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; -COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; -COMMENT ON COLUMN sj_job_summary.fail_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.fail_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.stop_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.stop_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.cancel_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.cancel_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_summary.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_summary IS 'DashBoard_Job'; - --- sj_retry_summary -CREATE TABLE sj_retry_summary -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) DEFAULT '' NULL, - scene_name varchar2(50) DEFAULT '' NULL, - trigger_at date DEFAULT CURRENT_TIMESTAMP NOT NULL, - running_num number DEFAULT 0 NOT NULL, - finish_num number DEFAULT 0 NOT NULL, - max_count_num number DEFAULT 0 NOT NULL, - suspend_num number DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_retry_summary - ADD CONSTRAINT pk_sj_retry_summary PRIMARY KEY (id); - -CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at); - -CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at); - -COMMENT ON COLUMN sj_retry_summary.id IS '主键'; -COMMENT ON COLUMN sj_retry_summary.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_summary.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_summary.trigger_at IS '统计时间'; -COMMENT ON COLUMN sj_retry_summary.running_num IS '重试中-日志数量'; -COMMENT ON COLUMN sj_retry_summary.finish_num IS '重试完成-日志数量'; -COMMENT ON COLUMN sj_retry_summary.max_count_num IS '重试到达最大次数-日志数量'; -COMMENT ON COLUMN sj_retry_summary.suspend_num IS '暂停重试-日志数量'; -COMMENT ON COLUMN sj_retry_summary.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_summary.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_summary IS 'DashBoard_Retry'; - --- sj_workflow -CREATE TABLE sj_workflow -( - id number GENERATED ALWAYS AS IDENTITY, - workflow_name varchar2(64) NULL, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - workflow_status smallint DEFAULT 1 NOT NULL, - trigger_type smallint NOT NULL, - trigger_interval varchar2(255) NULL, - next_trigger_at number NOT NULL, - block_strategy smallint DEFAULT 1 NOT NULL, - executor_timeout number DEFAULT 0 NOT NULL, - description varchar2(256) DEFAULT '' NULL, - flow_info clob DEFAULT NULL NULL, - wf_context clob DEFAULT NULL NULL, - bucket_index number DEFAULT 0 NOT NULL, - version number NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_workflow - ADD CONSTRAINT pk_sj_workflow PRIMARY KEY (id); - -CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt); -CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow.id IS '主键'; -COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称'; -COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; -COMMENT ON COLUMN sj_workflow.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_workflow.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_workflow.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; -COMMENT ON COLUMN sj_workflow.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_workflow.description IS '描述'; -COMMENT ON COLUMN sj_workflow.flow_info IS '流程信息'; -COMMENT ON COLUMN sj_workflow.wf_context IS '上下文'; -COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_workflow.version IS '版本号'; -COMMENT ON COLUMN sj_workflow.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow IS '工作流'; - --- sj_workflow_node -CREATE TABLE sj_workflow_node -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - node_name varchar2(64) NULL, - group_name varchar2(64) NULL, - job_id number NOT NULL, - workflow_id number NOT NULL, - node_type smallint DEFAULT 1 NOT NULL, - expression_type smallint DEFAULT 0 NOT NULL, - fail_strategy smallint DEFAULT 1 NOT NULL, - workflow_node_status smallint DEFAULT 1 NOT NULL, - priority_level number DEFAULT 1 NOT NULL, - node_info clob DEFAULT NULL NULL, - version number NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_workflow_node - ADD CONSTRAINT pk_sj_workflow_node PRIMARY KEY (id); - -CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt); -CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow_node.id IS '主键'; -COMMENT ON COLUMN sj_workflow_node.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow_node.node_name IS '节点名称'; -COMMENT ON COLUMN sj_workflow_node.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow_node.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_workflow_node.workflow_id IS '工作流ID'; -COMMENT ON COLUMN sj_workflow_node.node_type IS '1、任务节点 2、条件节点'; -COMMENT ON COLUMN sj_workflow_node.expression_type IS '1、SpEl、2、Aviator 3、QL'; -COMMENT ON COLUMN sj_workflow_node.fail_strategy IS '失败策略 1、跳过 2、阻塞'; -COMMENT ON COLUMN sj_workflow_node.workflow_node_status IS '工作流节点状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_workflow_node.priority_level IS '优先级'; -COMMENT ON COLUMN sj_workflow_node.node_info IS '节点信息 '; -COMMENT ON COLUMN sj_workflow_node.version IS '版本号'; -COMMENT ON COLUMN sj_workflow_node.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow_node.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow_node.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow_node.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_node IS '工作流节点'; - --- sj_workflow_task_batch -CREATE TABLE sj_workflow_task_batch -( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - workflow_id number NOT NULL, - task_batch_status smallint DEFAULT 0 NOT NULL, - operation_reason smallint DEFAULT 0 NOT NULL, - flow_info clob DEFAULT NULL NULL, - wf_context clob DEFAULT NULL NULL, - execution_at number DEFAULT 0 NOT NULL, - ext_attrs varchar2(256) DEFAULT '' NULL, - version number DEFAULT 1 NOT NULL, - deleted smallint DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL -); - -ALTER TABLE sj_workflow_task_batch - ADD CONSTRAINT pk_sj_workflow_task_batch PRIMARY KEY (id); - -CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status); -CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt); -CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow_task_batch.id IS '主键'; -COMMENT ON COLUMN sj_workflow_task_batch.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow_task_batch.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow_task_batch.workflow_id IS '工作流任务id'; -COMMENT ON COLUMN sj_workflow_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_workflow_task_batch.operation_reason IS '操作原因'; -COMMENT ON COLUMN sj_workflow_task_batch.flow_info IS '流程信息'; -COMMENT ON COLUMN sj_workflow_task_batch.wf_context IS '全局上下文'; -COMMENT ON COLUMN sj_workflow_task_batch.execution_at IS '任务执行时间'; -COMMENT ON COLUMN sj_workflow_task_batch.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; -COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; diff --git a/template/script/sql/oracle/oracle_ry_vue_5.X.sql b/template/script/sql/oracle/oracle_ry_vue_5.X.sql deleted file mode 100644 index 0aed89d..0000000 --- a/template/script/sql/oracle/oracle_ry_vue_5.X.sql +++ /dev/null @@ -1,1364 +0,0 @@ --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -create table sys_social -( - id number(20) not null, - user_id number(20) not null, - tenant_id varchar2(20) default null, - auth_id varchar2(255) not null, - source varchar2(255) not null, - open_id varchar2(255) default null, - user_name varchar2(30) not null, - nick_name varchar2(30) default '', - email varchar2(255) default '', - avatar varchar2(500) default '', - access_token varchar2(255) not null, - expire_in number(20) default null, - refresh_token varchar2(255) default null, - access_code varchar2(255) default null, - union_id varchar2(255) default null, - scope varchar2(255) default null, - token_type varchar2(255) default null, - id_token varchar2(2000) default null, - mac_algorithm varchar2(255) default null, - mac_key varchar2(255) default null, - code varchar2(255) default null, - oauth_token varchar2(255) default null, - oauth_token_secret varchar2(255) default null, - create_dept number(20), - create_by number(20), - create_time date, - update_by number(20), - update_time date, - del_flag char(1) default '0' -); - -alter table sys_social add constraint pk_sys_social primary key (id); - -comment on table sys_social is '社会化关系表'; -comment on column sys_social.id is '主键'; -comment on column sys_social.user_id is '用户ID'; -comment on column sys_social.tenant_id is '租户id'; -comment on column sys_social.auth_id is '平台+平台唯一id'; -comment on column sys_social.source is '用户来源'; -comment on column sys_social.open_id is '平台编号唯一id'; -comment on column sys_social.user_name is '登录账号'; -comment on column sys_social.nick_name is '用户昵称'; -comment on column sys_social.email is '用户邮箱'; -comment on column sys_social.avatar is '头像地址'; -comment on column sys_social.access_token is '用户的授权令牌'; -comment on column sys_social.expire_in is '用户的授权令牌的有效期，部分平台可能没有'; -comment on column sys_social.refresh_token is '刷新令牌，部分平台可能没有'; -comment on column sys_social.access_code is '平台的授权信息，部分平台可能没有'; -comment on column sys_social.union_id is '用户的 unionid'; -comment on column sys_social.scope is '授予的权限，部分平台可能没有'; -comment on column sys_social.token_type is '个别平台的授权信息，部分平台可能没有'; -comment on column sys_social.id_token is 'id token，部分平台可能没有'; -comment on column sys_social.mac_algorithm is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.mac_key is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.code is '用户的授权code，部分平台可能没有'; -comment on column sys_social.oauth_token is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.create_dept is '创建部门'; -comment on column sys_social.create_by is '创建者'; -comment on column sys_social.create_time is '创建时间'; -comment on column sys_social.update_by is '更新者'; -comment on column sys_social.update_time is '更新时间'; -comment on column sys_social.del_flag is '删除标志（0代表存在 2代表删除）'; - --- ---------------------------- --- 租户表 --- ---------------------------- -create table sys_tenant ( - id number(20) not null, - tenant_id varchar2(20) not null, - contact_user_name varchar2(20) default '', - contact_phone varchar2(20) default '', - company_name varchar2(50) default '', - license_number varchar2(30) default '', - address varchar2(200) default '', - intro varchar2(200) default '', - domain varchar2(200) default '', - remark varchar2(200) default '', - package_id number(20) default null, - expire_time date default null, - account_count number(4) default -1, - status char(1) default '0', - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_tenant add constraint pk_sys_tenant primary key (id); - -comment on table sys_tenant is '租户表'; -comment on column sys_tenant.tenant_id is '租户编号'; -comment on column sys_tenant.contact_phone is '联系电话'; -comment on column sys_tenant.company_name is '企业名称'; -comment on column sys_tenant.company_name is '联系人'; -comment on column sys_tenant.license_number is '统一社会信用代码'; -comment on column sys_tenant.address is '地址'; -comment on column sys_tenant.intro is '企业简介'; -comment on column sys_tenant.remark is '备注'; -comment on column sys_tenant.package_id is '租户套餐编号'; -comment on column sys_tenant.expire_time is '过期时间'; -comment on column sys_tenant.account_count is '用户数量（-1不限制）'; -comment on column sys_tenant.status is '租户状态（0正常 1停用）'; -comment on column sys_tenant.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_tenant.create_dept is '创建部门'; -comment on column sys_tenant.create_by is '创建者'; -comment on column sys_tenant.create_time is '创建时间'; -comment on column sys_tenant.update_by is '更新者'; -comment on column sys_tenant.update_time is '更新时间'; - --- ---------------------------- --- 初始化-租户表数据 --- ---------------------------- - -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate, null, null); - - --- ---------------------------- --- 租户套餐表 --- ---------------------------- -create table sys_tenant_package ( - package_id number(20) not null, - package_name varchar2(20) default '', - menu_ids varchar2(3000) default '', - remark varchar2(200) default '', - menu_check_strictly number(1) default 1, - status char(1) default '0', - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_tenant_package add constraint pk_sys_tenant_package primary key (package_id); - -comment on table sys_tenant_package is '租户套餐表'; -comment on column sys_tenant_package.package_id is '租户套餐id'; -comment on column sys_tenant_package.package_name is '套餐名称'; -comment on column sys_tenant_package.menu_ids is '关联菜单id'; -comment on column sys_tenant_package.remark is '备注'; -comment on column sys_tenant_package.status is '状态（0正常 1停用）'; -comment on column sys_tenant_package.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_tenant_package.create_dept is '创建部门'; -comment on column sys_tenant_package.create_by is '创建者'; -comment on column sys_tenant_package.create_time is '创建时间'; -comment on column sys_tenant_package.update_by is '更新者'; -comment on column sys_tenant_package.update_time is '更新时间'; - - --- ---------------------------- --- 1、部门表 --- ---------------------------- -create table sys_dept ( - dept_id number(20) not null, - tenant_id varchar2(20) default '000000', - parent_id number(20) default 0, - ancestors varchar2(500) default '', - dept_name varchar2(30) default '', - dept_category varchar2(100) default null, - order_num number(4) default 0, - leader number(20) default null, - phone varchar2(11) default null, - email varchar2(50) default null, - status char(1) default '0', - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_dept add constraint pk_sys_dept primary key (dept_id); - -comment on table sys_dept is '部门表'; -comment on column sys_dept.dept_id is '部门id'; -comment on column sys_dept.tenant_id is '租户编号'; -comment on column sys_dept.parent_id is '父部门id'; -comment on column sys_dept.ancestors is '祖级列表'; -comment on column sys_dept.dept_name is '部门名称'; -comment on column sys_dept.dept_category is '部门类别编码'; -comment on column sys_dept.order_num is '显示顺序'; -comment on column sys_dept.leader is '负责人'; -comment on column sys_dept.phone is '联系电话'; -comment on column sys_dept.email is '邮箱'; -comment on column sys_dept.status is '部门状态（0正常 1停用）'; -comment on column sys_dept.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_dept.create_dept is '创建部门'; -comment on column sys_dept.create_by is '创建者'; -comment on column sys_dept.create_time is '创建时间'; -comment on column sys_dept.update_by is '更新者'; -comment on column sys_dept.update_time is '更新时间'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- - -insert into sys_dept values(100, '000000', 0, '0', 'XXX科技', null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(101, '000000', 100, '0,100', '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(102, '000000', 100, '0,100', '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(103, '000000', 101, '0,100,101', '研发部门', null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(104, '000000', 101, '0,100,101', '市场部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(105, '000000', 101, '0,100,101', '测试部门', null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(106, '000000', 101, '0,100,101', '财务部门', null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(107, '000000', 101, '0,100,101', '运维部门', null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(108, '000000', 102, '0,100,102', '市场部门', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); -insert into sys_dept values(109, '000000', 102, '0,100,102', '财务部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null); - - --- ---------------------------- --- 2、用户信息表 --- ---------------------------- -create table sys_user ( - user_id number(20) not null, - tenant_id varchar2(20) default '000000', - dept_id number(20) default null, - user_name varchar2(40) not null, - nick_name varchar2(40) not null, - user_type varchar2(10) default 'sys_user', - email varchar2(50) default '', - phonenumber varchar2(11) default '', - sex char(1) default '0', - avatar number(20) default null, - password varchar2(100) default '', - status char(1) default '0', - del_flag char(1) default '0', - login_ip varchar2(128) default '', - login_date date, - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default '' -); - -alter table sys_user add constraint pk_sys_user primary key (user_id); - -comment on table sys_user is '用户信息表'; -comment on column sys_user.user_id is '用户ID'; -comment on column sys_user.tenant_id is '租户编号'; -comment on column sys_user.dept_id is '部门ID'; -comment on column sys_user.user_name is '用户账号'; -comment on column sys_user.nick_name is '用户昵称'; -comment on column sys_user.user_type is '用户类型（sys_user系统用户）'; -comment on column sys_user.email is '用户邮箱'; -comment on column sys_user.phonenumber is '手机号码'; -comment on column sys_user.sex is '用户性别（0男 1女 2未知）'; -comment on column sys_user.avatar is '头像路径'; -comment on column sys_user.password is '密码'; -comment on column sys_user.status is '帐号状态（0正常 1停用）'; -comment on column sys_user.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_user.login_ip is '最后登录IP'; -comment on column sys_user.login_date is '最后登录时间'; -comment on column sys_user.create_dept is '创建部门'; -comment on column sys_user.create_by is '创建者'; -comment on column sys_user.create_time is '创建时间'; -comment on column sys_user.update_by is '更新者'; -comment on column sys_user.update_time is '更新时间'; -comment on column sys_user.remark is '备注'; - --- ---------------------------- --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '管理员'); -insert into sys_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, ''); -insert into sys_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, ''); - --- ---------------------------- --- 3、岗位信息表 --- ---------------------------- -create table sys_post ( - post_id number(20) not null, - tenant_id varchar2(20) default '000000', - dept_id number(20) not null, - post_code varchar2(64) not null, - post_category varchar2(64) default null, - post_name varchar2(50) not null, - post_sort number(4) not null, - status char(1) not null, - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) -); - -alter table sys_post add constraint pk_sys_post primary key (post_id); - -comment on table sys_post is '岗位信息表'; -comment on column sys_post.post_id is '岗位ID'; -comment on column sys_post.tenant_id is '租户编号'; -comment on column sys_post.dept_id is '部门id'; -comment on column sys_post.post_code is '岗位编码'; -comment on column sys_post.post_category is '岗位类别编码'; -comment on column sys_post.post_name is '岗位名称'; -comment on column sys_post.post_sort is '显示顺序'; -comment on column sys_post.status is '状态（0正常 1停用）'; -comment on column sys_post.create_dept is '创建部门'; -comment on column sys_post.create_by is '创建者'; -comment on column sys_post.create_time is '创建时间'; -comment on column sys_post.update_by is '更新者'; -comment on column sys_post.update_time is '更新时间'; -comment on column sys_post.remark is '备注'; - --- ---------------------------- --- 初始化-岗位信息表数据 --- ---------------------------- -insert into sys_post values(1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, sysdate, null, null, ''); -insert into sys_post values(2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, sysdate, null, null, ''); -insert into sys_post values(3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, sysdate, null, null, ''); -insert into sys_post values(4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate, null, null, ''); - - --- ---------------------------- --- 4、角色信息表 --- ---------------------------- -create table sys_role ( - role_id number(20) not null, - tenant_id varchar2(20) default '000000', - role_name varchar2(30) not null, - role_key varchar2(100) not null, - role_sort number(4) not null, - data_scope char(1) default '1', - menu_check_strictly number(1) default 1, - dept_check_strictly number(1) default 1, - status char(1) not null, - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default null -); - -alter table sys_role add constraint pk_sys_role primary key (role_id); - -comment on table sys_role is '角色信息表'; -comment on column sys_role.role_id is '角色ID'; -comment on column sys_role.tenant_id is '租户编号'; -comment on column sys_role.role_name is '角色名称'; -comment on column sys_role.role_key is '角色权限字符串'; -comment on column sys_role.role_sort is '显示顺序'; -comment on column sys_role.data_scope is '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）'; -comment on column sys_role.menu_check_strictly is '菜单树选择项是否关联显示'; -comment on column sys_role.dept_check_strictly is '部门树选择项是否关联显示'; -comment on column sys_role.status is '角色状态（0正常 1停用）'; -comment on column sys_role.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_role.create_dept is '创建部门'; -comment on column sys_role.create_by is '创建者'; -comment on column sys_role.create_time is '创建时间'; -comment on column sys_role.update_by is '更新者'; -comment on column sys_role.update_time is '更新时间'; -comment on column sys_role.remark is '备注'; - --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_role values('1', '000000', '超级管理员', 'superadmin', 1, 1, 1, 1, '0', '0', 103, 1, sysdate, null, null, '超级管理员'); -insert into sys_role values('3', '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate, null, null, null); -insert into sys_role values('4', '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate, null, null, null); - --- ---------------------------- --- 5、菜单权限表 --- ---------------------------- -create table sys_menu ( - menu_id number(20) not null, - menu_name varchar2(50) not null, - parent_id number(20) default 0, - order_num number(4) default 0, - path varchar2(200) default '', - component varchar2(255) default null, - query_param varchar2(255) default null, - is_frame number(1) default 1, - is_cache number(1) default 0, - menu_type char(1) default '', - visible char(1) default 0, - status char(1) default 0, - perms varchar2(100) default null, - icon varchar2(100) default '#', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date , - remark varchar2(500) default '' -); - -alter table sys_menu add constraint pk_sys_menu primary key (menu_id); - -comment on table sys_menu is '菜单权限表'; -comment on column sys_menu.menu_id is '菜单ID'; -comment on column sys_menu.menu_name is '菜单名称'; -comment on column sys_menu.parent_id is '父菜单ID'; -comment on column sys_menu.order_num is '显示顺序'; -comment on column sys_menu.path is '请求地址'; -comment on column sys_menu.component is '路由地址'; -comment on column sys_menu.query_param is '路由参数'; -comment on column sys_menu.is_frame is '是否为外链（0是 1否）'; -comment on column sys_menu.is_cache is '是否缓存（0缓存 1不缓存）'; -comment on column sys_menu.menu_type is '菜单类型（M目录 C菜单 F按钮）'; -comment on column sys_menu.visible is '显示状态（0显示 1隐藏）'; -comment on column sys_menu.status is '菜单状态（0正常 1停用）'; -comment on column sys_menu.perms is '权限标识'; -comment on column sys_menu.icon is '菜单图标'; -comment on column sys_menu.create_dept is '创建部门'; -comment on column sys_menu.create_by is '创建者'; -comment on column sys_menu.create_time is '创建时间'; -comment on column sys_menu.update_by is '更新者'; -comment on column sys_menu.update_time is '更新时间'; -comment on column sys_menu.remark is '备注'; - --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, sysdate, null, null, '系统管理目录'); -insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate, null, null, '租户管理目录'); -insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate, null, null, '系统监控目录'); -insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate, null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate, null, null, 'RuoYi-Vue-Plus官网地址'); -insert into sys_menu values('5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', null, 'star', 103, 1, sysdate, null, null, ''); --- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate, null, null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, sysdate, null, null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, sysdate, null, null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, sysdate, null, null, '部门管理菜单'); -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, sysdate, null, null, '岗位管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, sysdate, null, null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, sysdate, null, null, '参数设置菜单'); -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, sysdate, null, null, '通知公告菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, sysdate, null, null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate, null, null, '在线用户菜单'); -insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate, null, null, '缓存监控菜单'); -insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate, null, null, '代码生成菜单'); -insert into sys_menu values('121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, sysdate, null, null, '租户管理菜单'); -insert into sys_menu values('122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, sysdate, null, null, '租户套餐管理菜单'); -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate, null, null, '客户端管理菜单'); --- springboot-admin监控 -insert into sys_menu values('117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, sysdate, null, null, 'Admin监控菜单'); --- oss菜单 -insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate, null, null, '文件管理菜单'); --- snail-job server控制台 -insert into sys_menu values('120', '任务调度中心', '2', '5', 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, sysdate, null, null, 'snailjob控制台菜单'); - --- 三级菜单 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate, null, null, '操作日志菜单'); -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, sysdate, null, null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_menu values('1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, sysdate, null, null, ''); --- 角色管理按钮 -insert into sys_menu values('1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, sysdate, null, null, ''); --- 菜单管理按钮 -insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, sysdate, null, null, ''); --- 部门管理按钮 -insert into sys_menu values('1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, sysdate, null, null, ''); --- 岗位管理按钮 -insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, sysdate, null, null, ''); --- 字典管理按钮 -insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, sysdate, null, null, ''); --- 参数设置按钮 -insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, sysdate, null, null, ''); --- 通知公告按钮 -insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, sysdate, null, null, ''); --- 操作日志按钮 -insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, sysdate, null, null, ''); --- 登录日志按钮 -insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, sysdate, null, null, ''); --- 在线用户按钮 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate, null, null, ''); --- 代码生成按钮 -insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, sysdate, null, null, ''); --- oss相关按钮 -insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate, null, null, ''); --- 租户管理相关按钮 -insert into sys_menu values('1606', '租户查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1607', '租户新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1608', '租户修改', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1609', '租户删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1610', '租户导出', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, sysdate, null, null, ''); --- 租户套餐管理相关按钮 -insert into sys_menu values('1611', '租户套餐查询', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1612', '租户套餐新增', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1613', '租户套餐修改', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1614', '租户套餐删除', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1615', '租户套餐导出', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, sysdate, null, null, ''); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate, null, null, ''); --- 测试菜单 -insert into sys_menu values('1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate, null, null, '测试单表菜单'); -insert into sys_menu values('1501', '测试单表查询', '1500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1502', '测试单表新增', '1500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1503', '测试单表修改', '1500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1504', '测试单表删除', '1500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1505', '测试单表导出', '1500', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate, null, null, '测试树表菜单'); -insert into sys_menu values('1507', '测试树表查询', '1506', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1508', '测试树表新增', '1506', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1509', '测试树表修改', '1506', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate, null, null, ''); - - --- ---------------------------- --- 6、用户和角色关联表 用户N-1角色 --- ---------------------------- -create table sys_user_role ( - user_id number(20) not null, - role_id number(20) not null -); - -alter table sys_user_role add constraint pk_sys_user_role primary key (user_id, role_id); - -comment on table sys_user_role is '用户和角色关联表'; -comment on column sys_user_role.user_id is '用户ID'; -comment on column sys_user_role.role_id is '角色ID'; - --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('3', '3'); -insert into sys_user_role values ('4', '4'); - --- ---------------------------- --- 7、角色和菜单关联表 角色1-N菜单 --- ---------------------------- -create table sys_role_menu ( - role_id number(20) not null, - menu_id number(20) not null -); - -alter table sys_role_menu add constraint pk_sys_role_menu primary key (role_id, menu_id); - -comment on table sys_role_menu is '角色和菜单关联表'; -comment on column sys_role_menu.role_id is '角色ID'; -comment on column sys_role_menu.menu_id is '菜单ID'; - --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -insert into sys_role_menu values ('3', '1'); -insert into sys_role_menu values ('3', '5'); -insert into sys_role_menu values ('3', '100'); -insert into sys_role_menu values ('3', '101'); -insert into sys_role_menu values ('3', '102'); -insert into sys_role_menu values ('3', '103'); -insert into sys_role_menu values ('3', '104'); -insert into sys_role_menu values ('3', '105'); -insert into sys_role_menu values ('3', '106'); -insert into sys_role_menu values ('3', '107'); -insert into sys_role_menu values ('3', '108'); -insert into sys_role_menu values ('3', '500'); -insert into sys_role_menu values ('3', '501'); -insert into sys_role_menu values ('3', '1001'); -insert into sys_role_menu values ('3', '1002'); -insert into sys_role_menu values ('3', '1003'); -insert into sys_role_menu values ('3', '1004'); -insert into sys_role_menu values ('3', '1005'); -insert into sys_role_menu values ('3', '1006'); -insert into sys_role_menu values ('3', '1007'); -insert into sys_role_menu values ('3', '1008'); -insert into sys_role_menu values ('3', '1009'); -insert into sys_role_menu values ('3', '1010'); -insert into sys_role_menu values ('3', '1011'); -insert into sys_role_menu values ('3', '1012'); -insert into sys_role_menu values ('3', '1013'); -insert into sys_role_menu values ('3', '1014'); -insert into sys_role_menu values ('3', '1015'); -insert into sys_role_menu values ('3', '1016'); -insert into sys_role_menu values ('3', '1017'); -insert into sys_role_menu values ('3', '1018'); -insert into sys_role_menu values ('3', '1019'); -insert into sys_role_menu values ('3', '1020'); -insert into sys_role_menu values ('3', '1021'); -insert into sys_role_menu values ('3', '1022'); -insert into sys_role_menu values ('3', '1023'); -insert into sys_role_menu values ('3', '1024'); -insert into sys_role_menu values ('3', '1025'); -insert into sys_role_menu values ('3', '1026'); -insert into sys_role_menu values ('3', '1027'); -insert into sys_role_menu values ('3', '1028'); -insert into sys_role_menu values ('3', '1029'); -insert into sys_role_menu values ('3', '1030'); -insert into sys_role_menu values ('3', '1031'); -insert into sys_role_menu values ('3', '1032'); -insert into sys_role_menu values ('3', '1033'); -insert into sys_role_menu values ('3', '1034'); -insert into sys_role_menu values ('3', '1035'); -insert into sys_role_menu values ('3', '1036'); -insert into sys_role_menu values ('3', '1037'); -insert into sys_role_menu values ('3', '1038'); -insert into sys_role_menu values ('3', '1039'); -insert into sys_role_menu values ('3', '1040'); -insert into sys_role_menu values ('3', '1041'); -insert into sys_role_menu values ('3', '1042'); -insert into sys_role_menu values ('3', '1043'); -insert into sys_role_menu values ('3', '1044'); -insert into sys_role_menu values ('3', '1045'); -insert into sys_role_menu values ('3', '1500'); -insert into sys_role_menu values ('3', '1501'); -insert into sys_role_menu values ('3', '1502'); -insert into sys_role_menu values ('3', '1503'); -insert into sys_role_menu values ('3', '1504'); -insert into sys_role_menu values ('3', '1505'); -insert into sys_role_menu values ('3', '1506'); -insert into sys_role_menu values ('3', '1507'); -insert into sys_role_menu values ('3', '1508'); -insert into sys_role_menu values ('3', '1509'); -insert into sys_role_menu values ('3', '1510'); -insert into sys_role_menu values ('3', '1511'); -insert into sys_role_menu values ('4', '5'); -insert into sys_role_menu values ('4', '1500'); -insert into sys_role_menu values ('4', '1501'); -insert into sys_role_menu values ('4', '1502'); -insert into sys_role_menu values ('4', '1503'); -insert into sys_role_menu values ('4', '1504'); -insert into sys_role_menu values ('4', '1505'); -insert into sys_role_menu values ('4', '1506'); -insert into sys_role_menu values ('4', '1507'); -insert into sys_role_menu values ('4', '1508'); -insert into sys_role_menu values ('4', '1509'); -insert into sys_role_menu values ('4', '1510'); -insert into sys_role_menu values ('4', '1511'); - --- ---------------------------- --- 8、角色和部门关联表 角色1-N部门 --- ---------------------------- -create table sys_role_dept ( - role_id number(20) not null, - dept_id number(20) not null -); - -alter table sys_role_dept add constraint pk_sys_role_dept primary key (role_id, dept_id); - -comment on table sys_role_dept is '角色和部门关联表'; -comment on column sys_role_dept.role_id is '角色ID'; -comment on column sys_role_dept.dept_id is '部门ID'; - - --- ---------------------------- --- 9、用户与岗位关联表 用户1-N岗位 --- ---------------------------- -create table sys_user_post ( - user_id number(20) not null, - post_id number(20) not null -); - -alter table sys_user_post add constraint pk_sys_user_post primary key (user_id, post_id); - -comment on table sys_user_post is '用户与岗位关联表'; -comment on column sys_user_post.user_id is '用户ID'; -comment on column sys_user_post.post_id is '岗位ID'; - --- ---------------------------- --- 初始化-用户与岗位关联表数据 --- ---------------------------- -insert into sys_user_post values ('1', '1'); - --- ---------------------------- --- 10、操作日志记录 --- ---------------------------- -create table sys_oper_log ( - oper_id number(20) not null, - tenant_id varchar2(20) default '000000', - title varchar2(50) default '', - business_type number(2) default 0, - method varchar2(100) default '', - request_method varchar2(10) default '', - operator_type number(1) default 0, - oper_name varchar2(50) default '', - dept_name varchar2(50) default '', - oper_url varchar2(255) default '', - oper_ip varchar2(128) default '', - oper_location varchar2(255) default '', - oper_param varchar2(2100) default '', - json_result varchar2(2100) default '', - status number(1) default 0, - error_msg varchar2(2100) default '', - oper_time date, - cost_time number(20) default 0 -); - -alter table sys_oper_log add constraint pk_sys_oper_log primary key (oper_id); -create index idx_sys_oper_log_bt on sys_oper_log (business_type); -create index idx_sys_oper_log_s on sys_oper_log (status); -create index idx_sys_oper_log_ot on sys_oper_log (oper_time); - -comment on table sys_oper_log is '操作日志记录'; -comment on column sys_oper_log.oper_id is '日志主键'; -comment on column sys_oper_log.tenant_id is '租户编号'; -comment on column sys_oper_log.title is '模块标题'; -comment on column sys_oper_log.business_type is '业务类型（0其它 1新增 2修改 3删除）'; -comment on column sys_oper_log.method is '方法名称'; -comment on column sys_oper_log.request_method is '请求方式'; -comment on column sys_oper_log.operator_type is '操作类别（0其它 1后台用户 2手机端用户）'; -comment on column sys_oper_log.oper_name is '操作人员'; -comment on column sys_oper_log.dept_name is '部门名称'; -comment on column sys_oper_log.oper_url is '请求URL'; -comment on column sys_oper_log.oper_ip is '主机地址'; -comment on column sys_oper_log.oper_location is '操作地点'; -comment on column sys_oper_log.oper_param is '请求参数'; -comment on column sys_oper_log.json_result is '返回参数'; -comment on column sys_oper_log.status is '操作状态（0正常 1异常）'; -comment on column sys_oper_log.error_msg is '错误消息'; -comment on column sys_oper_log.oper_time is '操作时间'; -comment on column sys_oper_log.cost_time is '消耗时间'; - - --- ---------------------------- --- 11、字典类型表 --- ---------------------------- -create table sys_dict_type ( - dict_id number(20) not null, - tenant_id varchar2(20) default '000000', - dict_name varchar2(100) default '', - dict_type varchar2(100) default '', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default null -); - -alter table sys_dict_type add constraint pk_sys_dict_type primary key (dict_id); -create unique index sys_dict_type_index1 on sys_dict_type (tenant_id, dict_type); - -comment on table sys_dict_type is '字典类型表'; -comment on column sys_dict_type.dict_id is '字典主键'; -comment on column sys_dict_type.tenant_id is '租户编号'; -comment on column sys_dict_type.dict_name is '字典名称'; -comment on column sys_dict_type.dict_type is '字典类型'; -comment on column sys_dict_type.create_dept is '创建部门'; -comment on column sys_dict_type.create_by is '创建者'; -comment on column sys_dict_type.create_time is '创建时间'; -comment on column sys_dict_type.update_by is '更新者'; -comment on column sys_dict_type.update_time is '更新时间'; -comment on column sys_dict_type.remark is '备注'; - -insert into sys_dict_type values(1, '000000', '用户性别', 'sys_user_sex', 103, 1, sysdate, null, null, '用户性别列表'); -insert into sys_dict_type values(2, '000000', '菜单状态', 'sys_show_hide', 103, 1, sysdate, null, null, '菜单状态列表'); -insert into sys_dict_type values(3, '000000', '系统开关', 'sys_normal_disable', 103, 1, sysdate, null, null, '系统开关列表'); -insert into sys_dict_type values(6, '000000', '系统是否', 'sys_yes_no', 103, 1, sysdate, null, null, '系统是否列表'); -insert into sys_dict_type values(7, '000000', '通知类型', 'sys_notice_type', 103, 1, sysdate, null, null, '通知类型列表'); -insert into sys_dict_type values(8, '000000', '通知状态', 'sys_notice_status', 103, 1, sysdate, null, null, '通知状态列表'); -insert into sys_dict_type values(9, '000000', '操作类型', 'sys_oper_type', 103, 1, sysdate, null, null, '操作类型列表'); -insert into sys_dict_type values(10, '000000', '系统状态', 'sys_common_status', 103, 1, sysdate, null, null, '登录状态列表'); -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, sysdate, null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, sysdate, null, null, '客户端设备类型'); - - --- ---------------------------- --- 12、字典数据表 --- ---------------------------- -create table sys_dict_data ( - dict_code number(20) not null, - tenant_id varchar2(20) default '000000', - dict_sort number(4) default 0, - dict_label varchar2(100) default '', - dict_value varchar2(100) default '', - dict_type varchar2(100) default '', - css_class varchar2(100) default null, - list_class varchar2(100) default null, - is_default char(1) default 'N', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default null -); - -alter table sys_dict_data add constraint pk_sys_dict_data primary key (dict_code); - -comment on table sys_dict_data is '字典数据表'; -comment on column sys_dict_data.dict_code is '字典主键'; -comment on column sys_dict_data.tenant_id is '租户编号'; -comment on column sys_dict_data.dict_sort is '字典排序'; -comment on column sys_dict_data.dict_label is '字典标签'; -comment on column sys_dict_data.dict_value is '字典键值'; -comment on column sys_dict_data.dict_type is '字典类型'; -comment on column sys_dict_data.css_class is '样式属性（其他样式扩展）'; -comment on column sys_dict_data.list_class is '表格回显样式'; -comment on column sys_dict_data.is_default is '是否默认（Y是 N否）'; -comment on column sys_dict_data.create_dept is '创建部门'; -comment on column sys_dict_data.create_by is '创建者'; -comment on column sys_dict_data.create_time is '创建时间'; -comment on column sys_dict_data.update_by is '更新者'; -comment on column sys_dict_data.update_time is '更新时间'; -comment on column sys_dict_data.remark is '备注'; - -insert into sys_dict_data values(1, '000000', 1, '男', '0', 'sys_user_sex', '', '', 'Y', 103, 1, sysdate, null, null, '性别男'); -insert into sys_dict_data values(2, '000000', 2, '女', '1', 'sys_user_sex', '', '', 'N', 103, 1, sysdate, null, null, '性别女'); -insert into sys_dict_data values(3, '000000', 3, '未知', '2', 'sys_user_sex', '', '', 'N', 103, 1, sysdate, null, null, '性别未知'); -insert into sys_dict_data values(4, '000000', 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', 103, 1, sysdate, null, null, '显示菜单'); -insert into sys_dict_data values(5, '000000', 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', 103, 1, sysdate, null, null, '隐藏菜单'); -insert into sys_dict_data values(6, '000000', 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', 103, 1, sysdate, null, null, '正常状态'); -insert into sys_dict_data values(7, '000000', 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', 103, 1, sysdate, null, null, '停用状态'); -insert into sys_dict_data values(12, '000000', 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', 103, 1, sysdate, null, null, '系统默认是'); -insert into sys_dict_data values(13, '000000', 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', 103, 1, sysdate, null, null, '系统默认否'); -insert into sys_dict_data values(14, '000000', 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', 103, 1, sysdate, null, null, '通知'); -insert into sys_dict_data values(15, '000000', 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', 103, 1, sysdate, null, null, '公告'); -insert into sys_dict_data values(16, '000000', 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', 103, 1, sysdate, null, null, '正常状态'); -insert into sys_dict_data values(17, '000000', 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', 103, 1, sysdate, null, null, '关闭状态'); -insert into sys_dict_data values(29, '000000', 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate, null, null, '其他操作'); -insert into sys_dict_data values(18, '000000', 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate, null, null, '新增操作'); -insert into sys_dict_data values(19, '000000', 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate, null, null, '修改操作'); -insert into sys_dict_data values(20, '000000', 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate, null, null, '删除操作'); -insert into sys_dict_data values(21, '000000', 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', 103, 1, sysdate, null, null, '授权操作'); -insert into sys_dict_data values(22, '000000', 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate, null, null, '导出操作'); -insert into sys_dict_data values(23, '000000', 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate, null, null, '导入操作'); -insert into sys_dict_data values(24, '000000', 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate, null, null, '强退操作'); -insert into sys_dict_data values(25, '000000', 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate, null, null, '生成操作'); -insert into sys_dict_data values(26, '000000', 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate, null, null, '清空操作'); -insert into sys_dict_data values(27, '000000', 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', 103, 1, sysdate, null, null, '正常状态'); -insert into sys_dict_data values(28, '000000', 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', 103, 1, sysdate, null, null, '停用状态'); -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate, null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate, null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate, null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate, null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate, null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate, null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate, null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate, null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate, null, null, '小程序'); - - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -create table sys_config ( - config_id number(20) not null, - tenant_id varchar2(20) default '000000', - config_name varchar2(100) default '', - config_key varchar2(100) default '', - config_value varchar2(100) default '', - config_type char(1) default 'N', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default null -); -alter table sys_config add constraint pk_sys_config primary key (config_id); - -comment on table sys_config is '参数配置表'; -comment on column sys_config.config_id is '参数主键'; -comment on column sys_config.tenant_id is '租户编号'; -comment on column sys_config.config_name is '参数名称'; -comment on column sys_config.config_key is '参数键名'; -comment on column sys_config.config_value is '参数键值'; -comment on column sys_config.config_type is '系统内置（Y是 N否）'; -comment on column sys_config.create_dept is '创建部门'; -comment on column sys_config.create_by is '创建者'; -comment on column sys_config.create_time is '创建时间'; -comment on column sys_config.update_by is '更新者'; -comment on column sys_config.update_time is '更新时间'; -comment on column sys_config.remark is '备注'; - -insert into sys_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate, null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate, null, null, '初始化密码 123456' ); -insert into sys_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate, null, null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate, null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate, null, null, 'true:开启, false:关闭'); - - --- ---------------------------- --- 14、系统访问记录 --- ---------------------------- -create table sys_logininfor ( - info_id number(20) not null, - tenant_id varchar2(20) default '000000', - user_name varchar2(50) default '', - client_key varchar2(32) default '', - device_type varchar2(32) default '', - ipaddr varchar2(128) default '', - login_location varchar2(255) default '', - browser varchar2(50) default '', - os varchar2(50) default '', - status char(1) default '0', - msg varchar2(255) default '', - login_time date -); - -alter table sys_logininfor add constraint pk_sys_logininfor primary key (info_id); -create index idx_sys_logininfor_s on sys_logininfor (status); -create index idx_sys_logininfor_lt on sys_logininfor (login_time); - -comment on table sys_logininfor is '系统访问记录'; -comment on column sys_logininfor.info_id is '访问ID'; -comment on column sys_logininfor.tenant_id is '租户编号'; -comment on column sys_logininfor.user_name is '登录账号'; -comment on column sys_logininfor.client_key is '客户端'; -comment on column sys_logininfor.device_type is '设备类型'; -comment on column sys_logininfor.ipaddr is '登录IP地址'; -comment on column sys_logininfor.login_location is '登录地点'; -comment on column sys_logininfor.browser is '浏览器类型'; -comment on column sys_logininfor.os is '操作系统'; -comment on column sys_logininfor.status is '登录状态（0成功 1失败）'; -comment on column sys_logininfor.msg is '提示消息'; -comment on column sys_logininfor.login_time is '访问时间'; - - --- ---------------------------- --- 17、通知公告表 --- ---------------------------- -create table sys_notice ( - notice_id number(20) not null, - tenant_id varchar2(20) default '000000', - notice_title varchar2(50) not null, - notice_type char(1) not null, - notice_content clob default null, - status char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(255) default null -); - -alter table sys_notice add constraint pk_sys_notice primary key (notice_id); - -comment on table sys_notice is '通知公告表'; -comment on column sys_notice.notice_id is '公告主键'; -comment on column sys_notice.tenant_id is '租户编号'; -comment on column sys_notice.notice_title is '公告标题'; -comment on column sys_notice.notice_type is '公告类型（1通知 2公告）'; -comment on column sys_notice.notice_content is '公告内容'; -comment on column sys_notice.status is '公告状态（0正常 1关闭）'; -comment on column sys_notice.create_dept is '创建部门'; -comment on column sys_notice.create_by is '创建者'; -comment on column sys_notice.create_time is '创建时间'; -comment on column sys_notice.update_by is '更新者'; -comment on column sys_notice.update_time is '更新时间'; -comment on column sys_notice.remark is '备注'; - --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate, null, null, '管理员'); -insert into sys_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate, null, null, '管理员'); - - --- ---------------------------- --- 18、代码生成业务表 --- ---------------------------- -create table gen_table ( - table_id number(20) not null, - data_name varchar2(200) default '', - table_name varchar2(200) default '', - table_comment varchar2(500) default '', - sub_table_name varchar2(64) default null, - sub_table_fk_name varchar2(64) default null, - class_name varchar2(100) default '', - tpl_category varchar2(200) default 'crud', - package_name varchar2(100), - module_name varchar2(30), - business_name varchar2(30), - function_name varchar2(50), - function_author varchar2(50), - gen_type char(1) default '0', - gen_path varchar2(200) default '/', - options varchar2(1000), - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date, - remark varchar2(500) default null -); - -alter table gen_table add constraint pk_gen_table primary key (table_id); - -comment on table gen_table is '代码生成业务表'; -comment on column gen_table.table_id is '编号'; -comment on column gen_table.data_name is '数据源名称'; -comment on column gen_table.table_name is '表名称'; -comment on column gen_table.table_comment is '表描述'; -comment on column gen_table.sub_table_name is '关联子表的表名'; -comment on column gen_table.sub_table_fk_name is '子表关联的外键名'; -comment on column gen_table.class_name is '实体类名称'; -comment on column gen_table.tpl_category is '使用的模板（crud单表操作 tree树表操作）'; -comment on column gen_table.package_name is '生成包路径'; -comment on column gen_table.module_name is '生成模块名'; -comment on column gen_table.business_name is '生成业务名'; -comment on column gen_table.function_name is '生成功能名'; -comment on column gen_table.function_author is '生成功能作者'; -comment on column gen_table.gen_type is '生成代码方式（0zip压缩包 1自定义路径）'; -comment on column gen_table.gen_path is '生成路径（不填默认项目路径）'; -comment on column gen_table.options is '其它生成选项'; -comment on column gen_table.create_dept is '创建部门'; -comment on column gen_table.create_by is '创建者'; -comment on column gen_table.create_time is '创建时间'; -comment on column gen_table.update_by is '更新者'; -comment on column gen_table.update_time is '更新时间'; -comment on column gen_table.remark is '备注'; - - --- ---------------------------- --- 19、代码生成业务表字段 --- ---------------------------- -create table gen_table_column ( - column_id number(20) not null, - table_id number(20), - column_name varchar2(200), - column_comment varchar2(500), - column_type varchar2(100), - java_type varchar2(500), - java_field varchar2(200), - is_pk char(1), - is_increment char(1), - is_required char(1), - is_insert char(1), - is_edit char(1), - is_list char(1), - is_query char(1), - query_type varchar2(200) default 'EQ', - html_type varchar2(200), - dict_type varchar2(200) default '', - sort number(4), - create_dept number(20) default null, - create_by number(20) default null, - create_time date , - update_by number(20) default null, - update_time date -); - -alter table gen_table_column add constraint pk_gen_table_column primary key (column_id); - -comment on table gen_table_column is '代码生成业务表字段'; -comment on column gen_table_column.column_id is '编号'; -comment on column gen_table_column.table_id is '归属表编号'; -comment on column gen_table_column.column_name is '列名称'; -comment on column gen_table_column.column_comment is '列描述'; -comment on column gen_table_column.column_type is '列类型'; -comment on column gen_table_column.java_type is 'JAVA类型'; -comment on column gen_table_column.java_field is 'JAVA字段名'; -comment on column gen_table_column.is_pk is '是否主键（1是）'; -comment on column gen_table_column.is_increment is '是否自增（1是）'; -comment on column gen_table_column.is_required is '是否必填（1是）'; -comment on column gen_table_column.is_insert is '是否为插入字段（1是）'; -comment on column gen_table_column.is_edit is '是否编辑字段（1是）'; -comment on column gen_table_column.is_list is '是否列表字段（1是）'; -comment on column gen_table_column.is_query is '是否查询字段（1是）'; -comment on column gen_table_column.query_type is '查询方式（等于、不等于、大于、小于、范围）'; -comment on column gen_table_column.html_type is '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）'; -comment on column gen_table_column.dict_type is '字典类型'; -comment on column gen_table_column.sort is '排序'; -comment on column gen_table_column.create_dept is '创建部门'; -comment on column gen_table_column.create_by is '创建者'; -comment on column gen_table_column.create_time is '创建时间'; -comment on column gen_table_column.update_by is '更新者'; -comment on column gen_table_column.update_time is '更新时间'; - - --- ---------------------------- --- OSS对象存储表 --- ---------------------------- -create table sys_oss ( - oss_id number(20) not null, - tenant_id varchar2(20) default '000000', - file_name varchar2(255) not null, - original_name varchar2(255) not null, - file_suffix varchar2(10) not null, - url varchar2(500) not null, - service varchar2(20) default 'minio' not null, - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_oss add constraint pk_sys_oss primary key (oss_id); - -comment on table sys_oss is 'OSS对象存储表'; -comment on column sys_oss.oss_id is '对象存储主键'; -comment on column sys_oss.tenant_id is '租户编码'; -comment on column sys_oss.file_name is '文件名'; -comment on column sys_oss.original_name is '原名'; -comment on column sys_oss.file_suffix is '文件后缀名'; -comment on column sys_oss.url is 'URL地址'; -comment on column sys_oss.service is '服务商'; -comment on column sys_oss.create_dept is '创建部门'; -comment on column sys_oss.create_time is '创建时间'; -comment on column sys_oss.create_by is '上传者'; -comment on column sys_oss.update_time is '更新时间'; -comment on column sys_oss.update_by is '更新者'; - - --- ---------------------------- --- OSS对象存储动态配置表 --- ---------------------------- -create table sys_oss_config ( - oss_config_id number(20) not null, - tenant_id varchar2(20) default '000000', - config_key varchar2(20) not null, - access_key varchar2(255) default '', - secret_key varchar2(255) default '', - bucket_name varchar2(255) default '', - prefix varchar2(255) default '', - endpoint varchar2(255) default '', - domain varchar2(255) default '', - is_https char(1) default 'N', - region varchar2(255) default '', - access_policy char(1) default '1' not null, - status char(1) default '1', - ext1 varchar2(255) default '', - remark varchar2(500) default null, - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_oss_config add constraint pk_sys_oss_config primary key (oss_config_id); - -comment on table sys_oss_config is '对象存储配置表'; -comment on column sys_oss_config.oss_config_id is '主键'; -comment on column sys_oss_config.tenant_id is '租户编码'; -comment on column sys_oss_config.config_key is '配置key'; -comment on column sys_oss_config.access_key is 'accesskey'; -comment on column sys_oss_config.secret_key is '秘钥'; -comment on column sys_oss_config.bucket_name is '桶名称'; -comment on column sys_oss_config.prefix is '前缀'; -comment on column sys_oss_config.endpoint is '访问站点'; -comment on column sys_oss_config.domain is '自定义域名'; -comment on column sys_oss_config.is_https is '是否https（Y=是,N=否）'; -comment on column sys_oss_config.region is '域'; -comment on column sys_oss_config.access_policy is '桶权限类型(0=private 1=public 2=custom)'; -comment on column sys_oss_config.status is '是否默认（0=是,1=否）'; -comment on column sys_oss_config.ext1 is '扩展字段'; -comment on column sys_oss_config.remark is '备注'; -comment on column sys_oss_config.create_dept is '创建部门'; -comment on column sys_oss_config.create_by is '创建者'; -comment on column sys_oss_config.create_time is '创建时间'; -comment on column sys_oss_config.update_by is '更新者'; -comment on column sys_oss_config.update_time is '更新时间'; - -insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1', '0', '', NULL, 103, 1, sysdate, 1, sysdate); -insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate); -insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate); -insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate); -insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate); - --- ---------------------------- --- 系统授权表 --- ---------------------------- -create table sys_client ( - id number(20) not null, - client_id varchar2(64) default null, - client_key varchar2(32) default null, - client_secret varchar2(255) default null, - grant_type varchar2(255) default null, - device_type varchar2(32) default null, - active_timeout number(11) default 1800, - timeout number(11) default 604800, - status char(1) default '0', - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_client add constraint pk_sys_client primary key (id); - -comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主键'; -comment on column sys_client.client_id is '客户端id'; -comment on column sys_client.client_key is '客户端key'; -comment on column sys_client.client_secret is '客户端秘钥'; -comment on column sys_client.grant_type is '授权类型'; -comment on column sys_client.device_type is '设备类型'; -comment on column sys_client.active_timeout is 'token活跃超时时间'; -comment on column sys_client.timeout is 'token固定超时'; -comment on column sys_client.status is '状态（0正常 1停用）'; -comment on column sys_client.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_client.create_dept is '创建部门'; -comment on column sys_client.create_by is '创建者'; -comment on column sys_client.create_time is '创建时间'; -comment on column sys_client.update_by is '更新者'; -comment on column sys_client.update_time is '更新时间'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate); - -create table test_demo ( - id number(20) not null, - tenant_id varchar2(20) default '000000', - dept_id number(20) default null, - user_id number(20) default null, - order_num number(10) default 0, - test_key varchar2(255) default null, - value varchar2(255) default null, - version number(10) default 0, - create_dept number(20) default null, - create_time date, - create_by number(20) default null, - update_time date, - update_by number(20) default null, - del_flag number(2) default 0 -); - -alter table test_demo add constraint pk_test_demo primary key (id); - -comment on table test_demo is '测试单表'; -comment on column test_demo.id is '主键'; -comment on column test_demo.tenant_id is '租户编号'; -comment on column test_demo.dept_id is '部门id'; -comment on column test_demo.user_id is '用户id'; -comment on column test_demo.order_num is '排序号'; -comment on column test_demo.test_key is 'key键'; -comment on column test_demo.value is '值'; -comment on column test_demo.version is '版本'; -comment on column test_demo.create_dept is '创建部门'; -comment on column test_demo.create_time is '创建时间'; -comment on column test_demo.create_by is '创建人'; -comment on column test_demo.update_time is '更新时间'; -comment on column test_demo.update_by is '更新人'; -comment on column test_demo.del_flag is '删除标志'; - -create table test_tree ( - id number(20) not null, - tenant_id varchar2(20) default '000000', - parent_id number(20) default 0, - dept_id number(20) default null, - user_id number(20) default null, - tree_name varchar2(255) default null, - version number(10) default 0, - create_dept number(20) default null, - create_time date, - create_by number(20) default null, - update_time date, - update_by number(20) default null, - del_flag number(2) default 0 -); - -alter table test_tree add constraint pk_test_tree primary key (id); - -comment on table test_tree is '测试树表'; -comment on column test_tree.id is '主键'; -comment on column test_tree.tenant_id is '租户编号'; -comment on column test_tree.parent_id is '父id'; -comment on column test_tree.dept_id is '部门id'; -comment on column test_tree.user_id is '用户id'; -comment on column test_tree.tree_name is '值'; -comment on column test_tree.version is '版本'; -comment on column test_tree.create_dept is '创建部门'; -comment on column test_tree.create_time is '创建时间'; -comment on column test_tree.create_by is '创建人'; -comment on column test_tree.update_time is '更新时间'; -comment on column test_tree.update_by is '更新人'; -comment on column test_tree.del_flag is '删除标志'; - -insert into test_demo values (1, '000000', 102, 4, 1, '测试数据权限', '测试', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (2, '000000', 102, 3, 2, '子节点1', '111', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (3, '000000', 102, 3, 3, '子节点2', '222', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (4, '000000', 108, 4, 4, '测试数据', 'demo', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (5, '000000', 108, 3, 13, '子节点11', '1111', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (6, '000000', 108, 3, 12, '子节点22', '2222', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (7, '000000', 108, 3, 11, '子节点33', '3333', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (8, '000000', 108, 3, 10, '子节点44', '4444', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (9, '000000', 108, 3, 9, '子节点55', '5555', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (10, '000000', 108, 3, 8, '子节点66', '6666', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (11, '000000', 108, 3, 7, '子节点77', '7777', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (12, '000000', 108, 3, 6, '子节点88', '8888', 0, 103, sysdate, 1, null, null, 0); -insert into test_demo values (13, '000000', 108, 3, 5, '子节点99', '9999', 0, 103, sysdate, 1, null, null, 0); - -insert into test_tree values (1, '000000', 0, 102, 4, '测试数据权限', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (2, '000000', 1, 102, 3, '子节点1', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (3, '000000', 2, 102, 3, '子节点2', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (4, '000000', 0, 108, 4, '测试树1', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (5, '000000', 4, 108, 3, '子节点11', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (6, '000000', 4, 108, 3, '子节点22', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (7, '000000', 4, 108, 3, '子节点33', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (8, '000000', 5, 108, 3, '子节点44', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (9, '000000', 6, 108, 3, '子节点55', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (10, '000000', 7, 108, 3, '子节点66', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (11, '000000', 7, 108, 3, '子节点77', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (12, '000000', 10, 108, 3, '子节点88', 0, 103, sysdate, 1, null, null, 0); -insert into test_tree values (13, '000000', 10, 108, 3, '子节点99', 0, 103, sysdate, 1, null, null, 0); - - --- ---------------------------- --- 钩子 ，用于session连接之后 自动设置默认的date类型格式化 简化时间查询 --- 如需设置其它配置 可在此钩子内任意增加处理语句 --- 例如： SELECT * FROM sys_user WHERE create_time BETWEEN '2022-03-01 00:00:00' AND '2022-04-01 00:00:00' --- ---------------------------- -create or replace trigger login_trg -after logon on database -begin -execute immediate 'alter session set nls_date_format=''YYYY-MM-DD HH24:MI:SS'''; -end; diff --git a/template/script/sql/oracle/oracle_ry_workflow.sql b/template/script/sql/oracle/oracle_ry_workflow.sql deleted file mode 100644 index 65474f4..0000000 --- a/template/script/sql/oracle/oracle_ry_workflow.sql +++ /dev/null @@ -1,261 +0,0 @@ -insert into sys_menu values('11616', '工作流' , '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11617', '模型管理', '11616', '2', 'model', 'workflow/model/index', '', '1', '1', 'C', '0', '0', 'workflow:model:list', 'model', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, sysdate, NULL, NULL, ''); -insert into sys_menu values('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate, NULL, NULL, ''); - - --- 流程分类管理相关按钮 -insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove','#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export','#', 103, 1, sysdate, null, null, ''); - --- 请假单信息 -create table TEST_LEAVE -( - ID NUMBER(20) not null - constraint PK_TEST_LEAVE - primary key, - LEAVE_TYPE VARCHAR2(255), - START_DATE DATE, - END_DATE DATE, - LEAVE_DAYS NUMBER(10), - REMARK VARCHAR2(255), - STATUS VARCHAR2(255), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE, - TENANT_ID VARCHAR2(20) -); - -comment on table TEST_LEAVE is '请假申请表'; -comment on column TEST_LEAVE.ID is '主键'; -comment on column TEST_LEAVE.LEAVE_TYPE is '请假类型'; -comment on column TEST_LEAVE.START_DATE is '开始时间'; -comment on column TEST_LEAVE.END_DATE is '结束时间'; -comment on column TEST_LEAVE.LEAVE_DAYS is '请假天数'; -comment on column TEST_LEAVE.REMARK is '请假原因'; -comment on column TEST_LEAVE.STATUS is '状态'; -comment on column TEST_LEAVE.CREATE_DEPT is '创建部门'; -comment on column TEST_LEAVE.CREATE_BY is '创建者'; -comment on column TEST_LEAVE.CREATE_TIME is '创建时间'; -comment on column TEST_LEAVE.UPDATE_BY is '更新者'; -comment on column TEST_LEAVE.UPDATE_TIME is '更新时间'; -comment on column TEST_LEAVE.TENANT_ID is '租户编号'; - --- 流程分类信息表 -create table WF_CATEGORY -( - ID NUMBER(20) not null - constraint PK_WF_CATEGORY - primary key, - CATEGORY_NAME VARCHAR2(255), - CATEGORY_CODE VARCHAR2(255) - constraint UNI_CATEGORY_CODE - unique, - PARENT_ID NUMBER(20), - SORT_NUM NUMBER(10), - TENANT_ID VARCHAR2(20), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE -); - -comment on table WF_CATEGORY is '流程分类'; -comment on column WF_CATEGORY.ID is '主键'; -comment on column WF_CATEGORY.CATEGORY_NAME is '分类名称'; -comment on column WF_CATEGORY.CATEGORY_CODE is '分类编码'; -comment on column WF_CATEGORY.PARENT_ID is '父级id'; -comment on column WF_CATEGORY.SORT_NUM is '排序'; -comment on column WF_CATEGORY.TENANT_ID is '租户编号'; -comment on column WF_CATEGORY.CREATE_DEPT is '创建部门'; -comment on column WF_CATEGORY.CREATE_BY is '创建者'; -comment on column WF_CATEGORY.CREATE_TIME is '创建时间'; -comment on column WF_CATEGORY.UPDATE_BY is '更新者'; -comment on column WF_CATEGORY.UPDATE_TIME is '更新时间'; -INSERT INTO wf_category values (1, 'OA', 'OA', 0, 0, '000000', 103, 1, sysdate, 1, sysdate); - -create table WF_TASK_BACK_NODE -( - ID NUMBER(20) not null - constraint PK_WF_TASK_BACK_NODE - primary key, - NODE_ID VARCHAR2(255) not null, - NODE_NAME VARCHAR2(255) not null, - ORDER_NO NUMBER(20) not null, - INSTANCE_ID VARCHAR2(255) not null, - TASK_TYPE VARCHAR2(255) not null, - ASSIGNEE VARCHAR2(2000) not null, - TENANT_ID VARCHAR2(20), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE -); -comment on table WF_TASK_BACK_NODE is '节点审批记录'; -comment on column WF_TASK_BACK_NODE.ID is '主键'; -comment on column WF_TASK_BACK_NODE.NODE_ID is '节点id'; -comment on column WF_TASK_BACK_NODE.NODE_NAME is '节点名称'; -comment on column WF_TASK_BACK_NODE.ORDER_NO is '排序'; -comment on column WF_TASK_BACK_NODE.INSTANCE_ID is '流程实例id'; -comment on column WF_TASK_BACK_NODE.TASK_TYPE is '节点类型'; -comment on column WF_TASK_BACK_NODE.ASSIGNEE is '审批人'; -comment on column WF_TASK_BACK_NODE.TENANT_ID is '租户编号'; -comment on column WF_TASK_BACK_NODE.CREATE_DEPT is '创建部门'; -comment on column WF_TASK_BACK_NODE.CREATE_BY is '创建者'; -comment on column WF_TASK_BACK_NODE.CREATE_TIME is '创建时间'; -comment on column WF_TASK_BACK_NODE.UPDATE_BY is '更新者'; -comment on column WF_TASK_BACK_NODE.UPDATE_TIME is '更新时间'; - -create table WF_DEFINITION_CONFIG -( - ID NUMBER(20) NOT NULL - CONSTRAINT PK_WF_DEFINITION_CONFIG - PRIMARY KEY, - TABLE_NAME VARCHAR2(255) NOT NULL, - DEFINITION_ID VARCHAR2(255) NOT NULL, - PROCESS_KEY VARCHAR2(255) NOT NULL, - VERSION NUMBER(10) NOT NULL, - REMARK VARCHAR2(500), - TENANT_ID VARCHAR2(20), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE, - constraint uni_definition_id - unique (definition_id) -); -comment on table WF_DEFINITION_CONFIG is '流程定义配置'; -comment on column WF_DEFINITION_CONFIG.ID is '主键'; -comment on column WF_DEFINITION_CONFIG.TABLE_NAME is '表名'; -comment on column WF_DEFINITION_CONFIG.DEFINITION_ID is '流程定义ID'; -comment on column WF_DEFINITION_CONFIG.PROCESS_KEY is '流程KEY'; -comment on column WF_DEFINITION_CONFIG.VERSION is '流程版本'; -comment on column WF_DEFINITION_CONFIG.TENANT_ID is '租户编号'; -comment on column WF_DEFINITION_CONFIG.REMARK is '备注'; -comment on column WF_DEFINITION_CONFIG.CREATE_DEPT is '创建部门'; -comment on column WF_DEFINITION_CONFIG.CREATE_BY is '创建者'; -comment on column WF_DEFINITION_CONFIG.CREATE_TIME is '创建时间'; -comment on column WF_DEFINITION_CONFIG.UPDATE_BY is '更新者'; -comment on column WF_DEFINITION_CONFIG.UPDATE_TIME is '更新时间'; - -create table WF_FORM_MANAGE -( - ID NUMBER(20) NOT NULL - CONSTRAINT PK_WF_FORM_MANAGE - PRIMARY KEY, - FORM_NAME VARCHAR2(255) NOT NULL, - FORM_TYPE VARCHAR2(255) NOT NULL, - ROUTER VARCHAR2(255) NOT NULL, - REMARK VARCHAR2(500), - TENANT_ID VARCHAR2(20), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE -); - -comment on table WF_FORM_MANAGE is '表单管理'; -comment on column WF_FORM_MANAGE.ID is '主键'; -comment on column WF_FORM_MANAGE.FORM_NAME is '表单名称'; -comment on column WF_FORM_MANAGE.FORM_TYPE is '表单类型'; -comment on column WF_FORM_MANAGE.ROUTER is '路由地址/表单ID'; -comment on column WF_FORM_MANAGE.REMARK is '备注'; -comment on column WF_FORM_MANAGE.TENANT_ID is '租户编号'; -comment on column WF_FORM_MANAGE.CREATE_DEPT is '创建部门'; -comment on column WF_FORM_MANAGE.CREATE_BY is '创建者'; -comment on column WF_FORM_MANAGE.CREATE_TIME is '创建时间'; -comment on column WF_FORM_MANAGE.UPDATE_BY is '更新者'; -comment on column WF_FORM_MANAGE.UPDATE_TIME is '更新时间'; - -insert into wf_form_manage(id, form_name, form_type, router, remark, tenant_id, create_dept, create_by, create_time, update_by, update_time) VALUES (1, '请假申请', 'static', '/workflow/leaveEdit/index', NULL, '000000', 103, 1, sysdate, 1, sysdate); - -create table WF_NODE_CONFIG -( - ID NUMBER(20) NOT NULL - CONSTRAINT PK_WF_NODE_CONFIG - PRIMARY KEY, - FORM_ID NUMBER(20), - FORM_TYPE VARCHAR2(255), - NODE_NAME VARCHAR2(255) NOT NULL, - NODE_ID VARCHAR2(255) NOT NULL, - DEFINITION_ID VARCHAR2(255) NOT NULL, - APPLY_USER_TASK CHAR(1) DEFAULT '0', - TENANT_ID VARCHAR2(20), - CREATE_DEPT NUMBER(20), - CREATE_BY NUMBER(20), - CREATE_TIME DATE, - UPDATE_BY NUMBER(20), - UPDATE_TIME DATE -); - -comment on table WF_NODE_CONFIG is '节点配置'; -comment on column WF_NODE_CONFIG.ID is '主键'; -comment on column WF_NODE_CONFIG.FORM_ID is '表单id'; -comment on column WF_NODE_CONFIG.FORM_TYPE is '表单类型'; -comment on column WF_NODE_CONFIG.NODE_ID is '节点id'; -comment on column WF_NODE_CONFIG.NODE_NAME is '节点名称'; -comment on column WF_NODE_CONFIG.DEFINITION_ID is '流程定义id'; -comment on column WF_NODE_CONFIG.APPLY_USER_TASK is '是否为申请人节点 （0是 1否）'; -comment on column WF_NODE_CONFIG.TENANT_ID is '租户编号'; -comment on column WF_NODE_CONFIG.CREATE_DEPT is '创建部门'; -comment on column WF_NODE_CONFIG.CREATE_BY is '创建者'; -comment on column WF_NODE_CONFIG.CREATE_TIME is '创建时间'; -comment on column WF_NODE_CONFIG.UPDATE_BY is '更新者'; -comment on column WF_NODE_CONFIG.UPDATE_TIME is '更新时间'; - -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11638, '请假申请', 5, 1, 'leave', 'workflow/leave/index', 1, 0, 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, sysdate, NULL, NULL, '请假申请菜单'); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11639, '请假申请查询', 11638, 1, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, sysdate, NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11640, '请假申请新增', 11638, 2, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, sysdate, NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11641, '请假申请修改', 11638, 3, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, sysdate, NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11642, '请假申请删除', 11638, 4, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, sysdate, NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11643, '请假申请导出', 11638, 5, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, sysdate, NULL, NULL, ''); - -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (13, '000000', '业务状态', 'wf_business_status', 103, 1, sysdate, NULL, NULL, '业务状态列表'); -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (14, '000000', '表单类型', 'wf_form_type', 103, 1, sysdate, NULL, NULL, '表单类型列表'); - -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (39, '000000', 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate, NULL, NULL, '已撤销'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (40, '000000', 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, sysdate, NULL, NULL, '草稿'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (41, '000000', 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1,sysdate, NULL, NULL, '待审核'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (42, '000000', 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, sysdate, NULL, NULL, '已完成'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (43, '000000', 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate, NULL, NULL, '已作废'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (44, '000000', 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate, NULL, NULL, '已退回'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (45, '000000', 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1,sysdate, NULL, NULL, '已终止'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (46, '000000', 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, sysdate, NULL, NULL, '自定义表单'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (47, '000000', 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, sysdate, NULL, NULL, '动态表单'); - --- 表单管理 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11628, '表单管理', '11616', '5', 'formManage', 'workflow/formManage/index', 1, 0, 'C', '0', '0', 'workflow:formManage:list', 'tree-table', 103, 1, sysdate, null, null, '表单管理菜单'); - --- 表单管理按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11644, '表单管理查询', 11628, '1', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:query', '', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11645, '表单管理新增', 11628, '2', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:add', '', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11646, '表单管理修改', 11628, '3', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:edit', '', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11647, '表单管理删除', 11628, '4', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:remove', '', 103, 1, sysdate, null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11648, '表单管理导出', 11628, '5', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:export', 'tree-table', 103, 1, sysdate, null, null, ''); diff --git a/template/script/sql/postgres/postgres_ry_job.sql b/template/script/sql/postgres/postgres_ry_job.sql deleted file mode 100644 index 546db3c..0000000 --- a/template/script/sql/postgres/postgres_ry_job.sql +++ /dev/null @@ -1,837 +0,0 @@ -/* - SnailJob Database Transfer Tool - Source Server Type : MySQL - Target Server Type : PostgreSQL - Date: 2024-07-06 11:45:40 -*/ - - --- sj_namespace -CREATE TABLE sj_namespace -( - id bigserial PRIMARY KEY, - name varchar(64) NOT NULL, - unique_id varchar(64) NOT NULL, - description varchar(256) NOT NULL DEFAULT '', - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name); - -COMMENT ON COLUMN sj_namespace.id IS '主键'; -COMMENT ON COLUMN sj_namespace.name IS '名称'; -COMMENT ON COLUMN sj_namespace.unique_id IS '唯一id'; -COMMENT ON COLUMN sj_namespace.description IS '描述'; -COMMENT ON COLUMN sj_namespace.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_namespace.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_namespace.update_dt IS '修改时间'; -COMMENT ON TABLE sj_namespace IS '命名空间'; - -INSERT INTO sj_namespace VALUES (1, 'Development', 'dev', '', 0, now(), now()); -INSERT INTO sj_namespace VALUES (2, 'Production', 'prod', '', 0, now(), now()); - --- sj_group_config -CREATE TABLE sj_group_config -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL DEFAULT '', - description varchar(256) NOT NULL DEFAULT '', - token varchar(64) NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', - group_status smallint NOT NULL DEFAULT 0, - version int NOT NULL, - group_partition int NOT NULL, - id_generator_mode smallint NOT NULL DEFAULT 1, - init_scene smallint NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name); - -COMMENT ON COLUMN sj_group_config.id IS '主键'; -COMMENT ON COLUMN sj_group_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_group_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_group_config.description IS '组描述'; -COMMENT ON COLUMN sj_group_config.token IS 'token'; -COMMENT ON COLUMN sj_group_config.group_status IS '组状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_group_config.version IS '版本号'; -COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; -COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; -COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_group_config IS '组配置'; - -INSERT INTO sj_group_config VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now()); -INSERT INTO sj_group_config VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now()); - --- sj_notify_config -CREATE TABLE sj_notify_config -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - business_id varchar(64) NOT NULL, - system_task_type smallint NOT NULL DEFAULT 3, - notify_status smallint NOT NULL DEFAULT 0, - recipient_ids varchar(128) NOT NULL, - notify_threshold int NOT NULL DEFAULT 0, - notify_scene smallint NOT NULL DEFAULT 0, - rate_limiter_status smallint NOT NULL DEFAULT 0, - rate_limiter_threshold int NOT NULL DEFAULT 0, - description varchar(256) NOT NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name, business_id); - -COMMENT ON COLUMN sj_notify_config.id IS '主键'; -COMMENT ON COLUMN sj_notify_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_notify_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_notify_config.business_id IS '业务id ( job_id或workflow_id或scene_name ) '; -COMMENT ON COLUMN sj_notify_config.system_task_type IS '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_notify_config.notify_status IS '通知状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_notify_config.recipient_ids IS '接收人id列表'; -COMMENT ON COLUMN sj_notify_config.notify_threshold IS '通知阈值'; -COMMENT ON COLUMN sj_notify_config.notify_scene IS '通知场景'; -COMMENT ON COLUMN sj_notify_config.rate_limiter_status IS '限流状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_notify_config.rate_limiter_threshold IS '每秒限流阈值'; -COMMENT ON COLUMN sj_notify_config.description IS '描述'; -COMMENT ON COLUMN sj_notify_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_notify_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_notify_config IS '通知配置'; - --- sj_notify_recipient -CREATE TABLE sj_notify_recipient -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - recipient_name varchar(64) NOT NULL, - notify_type smallint NOT NULL DEFAULT 0, - notify_attribute varchar(512) NOT NULL, - description varchar(256) NOT NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id); - -COMMENT ON COLUMN sj_notify_recipient.id IS '主键'; -COMMENT ON COLUMN sj_notify_recipient.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_notify_recipient.recipient_name IS '接收人名称'; -COMMENT ON COLUMN sj_notify_recipient.notify_type IS '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook'; -COMMENT ON COLUMN sj_notify_recipient.notify_attribute IS '配置属性'; -COMMENT ON COLUMN sj_notify_recipient.description IS '描述'; -COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; -COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; - --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NOT NULL DEFAULT '', - executor_name varchar(512) NOT NULL DEFAULT '', - args_str text NOT NULL, - ext_attrs text NOT NULL, - task_type smallint NOT NULL DEFAULT 1, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); - -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); - -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NOT NULL DEFAULT '', - executor_name varchar(512) NOT NULL DEFAULT '', - args_str text NOT NULL, - ext_attrs text NOT NULL, - next_trigger_at timestamp NOT NULL, - retry_count int NOT NULL DEFAULT 0, - retry_status smallint NOT NULL DEFAULT 0, - task_type smallint NOT NULL DEFAULT 1, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); - -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); - -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; - --- sj_retry_task_log -CREATE TABLE sj_retry_task_log -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NOT NULL DEFAULT '', - executor_name varchar(512) NOT NULL DEFAULT '', - args_str text NOT NULL, - ext_attrs text NOT NULL, - retry_status smallint NOT NULL DEFAULT 0, - task_type smallint NOT NULL DEFAULT 1, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); - -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; - --- sj_retry_task_log_message -CREATE TABLE sj_retry_task_log_message -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - unique_id varchar(64) NOT NULL, - message text NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); -CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt); - -COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; -COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; -COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; -COMMENT ON COLUMN sj_retry_task_log_message.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表'; - --- sj_retry_scene_config -CREATE TABLE sj_retry_scene_config -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - scene_name varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_status smallint NOT NULL DEFAULT 0, - max_retry_count int NOT NULL DEFAULT 5, - back_off smallint NOT NULL DEFAULT 1, - trigger_interval varchar(16) NOT NULL DEFAULT '', - deadline_request bigint NOT NULL DEFAULT 60000, - executor_timeout int NOT NULL DEFAULT 5, - route_key smallint NOT NULL DEFAULT 4, - description varchar(256) NOT NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name); - -COMMENT ON COLUMN sj_retry_scene_config.id IS '主键'; -COMMENT ON COLUMN sj_retry_scene_config.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_scene_config.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_scene_config.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_scene_config.scene_status IS '组状态 0、未启用 1、启用'; -COMMENT ON COLUMN sj_retry_scene_config.max_retry_count IS '最大重试次数'; -COMMENT ON COLUMN sj_retry_scene_config.back_off IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; -COMMENT ON COLUMN sj_retry_scene_config.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; -COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; -COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; -COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_scene_config IS '场景配置'; - --- sj_server_node -CREATE TABLE sj_server_node -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - host_id varchar(64) NOT NULL, - host_ip varchar(64) NOT NULL, - host_port int NOT NULL, - expire_at timestamp NOT NULL, - node_type smallint NOT NULL, - ext_attrs varchar(256) NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip); - -CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name); -CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type); - -COMMENT ON COLUMN sj_server_node.id IS '主键'; -COMMENT ON COLUMN sj_server_node.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_server_node.group_name IS '组名称'; -COMMENT ON COLUMN sj_server_node.host_id IS '主机id'; -COMMENT ON COLUMN sj_server_node.host_ip IS '机器ip'; -COMMENT ON COLUMN sj_server_node.host_port IS '机器端口'; -COMMENT ON COLUMN sj_server_node.expire_at IS '过期时间'; -COMMENT ON COLUMN sj_server_node.node_type IS '节点类型 1、客户端 2、是服务端'; -COMMENT ON COLUMN sj_server_node.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_server_node.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_server_node.update_dt IS '修改时间'; -COMMENT ON TABLE sj_server_node IS '服务器节点'; - --- sj_distributed_lock -CREATE TABLE sj_distributed_lock -( - name varchar(64) PRIMARY KEY, - lock_until timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - locked_at timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), - locked_by varchar(255) NOT NULL, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -COMMENT ON COLUMN sj_distributed_lock.name IS '锁名称'; -COMMENT ON COLUMN sj_distributed_lock.lock_until IS '锁定时长'; -COMMENT ON COLUMN sj_distributed_lock.locked_at IS '锁定时间'; -COMMENT ON COLUMN sj_distributed_lock.locked_by IS '锁定者'; -COMMENT ON COLUMN sj_distributed_lock.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_distributed_lock.update_dt IS '修改时间'; -COMMENT ON TABLE sj_distributed_lock IS '锁定表'; - --- sj_system_user -CREATE TABLE sj_system_user -( - id bigserial PRIMARY KEY, - username varchar(64) NOT NULL, - password varchar(128) NOT NULL, - role smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -COMMENT ON COLUMN sj_system_user.id IS '主键'; -COMMENT ON COLUMN sj_system_user.username IS '账号'; -COMMENT ON COLUMN sj_system_user.password IS '密码'; -COMMENT ON COLUMN sj_system_user.role IS '角色：1-普通用户、2-管理员'; -COMMENT ON COLUMN sj_system_user.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_system_user.update_dt IS '修改时间'; -COMMENT ON TABLE sj_system_user IS '系统用户表'; - --- pwd: admin -INSERT INTO sj_system_user VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now()); - --- sj_system_user_permission -CREATE TABLE sj_system_user_permission -( - id bigserial PRIMARY KEY, - group_name varchar(64) NOT NULL, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - system_user_id bigint NOT NULL, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id); - -COMMENT ON COLUMN sj_system_user_permission.id IS '主键'; -COMMENT ON COLUMN sj_system_user_permission.group_name IS '组名称'; -COMMENT ON COLUMN sj_system_user_permission.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_system_user_permission.system_user_id IS '系统用户id'; -COMMENT ON COLUMN sj_system_user_permission.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_system_user_permission.update_dt IS '修改时间'; -COMMENT ON TABLE sj_system_user_permission IS '系统用户权限表'; - --- sj_sequence_alloc -CREATE TABLE sj_sequence_alloc -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL DEFAULT '', - max_id bigint NOT NULL DEFAULT 1, - step int NOT NULL DEFAULT 100, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name); - -COMMENT ON COLUMN sj_sequence_alloc.id IS '主键'; -COMMENT ON COLUMN sj_sequence_alloc.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_sequence_alloc.group_name IS '组名称'; -COMMENT ON COLUMN sj_sequence_alloc.max_id IS '最大id'; -COMMENT ON COLUMN sj_sequence_alloc.step IS '步长'; -COMMENT ON COLUMN sj_sequence_alloc.update_dt IS '更新时间'; -COMMENT ON TABLE sj_sequence_alloc IS '号段模式序号ID分配表'; - --- sj_job -CREATE TABLE sj_job -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - job_name varchar(64) NOT NULL, - args_str text NULL DEFAULT NULL, - args_type smallint NOT NULL DEFAULT 1, - next_trigger_at bigint NOT NULL, - job_status smallint NOT NULL DEFAULT 1, - task_type smallint NOT NULL DEFAULT 1, - route_key smallint NOT NULL DEFAULT 4, - executor_type smallint NOT NULL DEFAULT 1, - executor_info varchar(255) NULL DEFAULT NULL, - trigger_type smallint NOT NULL, - trigger_interval varchar(255) NOT NULL, - block_strategy smallint NOT NULL DEFAULT 1, - executor_timeout int NOT NULL DEFAULT 0, - max_retry_times int NOT NULL DEFAULT 0, - parallel_num int NOT NULL DEFAULT 1, - retry_interval int NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, - resident smallint NOT NULL DEFAULT 0, - description varchar(256) NOT NULL DEFAULT '', - ext_attrs varchar(256) NULL DEFAULT '', - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name); -CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index); -CREATE INDEX idx_sj_job_03 ON sj_job (create_dt); - -COMMENT ON COLUMN sj_job.id IS '主键'; -COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job.group_name IS '组名称'; -COMMENT ON COLUMN sj_job.job_name IS '名称'; -COMMENT ON COLUMN sj_job.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_job.args_type IS '参数类型 '; -COMMENT ON COLUMN sj_job.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_job.job_status IS '任务状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_job.task_type IS '任务类型 1、集群 2、广播 3、切片'; -COMMENT ON COLUMN sj_job.route_key IS '路由策略'; -COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; -COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; -COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; -COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; -COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; -COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; -COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; -COMMENT ON COLUMN sj_job.description IS '描述'; -COMMENT ON COLUMN sj_job.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_job.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job IS '任务信息'; - -INSERT INTO sj_job VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', 0, now(), now()); - --- sj_job_log_message -CREATE TABLE sj_job_log_message -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - job_id bigint NOT NULL, - task_batch_id bigint NOT NULL, - task_id bigint NOT NULL, - message text NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - ext_attrs varchar(256) NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id); -CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt); -CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name); - -COMMENT ON COLUMN sj_job_log_message.id IS '主键'; -COMMENT ON COLUMN sj_job_log_message.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_log_message.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_job_log_message.task_batch_id IS '任务批次id'; -COMMENT ON COLUMN sj_job_log_message.task_id IS '调度任务id'; -COMMENT ON COLUMN sj_job_log_message.message IS '调度信息'; -COMMENT ON COLUMN sj_job_log_message.log_num IS '日志数量'; -COMMENT ON COLUMN sj_job_log_message.real_time IS '上报时间'; -COMMENT ON COLUMN sj_job_log_message.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_log_message.create_dt IS '创建时间'; -COMMENT ON TABLE sj_job_log_message IS '调度日志'; - --- sj_job_task -CREATE TABLE sj_job_task -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - job_id bigint NOT NULL, - task_batch_id bigint NOT NULL, - parent_id bigint NOT NULL DEFAULT 0, - task_status smallint NOT NULL DEFAULT 0, - retry_count int NOT NULL DEFAULT 0, - mr_stage smallint NULL DEFAULT NULL, - leaf smallint NOT NULL DEFAULT '1', - task_name varchar(255) NOT NULL DEFAULT '', - client_info varchar(128) NULL DEFAULT NULL, - wf_context text NULL DEFAULT NULL, - result_message text NOT NULL, - args_str text NULL DEFAULT NULL, - args_type smallint NOT NULL DEFAULT 1, - ext_attrs varchar(256) NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status); -CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt); -CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name); - -COMMENT ON COLUMN sj_job_task.id IS '主键'; -COMMENT ON COLUMN sj_job_task.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_task.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_task.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_job_task.task_batch_id IS '调度任务id'; -COMMENT ON COLUMN sj_job_task.parent_id IS '父执行器id'; -COMMENT ON COLUMN sj_job_task.task_status IS '执行的状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_job_task.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_job_task.mr_stage IS '动态分片所处阶段 1:map 2:reduce 3:mergeReduce'; -COMMENT ON COLUMN sj_job_task.leaf IS '叶子节点'; -COMMENT ON COLUMN sj_job_task.task_name IS '任务名称'; -COMMENT ON COLUMN sj_job_task.client_info IS '客户端地址 clientId#ip:port'; -COMMENT ON COLUMN sj_job_task.wf_context IS '工作流全局上下文'; -COMMENT ON COLUMN sj_job_task.result_message IS '执行结果'; -COMMENT ON COLUMN sj_job_task.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_job_task.args_type IS '参数类型 '; -COMMENT ON COLUMN sj_job_task.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_task.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_task.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_task IS '任务实例'; - --- sj_job_task_batch -CREATE TABLE sj_job_task_batch -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - job_id bigint NOT NULL, - workflow_node_id bigint NOT NULL DEFAULT 0, - parent_workflow_node_id bigint NOT NULL DEFAULT 0, - workflow_task_batch_id bigint NOT NULL DEFAULT 0, - task_batch_status smallint NOT NULL DEFAULT 0, - operation_reason smallint NOT NULL DEFAULT 0, - execution_at bigint NOT NULL DEFAULT 0, - system_task_type smallint NOT NULL DEFAULT 3, - parent_id varchar(64) NOT NULL DEFAULT '', - ext_attrs varchar(256) NULL DEFAULT '', - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status); -CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt); -CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name); -CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id); - -COMMENT ON COLUMN sj_job_task_batch.id IS '主键'; -COMMENT ON COLUMN sj_job_task_batch.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_task_batch.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_task_batch.job_id IS '任务id'; -COMMENT ON COLUMN sj_job_task_batch.workflow_node_id IS '工作流节点id'; -COMMENT ON COLUMN sj_job_task_batch.parent_workflow_node_id IS '工作流任务父批次id'; -COMMENT ON COLUMN sj_job_task_batch.workflow_task_batch_id IS '工作流任务批次id'; -COMMENT ON COLUMN sj_job_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_job_task_batch.operation_reason IS '操作原因'; -COMMENT ON COLUMN sj_job_task_batch.execution_at IS '任务执行时间'; -COMMENT ON COLUMN sj_job_task_batch.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_job_task_batch.parent_id IS '父节点'; -COMMENT ON COLUMN sj_job_task_batch.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_job_task_batch.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_job_task_batch.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_task_batch IS '任务批次'; - --- sj_job_summary -CREATE TABLE sj_job_summary -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL DEFAULT '', - business_id bigint NOT NULL, - system_task_type smallint NOT NULL DEFAULT 3, - trigger_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - success_num int NOT NULL DEFAULT 0, - fail_num int NOT NULL DEFAULT 0, - fail_reason varchar(512) NOT NULL DEFAULT '', - stop_num int NOT NULL DEFAULT 0, - stop_reason varchar(512) NOT NULL DEFAULT '', - cancel_num int NOT NULL DEFAULT 0, - cancel_reason varchar(512) NOT NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id); - -CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id); - -COMMENT ON COLUMN sj_job_summary.id IS '主键'; -COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; -COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; -COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; -COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; -COMMENT ON COLUMN sj_job_summary.fail_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.fail_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.stop_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.stop_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.cancel_num IS '执行失败-日志数量'; -COMMENT ON COLUMN sj_job_summary.cancel_reason IS '失败原因'; -COMMENT ON COLUMN sj_job_summary.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_job_summary.update_dt IS '修改时间'; -COMMENT ON TABLE sj_job_summary IS 'DashBoard_Job'; - --- sj_retry_summary -CREATE TABLE sj_retry_summary -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL DEFAULT '', - scene_name varchar(50) NOT NULL DEFAULT '', - trigger_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - running_num int NOT NULL DEFAULT 0, - finish_num int NOT NULL DEFAULT 0, - max_count_num int NOT NULL DEFAULT 0, - suspend_num int NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at); - -CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at); - -COMMENT ON COLUMN sj_retry_summary.id IS '主键'; -COMMENT ON COLUMN sj_retry_summary.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_summary.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_summary.trigger_at IS '统计时间'; -COMMENT ON COLUMN sj_retry_summary.running_num IS '重试中-日志数量'; -COMMENT ON COLUMN sj_retry_summary.finish_num IS '重试完成-日志数量'; -COMMENT ON COLUMN sj_retry_summary.max_count_num IS '重试到达最大次数-日志数量'; -COMMENT ON COLUMN sj_retry_summary.suspend_num IS '暂停重试-日志数量'; -COMMENT ON COLUMN sj_retry_summary.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_summary.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_summary IS 'DashBoard_Retry'; - --- sj_workflow -CREATE TABLE sj_workflow -( - id bigserial PRIMARY KEY, - workflow_name varchar(64) NOT NULL, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - workflow_status smallint NOT NULL DEFAULT 1, - trigger_type smallint NOT NULL, - trigger_interval varchar(255) NOT NULL, - next_trigger_at bigint NOT NULL, - block_strategy smallint NOT NULL DEFAULT 1, - executor_timeout int NOT NULL DEFAULT 0, - description varchar(256) NOT NULL DEFAULT '', - flow_info text NULL DEFAULT NULL, - wf_context text NULL DEFAULT NULL, - bucket_index int NOT NULL DEFAULT 0, - version int NOT NULL, - ext_attrs varchar(256) NULL DEFAULT '', - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt); -CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow.id IS '主键'; -COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称'; -COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; -COMMENT ON COLUMN sj_workflow.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_workflow.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_workflow.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; -COMMENT ON COLUMN sj_workflow.executor_timeout IS '任务执行超时时间，单位秒'; -COMMENT ON COLUMN sj_workflow.description IS '描述'; -COMMENT ON COLUMN sj_workflow.flow_info IS '流程信息'; -COMMENT ON COLUMN sj_workflow.wf_context IS '上下文'; -COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket'; -COMMENT ON COLUMN sj_workflow.version IS '版本号'; -COMMENT ON COLUMN sj_workflow.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow IS '工作流'; - --- sj_workflow_node -CREATE TABLE sj_workflow_node -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - node_name varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - job_id bigint NOT NULL, - workflow_id bigint NOT NULL, - node_type smallint NOT NULL DEFAULT 1, - expression_type smallint NOT NULL DEFAULT 0, - fail_strategy smallint NOT NULL DEFAULT 1, - workflow_node_status smallint NOT NULL DEFAULT 1, - priority_level int NOT NULL DEFAULT 1, - node_info text NULL DEFAULT NULL, - version int NOT NULL, - ext_attrs varchar(256) NULL DEFAULT '', - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt); -CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow_node.id IS '主键'; -COMMENT ON COLUMN sj_workflow_node.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow_node.node_name IS '节点名称'; -COMMENT ON COLUMN sj_workflow_node.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow_node.job_id IS '任务信息id'; -COMMENT ON COLUMN sj_workflow_node.workflow_id IS '工作流ID'; -COMMENT ON COLUMN sj_workflow_node.node_type IS '1、任务节点 2、条件节点'; -COMMENT ON COLUMN sj_workflow_node.expression_type IS '1、SpEl、2、Aviator 3、QL'; -COMMENT ON COLUMN sj_workflow_node.fail_strategy IS '失败策略 1、跳过 2、阻塞'; -COMMENT ON COLUMN sj_workflow_node.workflow_node_status IS '工作流节点状态 0、关闭、1、开启'; -COMMENT ON COLUMN sj_workflow_node.priority_level IS '优先级'; -COMMENT ON COLUMN sj_workflow_node.node_info IS '节点信息 '; -COMMENT ON COLUMN sj_workflow_node.version IS '版本号'; -COMMENT ON COLUMN sj_workflow_node.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow_node.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow_node.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow_node.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_node IS '工作流节点'; - --- sj_workflow_task_batch -CREATE TABLE sj_workflow_task_batch -( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - workflow_id bigint NOT NULL, - task_batch_status smallint NOT NULL DEFAULT 0, - operation_reason smallint NOT NULL DEFAULT 0, - flow_info text NULL DEFAULT NULL, - wf_context text NULL DEFAULT NULL, - execution_at bigint NOT NULL DEFAULT 0, - ext_attrs varchar(256) NULL DEFAULT '', - version int NOT NULL DEFAULT 1, - deleted smallint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status); -CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt); -CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name); - -COMMENT ON COLUMN sj_workflow_task_batch.id IS '主键'; -COMMENT ON COLUMN sj_workflow_task_batch.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_workflow_task_batch.group_name IS '组名称'; -COMMENT ON COLUMN sj_workflow_task_batch.workflow_id IS '工作流任务id'; -COMMENT ON COLUMN sj_workflow_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功'; -COMMENT ON COLUMN sj_workflow_task_batch.operation_reason IS '操作原因'; -COMMENT ON COLUMN sj_workflow_task_batch.flow_info IS '流程信息'; -COMMENT ON COLUMN sj_workflow_task_batch.wf_context IS '全局上下文'; -COMMENT ON COLUMN sj_workflow_task_batch.execution_at IS '任务执行时间'; -COMMENT ON COLUMN sj_workflow_task_batch.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; -COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; -COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; diff --git a/template/script/sql/postgres/postgres_ry_vue_5.X.sql b/template/script/sql/postgres/postgres_ry_vue_5.X.sql deleted file mode 100644 index fabea60..0000000 --- a/template/script/sql/postgres/postgres_ry_vue_5.X.sql +++ /dev/null @@ -1,1356 +0,0 @@ --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -create table sys_social -( - id int8 not null, - user_id int8 not null, - tenant_id varchar(20) default null::varchar, - auth_id varchar(255) not null, - source varchar(255) not null, - open_id varchar(255) default null::varchar, - user_name varchar(30) not null, - nick_name varchar(30) default ''::varchar, - email varchar(255) default ''::varchar, - avatar varchar(500) default ''::varchar, - access_token varchar(255) not null, - expire_in int8 default null, - refresh_token varchar(255) default null::varchar, - access_code varchar(255) default null::varchar, - union_id varchar(255) default null::varchar, - scope varchar(255) default null::varchar, - token_type varchar(255) default null::varchar, - id_token varchar(2000) default null::varchar, - mac_algorithm varchar(255) default null::varchar, - mac_key varchar(255) default null::varchar, - code varchar(255) default null::varchar, - oauth_token varchar(255) default null::varchar, - oauth_token_secret varchar(255) default null::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - del_flag char default '0'::bpchar, - constraint "pk_sys_social" primary key (id) -); - -comment on table sys_social is '社会化关系表'; -comment on column sys_social.id is '主键'; -comment on column sys_social.user_id is '用户ID'; -comment on column sys_social.tenant_id is '租户id'; -comment on column sys_social.auth_id is '平台+平台唯一id'; -comment on column sys_social.source is '用户来源'; -comment on column sys_social.open_id is '平台编号唯一id'; -comment on column sys_social.user_name is '登录账号'; -comment on column sys_social.nick_name is '用户昵称'; -comment on column sys_social.email is '用户邮箱'; -comment on column sys_social.avatar is '头像地址'; -comment on column sys_social.access_token is '用户的授权令牌'; -comment on column sys_social.expire_in is '用户的授权令牌的有效期，部分平台可能没有'; -comment on column sys_social.refresh_token is '刷新令牌，部分平台可能没有'; -comment on column sys_social.access_code is '平台的授权信息，部分平台可能没有'; -comment on column sys_social.union_id is '用户的 unionid'; -comment on column sys_social.scope is '授予的权限，部分平台可能没有'; -comment on column sys_social.token_type is '个别平台的授权信息，部分平台可能没有'; -comment on column sys_social.id_token is 'id token，部分平台可能没有'; -comment on column sys_social.mac_algorithm is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.mac_key is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.code is '用户的授权code，部分平台可能没有'; -comment on column sys_social.oauth_token is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.create_dept is '创建部门'; -comment on column sys_social.create_by is '创建者'; -comment on column sys_social.create_time is '创建时间'; -comment on column sys_social.update_by is '更新者'; -comment on column sys_social.update_time is '更新时间'; -comment on column sys_social.del_flag is '删除标志（0代表存在 2代表删除）'; - --- ---------------------------- --- 租户表 --- ---------------------------- -create table if not exists sys_tenant -( - id int8, - tenant_id varchar(20) not null, - contact_user_name varchar(20) default null::varchar, - contact_phone varchar(20) default null::varchar, - company_name varchar(50) default null::varchar, - license_number varchar(30) default null::varchar, - address varchar(200) default null::varchar, - intro varchar(200) default null::varchar, - domain varchar(200) default null::varchar, - remark varchar(200) default null::varchar, - package_id int8, - expire_time timestamp, - account_count int4 default -1, - status char default '0'::bpchar, - del_flag char default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint "pk_sys_tenant" primary key (id) -); - - -comment on table sys_tenant is '租户表'; -comment on column sys_tenant.tenant_id is '租户编号'; -comment on column sys_tenant.contact_phone is '联系电话'; -comment on column sys_tenant.company_name is '企业名称'; -comment on column sys_tenant.company_name is '联系人'; -comment on column sys_tenant.license_number is '统一社会信用代码'; -comment on column sys_tenant.address is '地址'; -comment on column sys_tenant.intro is '企业简介'; -comment on column sys_tenant.domain is '域名'; -comment on column sys_tenant.remark is '备注'; -comment on column sys_tenant.package_id is '租户套餐编号'; -comment on column sys_tenant.expire_time is '过期时间'; -comment on column sys_tenant.account_count is '用户数量（-1不限制）'; -comment on column sys_tenant.status is '租户状态（0正常 1停用）'; -comment on column sys_tenant.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_tenant.create_dept is '创建部门'; -comment on column sys_tenant.create_by is '创建者'; -comment on column sys_tenant.create_time is '创建时间'; -comment on column sys_tenant.update_by is '更新者'; -comment on column sys_tenant.update_time is '更新时间'; - - --- ---------------------------- --- 初始化-租户表数据 --- ---------------------------- - -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, now(), null, null); - - --- ---------------------------- --- 租户套餐表 --- ---------------------------- -create table if not exists sys_tenant_package -( - package_id int8, - package_name varchar(20) default ''::varchar, - menu_ids varchar(3000) default ''::varchar, - remark varchar(200) default ''::varchar, - menu_check_strictly bool default true, - status char default '0'::bpchar, - del_flag char default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint "pk_sys_tenant_package" primary key (package_id) -); - - -comment on table sys_tenant_package is '租户套餐表'; -comment on column sys_tenant_package.package_id is '租户套餐id'; -comment on column sys_tenant_package.package_name is '套餐名称'; -comment on column sys_tenant_package.menu_ids is '关联菜单id'; -comment on column sys_tenant_package.remark is '备注'; -comment on column sys_tenant_package.status is '状态（0正常 1停用）'; -comment on column sys_tenant_package.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_tenant_package.create_dept is '创建部门'; -comment on column sys_tenant_package.create_by is '创建者'; -comment on column sys_tenant_package.create_time is '创建时间'; -comment on column sys_tenant_package.update_by is '更新者'; -comment on column sys_tenant_package.update_time is '更新时间'; - - --- ---------------------------- --- 1、部门表 --- ---------------------------- -create table if not exists sys_dept -( - dept_id int8, - tenant_id varchar(20) default '000000'::varchar, - parent_id int8 default 0, - ancestors varchar(500)default ''::varchar, - dept_name varchar(30) default ''::varchar, - dept_category varchar(100) default null::varchar, - order_num int4 default 0, - leader int8 default null, - phone varchar(11) default null::varchar, - email varchar(50) default null::varchar, - status char default '0'::bpchar, - del_flag char default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint "sys_dept_pk" primary key (dept_id) -); - -comment on table sys_dept is '部门表'; -comment on column sys_dept.dept_id is '部门ID'; -comment on column sys_dept.tenant_id is '租户编号'; -comment on column sys_dept.parent_id is '父部门ID'; -comment on column sys_dept.ancestors is '祖级列表'; -comment on column sys_dept.dept_name is '部门名称'; -comment on column sys_dept.dept_category is '部门类别编码'; -comment on column sys_dept.order_num is '显示顺序'; -comment on column sys_dept.leader is '负责人'; -comment on column sys_dept.phone is '联系电话'; -comment on column sys_dept.email is '邮箱'; -comment on column sys_dept.status is '部门状态（0正常 1停用）'; -comment on column sys_dept.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_dept.create_dept is '创建部门'; -comment on column sys_dept.create_by is '创建者'; -comment on column sys_dept.create_time is '创建时间'; -comment on column sys_dept.update_by is '更新者'; -comment on column sys_dept.update_time is '更新时间'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- -insert into sys_dept values(100, '000000', 0, '0', 'XXX科技', null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(101, '000000', 100, '0,100', '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(102, '000000', 100, '0,100', '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(103, '000000', 101, '0,100,101', '研发部门', null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(104, '000000', 101, '0,100,101', '市场部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(105, '000000', 101, '0,100,101', '测试部门', null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(106, '000000', 101, '0,100,101', '财务部门', null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(107, '000000', 101, '0,100,101', '运维部门', null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(108, '000000', 102, '0,100,102', '市场部门', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); -insert into sys_dept values(109, '000000', 102, '0,100,102', '财务部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null); - --- ---------------------------- --- 2、用户信息表 --- ---------------------------- -create table if not exists sys_user -( - user_id int8, - tenant_id varchar(20) default '000000'::varchar, - dept_id int8, - user_name varchar(30) not null, - nick_name varchar(30) not null, - user_type varchar(10) default 'sys_user'::varchar, - email varchar(50) default ''::varchar, - phonenumber varchar(11) default ''::varchar, - sex char default '0'::bpchar, - avatar int8, - password varchar(100) default ''::varchar, - status char default '0'::bpchar, - del_flag char default '0'::bpchar, - login_ip varchar(128) default ''::varchar, - login_date timestamp, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint "sys_user_pk" primary key (user_id) -); - -comment on table sys_user is '用户信息表'; -comment on column sys_user.user_id is '用户ID'; -comment on column sys_user.tenant_id is '租户编号'; -comment on column sys_user.dept_id is '部门ID'; -comment on column sys_user.user_name is '用户账号'; -comment on column sys_user.nick_name is '用户昵称'; -comment on column sys_user.user_type is '用户类型（sys_user系统用户）'; -comment on column sys_user.email is '用户邮箱'; -comment on column sys_user.phonenumber is '手机号码'; -comment on column sys_user.sex is '用户性别（0男 1女 2未知）'; -comment on column sys_user.avatar is '头像地址'; -comment on column sys_user.password is '密码'; -comment on column sys_user.status is '帐号状态（0正常 1停用）'; -comment on column sys_user.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_user.login_ip is '最后登陆IP'; -comment on column sys_user.login_date is '最后登陆时间'; -comment on column sys_user.create_dept is '创建部门'; -comment on column sys_user.create_by is '创建者'; -comment on column sys_user.create_time is '创建时间'; -comment on column sys_user.update_by is '更新者'; -comment on column sys_user.update_time is '更新时间'; -comment on column sys_user.remark is '备注'; - --- ---------------------------- - --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', now(), 103, 1, now(), null, null, '管理员'); -insert into sys_user VALUES(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', now(), 103, 1, now(), 3, now(), NULL); -insert into sys_user VALUES(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', now(), 103, 1, now(), 4, now(), NULL); - --- ---------------------------- --- 3、岗位信息表 --- ---------------------------- -create table if not exists sys_post -( - post_id int8, - tenant_id varchar(20) default '000000'::varchar, - dept_id int8, - post_code varchar(64) not null, - post_category varchar(100) default null, - post_name varchar(50) not null, - post_sort int4 not null, - status char not null, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint "sys_post_pk" primary key (post_id) -); - -comment on table sys_post is '岗位信息表'; -comment on column sys_post.post_id is '岗位ID'; -comment on column sys_post.tenant_id is '租户编号'; -comment on column sys_post.dept_id is '部门id'; -comment on column sys_post.post_code is '岗位编码'; -comment on column sys_post.post_category is '岗位类别编码'; -comment on column sys_post.post_name is '岗位名称'; -comment on column sys_post.post_sort is '显示顺序'; -comment on column sys_post.status is '状态（0正常 1停用）'; -comment on column sys_post.create_dept is '创建部门'; -comment on column sys_post.create_by is '创建者'; -comment on column sys_post.create_time is '创建时间'; -comment on column sys_post.update_by is '更新者'; -comment on column sys_post.update_time is '更新时间'; -comment on column sys_post.remark is '备注'; - --- ---------------------------- --- 初始化-岗位信息表数据 --- ---------------------------- -insert into sys_post values(1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, now(), null, null, ''); -insert into sys_post values(2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, now(), null, null, ''); -insert into sys_post values(3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, now(), null, null, ''); -insert into sys_post values(4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, now(), null, null, ''); - --- ---------------------------- --- 4、角色信息表 --- ---------------------------- -create table if not exists sys_role -( - role_id int8, - tenant_id varchar(20) default '000000'::varchar, - role_name varchar(30) not null, - role_key varchar(100) not null, - role_sort int4 not null, - data_scope char default '1'::bpchar, - menu_check_strictly bool default true, - dept_check_strictly bool default true, - status char not null, - del_flag char default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint "sys_role_pk" primary key (role_id) -); - -comment on table sys_role is '角色信息表'; -comment on column sys_role.role_id is '角色ID'; -comment on column sys_role.tenant_id is '租户编号'; -comment on column sys_role.role_name is '角色名称'; -comment on column sys_role.role_key is '角色权限字符串'; -comment on column sys_role.role_sort is '显示顺序'; -comment on column sys_role.data_scope is '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）'; -comment on column sys_role.menu_check_strictly is '菜单树选择项是否关联显示'; -comment on column sys_role.dept_check_strictly is '部门树选择项是否关联显示'; -comment on column sys_role.status is '角色状态（0正常 1停用）'; -comment on column sys_role.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_role.create_dept is '创建部门'; -comment on column sys_role.create_by is '创建者'; -comment on column sys_role.create_time is '创建时间'; -comment on column sys_role.update_by is '更新者'; -comment on column sys_role.update_time is '更新时间'; -comment on column sys_role.remark is '备注'; - --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_role values('1', '000000', '超级管理员', 'superadmin', 1, '1', 't', 't', '0', '0', 103, 1, now(), null, null, '超级管理员'); -insert into sys_role values('3', '000000', '本部门及以下', 'test1', 3, '4', 't', 't', '0', '0', 103, 1, now(), NULL, NULL, ''); -insert into sys_role values('4', '000000', '仅本人', 'test2', 4, '5', 't', 't', '0', '0', 103, 1, now(), NULL, NULL, ''); - --- ---------------------------- --- 5、菜单权限表 --- ---------------------------- -create table if not exists sys_menu -( - menu_id int8, - menu_name varchar(50) not null, - parent_id int8 default 0, - order_num int4 default 0, - path varchar(200) default ''::varchar, - component varchar(255) default null::varchar, - query_param varchar(255) default null::varchar, - is_frame char default '1'::bpchar, - is_cache char default '0'::bpchar, - menu_type char default ''::bpchar, - visible char default '0'::bpchar, - status char default '0'::bpchar, - perms varchar(100) default null::varchar, - icon varchar(100) default '#'::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default ''::varchar, - constraint "sys_menu_pk" primary key (menu_id) -); - -comment on table sys_menu is '菜单权限表'; -comment on column sys_menu.menu_id is '菜单ID'; -comment on column sys_menu.menu_name is '菜单名称'; -comment on column sys_menu.parent_id is '父菜单ID'; -comment on column sys_menu.order_num is '显示顺序'; -comment on column sys_menu.path is '路由地址'; -comment on column sys_menu.component is '组件路径'; -comment on column sys_menu.query_param is '路由参数'; -comment on column sys_menu.is_frame is '是否为外链（0是 1否）'; -comment on column sys_menu.is_cache is '是否缓存（0缓存 1不缓存）'; -comment on column sys_menu.menu_type is '菜单类型（M目录 C菜单 F按钮）'; -comment on column sys_menu.visible is '显示状态（0显示 1隐藏）'; -comment on column sys_menu.status is '菜单状态（0正常 1停用）'; -comment on column sys_menu.perms is '权限标识'; -comment on column sys_menu.icon is '菜单图标'; -comment on column sys_menu.create_dept is '创建部门'; -comment on column sys_menu.create_by is '创建者'; -comment on column sys_menu.create_time is '创建时间'; -comment on column sys_menu.update_by is '更新者'; -comment on column sys_menu.update_time is '更新时间'; -comment on column sys_menu.remark is '备注'; - --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', '1', '0', 'M', '0', '0', '', 'system', 103, 1, now(), null, null, '系统管理目录'); -insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', '1', '0', 'M', '0', '0', '', 'chart', 103, 1, now(), null, null, '租户管理目录'); -insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), null, null, '系统监控目录'); -insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', '1', '0', 'M', '0', '0', '', 'tool', 103, 1, now(), null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', '0', '0', 'M', '0', '0', '', 'guide', 103, 1, now(), null, null, 'RuoYi-Vue-Plus官网地址'); -insert into sys_menu VALUES('5', '测试菜单', '0', '5', 'demo', null, '', '1', '0', 'M', '0', '0', null, 'star', 103, 1, now(), null, null, '测试菜单'); --- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '1', '0', 'C', '0', '0', 'system:user:list', 'user', 103, 1, now(), null, null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '1', '0', 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, now(), null, null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', '1', '0', 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, now(), null, null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', '1', '0', 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, now(), null, null, '部门管理菜单'); -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', '1', '0', 'C', '0', '0', 'system:post:list', 'post', 103, 1, now(), null, null, '岗位管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', '1', '0', 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, now(), null, null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', '1', '0', 'C', '0', '0', 'system:config:list', 'edit', 103, 1, now(), null, null, '参数设置菜单'); -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', '1', '0', 'C', '0', '0', 'system:notice:list', 'message', 103, 1, now(), null, null, '通知公告菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', '1', '0', 'M', '0', '0', '', 'log', 103, 1, now(), null, null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', '1', '0', 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, now(), null, null, '在线用户菜单'); -insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', '1', '0', 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, now(), null, null, '缓存监控菜单'); -insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', '1', '0', 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, now(), null, null, '代码生成菜单'); -insert into sys_menu values('121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', '1', '0', 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, now(), null, null, '租户管理菜单'); -insert into sys_menu values('122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', '1', '0', 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, now(), null, null, '租户套餐管理菜单'); -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', '1', '0', 'C', '0', '0', 'system:client:list', 'international', 103, 1, now(), null, null, '客户端管理菜单'); - --- springboot-admin监控 -insert into sys_menu values('117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', '1', '0', 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, now(), null, null, 'Admin监控菜单'); --- oss菜单 -insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', '1', '0', 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, now(), null, null, '文件管理菜单'); --- snail-job server控制台 -insert into sys_menu values('120', '任务调度中心', '2', '6', 'snailjob', 'monitor/snailjob/index', '', '1', '0', 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, now(), null, null, 'SnailJob控制台菜单'); - --- 三级菜单 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', '1', '0', 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, now(), null, null, '操作日志菜单'); -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', '1', '0', 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, now(), null, null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_menu values('1001', '用户查询', '100', '1', '', '', '', '1', '0', 'F', '0', '0', 'system:user:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1002', '用户新增', '100', '2', '', '', '', '1', '0', 'F', '0', '0', 'system:user:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1003', '用户修改', '100', '3', '', '', '', '1', '0', 'F', '0', '0', 'system:user:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1004', '用户删除', '100', '4', '', '', '', '1', '0', 'F', '0', '0', 'system:user:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1005', '用户导出', '100', '5', '', '', '', '1', '0', 'F', '0', '0', 'system:user:export', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1006', '用户导入', '100', '6', '', '', '', '1', '0', 'F', '0', '0', 'system:user:import', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1007', '重置密码', '100', '7', '', '', '', '1', '0', 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, now(), null, null, ''); --- 角色管理按钮 -insert into sys_menu values('1008', '角色查询', '101', '1', '', '', '', '1', '0', 'F', '0', '0', 'system:role:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1009', '角色新增', '101', '2', '', '', '', '1', '0', 'F', '0', '0', 'system:role:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1010', '角色修改', '101', '3', '', '', '', '1', '0', 'F', '0', '0', 'system:role:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1011', '角色删除', '101', '4', '', '', '', '1', '0', 'F', '0', '0', 'system:role:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1012', '角色导出', '101', '5', '', '', '', '1', '0', 'F', '0', '0', 'system:role:export', '#', 103, 1, now(), null, null, ''); --- 菜单管理按钮 -insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', '', '1', '0', 'F', '0', '0', 'system:menu:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', '', '1', '0', 'F', '0', '0', 'system:menu:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', '', '1', '0', 'F', '0', '0', 'system:menu:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', '', '1', '0', 'F', '0', '0', 'system:menu:remove', '#', 103, 1, now(), null, null, ''); --- 部门管理按钮 -insert into sys_menu values('1017', '部门查询', '103', '1', '', '', '', '1', '0', 'F', '0', '0', 'system:dept:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1018', '部门新增', '103', '2', '', '', '', '1', '0', 'F', '0', '0', 'system:dept:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1019', '部门修改', '103', '3', '', '', '', '1', '0', 'F', '0', '0', 'system:dept:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1020', '部门删除', '103', '4', '', '', '', '1', '0', 'F', '0', '0', 'system:dept:remove', '#', 103, 1, now(), null, null, ''); --- 岗位管理按钮 -insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', '', '1', '0', 'F', '0', '0', 'system:post:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', '', '1', '0', 'F', '0', '0', 'system:post:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', '', '1', '0', 'F', '0', '0', 'system:post:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', '', '1', '0', 'F', '0', '0', 'system:post:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', '', '1', '0', 'F', '0', '0', 'system:post:export', '#', 103, 1, now(), null, null, ''); --- 字典管理按钮 -insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:export', '#', 103, 1, now(), null, null, ''); --- 参数设置按钮 -insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:export', '#', 103, 1, now(), null, null, ''); --- 通知公告按钮 -insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:remove', '#', 103, 1, now(), null, null, ''); --- 操作日志按钮 -insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, now(), null, null, ''); --- 登录日志按钮 -insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, now(), null, null, ''); --- 在线用户按钮 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, now(), null, null, ''); --- 代码生成按钮 -insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:import', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:code', '#', 103, 1, now(), null, null, ''); --- oss相关按钮 -insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:upload', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:download', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, now(), null, null, ''); --- 租户管理相关按钮 -insert into sys_menu values('1606', '租户查询', '121', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenant:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1607', '租户新增', '121', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenant:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1608', '租户修改', '121', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1609', '租户删除', '121', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1610', '租户导出', '121', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenant:export', '#', 103, 1, now(), null, null, ''); --- 租户套餐管理相关按钮 -insert into sys_menu values('1611', '租户套餐查询', '122', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1612', '租户套餐新增', '122', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1613', '租户套餐修改', '122', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1614', '租户套餐删除', '122', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1615', '租户套餐导出', '122', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, now(), null, null, ''); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:export', '#', 103, 1, now(), null, null, ''); --- 测试菜单 -INSERT INTO sys_menu VALUES('1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', '1', '0', 'C', '0', '0', 'demo:demo:list', '#', 103, 1, now(), NULL, NULL, '测试单表菜单'); -INSERT INTO sys_menu VALUES('1501', '测试单表查询', '1500', '1', '#', '', '', '1', '0', 'F', '0', '0', 'demo:demo:query', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1502', '测试单表新增', '1500', '2', '#', '', '', '1', '0', 'F', '0', '0', 'demo:demo:add', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1503', '测试单表修改', '1500', '3', '#', '', '', '1', '0', 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1504', '测试单表删除', '1500', '4', '#', '', '', '1', '0', 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1505', '测试单表导出', '1500', '5', '#', '', '', '1', '0', 'F', '0', '0', 'demo:demo:export', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', '1', '0', 'C', '0', '0', 'demo:tree:list', '#', 103, 1, now(), NULL, NULL, '测试树表菜单'); -INSERT INTO sys_menu VALUES('1507', '测试树表查询', '1506', '1', '#', '', '', '1', '0', 'F', '0', '0', 'demo:tree:query', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1508', '测试树表新增', '1506', '2', '#', '', '', '1', '0', 'F', '0', '0', 'demo:tree:add', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1509', '测试树表修改', '1506', '3', '#', '', '', '1', '0', 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1510', '测试树表删除', '1506', '4', '#', '', '', '1', '0', 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES('1511', '测试树表导出', '1506', '5', '#', '', '', '1', '0', 'F', '0', '0', 'demo:tree:export', '#', 103, 1, now(), NULL, NULL, ''); - - --- ---------------------------- --- 6、用户和角色关联表 用户N-1角色 --- ---------------------------- -create table if not exists sys_user_role -( - user_id int8 not null, - role_id int8 not null, - constraint sys_user_role_pk primary key (user_id, role_id) -); - -comment on table sys_user_role is '用户和角色关联表'; -comment on column sys_user_role.user_id is '用户ID'; -comment on column sys_user_role.role_id is '角色ID'; - --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('3', '3'); -insert into sys_user_role values ('4', '4'); - --- ---------------------------- --- 7、角色和菜单关联表 角色1-N菜单 --- ---------------------------- -create table if not exists sys_role_menu -( - role_id int8 not null, - menu_id int8 not null, - constraint sys_role_menu_pk primary key (role_id, menu_id) -); - -comment on table sys_role_menu is '角色和菜单关联表'; -comment on column sys_role_menu.role_id is '角色ID'; -comment on column sys_role_menu.menu_id is '菜单ID'; - --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -insert into sys_role_menu values ('3', '1'); -insert into sys_role_menu values ('3', '5'); -insert into sys_role_menu values ('3', '100'); -insert into sys_role_menu values ('3', '101'); -insert into sys_role_menu values ('3', '102'); -insert into sys_role_menu values ('3', '103'); -insert into sys_role_menu values ('3', '104'); -insert into sys_role_menu values ('3', '105'); -insert into sys_role_menu values ('3', '106'); -insert into sys_role_menu values ('3', '107'); -insert into sys_role_menu values ('3', '108'); -insert into sys_role_menu values ('3', '500'); -insert into sys_role_menu values ('3', '501'); -insert into sys_role_menu values ('3', '1001'); -insert into sys_role_menu values ('3', '1002'); -insert into sys_role_menu values ('3', '1003'); -insert into sys_role_menu values ('3', '1004'); -insert into sys_role_menu values ('3', '1005'); -insert into sys_role_menu values ('3', '1006'); -insert into sys_role_menu values ('3', '1007'); -insert into sys_role_menu values ('3', '1008'); -insert into sys_role_menu values ('3', '1009'); -insert into sys_role_menu values ('3', '1010'); -insert into sys_role_menu values ('3', '1011'); -insert into sys_role_menu values ('3', '1012'); -insert into sys_role_menu values ('3', '1013'); -insert into sys_role_menu values ('3', '1014'); -insert into sys_role_menu values ('3', '1015'); -insert into sys_role_menu values ('3', '1016'); -insert into sys_role_menu values ('3', '1017'); -insert into sys_role_menu values ('3', '1018'); -insert into sys_role_menu values ('3', '1019'); -insert into sys_role_menu values ('3', '1020'); -insert into sys_role_menu values ('3', '1021'); -insert into sys_role_menu values ('3', '1022'); -insert into sys_role_menu values ('3', '1023'); -insert into sys_role_menu values ('3', '1024'); -insert into sys_role_menu values ('3', '1025'); -insert into sys_role_menu values ('3', '1026'); -insert into sys_role_menu values ('3', '1027'); -insert into sys_role_menu values ('3', '1028'); -insert into sys_role_menu values ('3', '1029'); -insert into sys_role_menu values ('3', '1030'); -insert into sys_role_menu values ('3', '1031'); -insert into sys_role_menu values ('3', '1032'); -insert into sys_role_menu values ('3', '1033'); -insert into sys_role_menu values ('3', '1034'); -insert into sys_role_menu values ('3', '1035'); -insert into sys_role_menu values ('3', '1036'); -insert into sys_role_menu values ('3', '1037'); -insert into sys_role_menu values ('3', '1038'); -insert into sys_role_menu values ('3', '1039'); -insert into sys_role_menu values ('3', '1040'); -insert into sys_role_menu values ('3', '1041'); -insert into sys_role_menu values ('3', '1042'); -insert into sys_role_menu values ('3', '1043'); -insert into sys_role_menu values ('3', '1044'); -insert into sys_role_menu values ('3', '1045'); -insert into sys_role_menu values ('3', '1500'); -insert into sys_role_menu values ('3', '1501'); -insert into sys_role_menu values ('3', '1502'); -insert into sys_role_menu values ('3', '1503'); -insert into sys_role_menu values ('3', '1504'); -insert into sys_role_menu values ('3', '1505'); -insert into sys_role_menu values ('3', '1506'); -insert into sys_role_menu values ('3', '1507'); -insert into sys_role_menu values ('3', '1508'); -insert into sys_role_menu values ('3', '1509'); -insert into sys_role_menu values ('3', '1510'); -insert into sys_role_menu values ('3', '1511'); -insert into sys_role_menu values ('4', '5'); -insert into sys_role_menu values ('4', '1500'); -insert into sys_role_menu values ('4', '1501'); -insert into sys_role_menu values ('4', '1502'); -insert into sys_role_menu values ('4', '1503'); -insert into sys_role_menu values ('4', '1504'); -insert into sys_role_menu values ('4', '1505'); -insert into sys_role_menu values ('4', '1506'); -insert into sys_role_menu values ('4', '1507'); -insert into sys_role_menu values ('4', '1508'); -insert into sys_role_menu values ('4', '1509'); -insert into sys_role_menu values ('4', '1510'); -insert into sys_role_menu values ('4', '1511'); - --- ---------------------------- --- 8、角色和部门关联表 角色1-N部门 --- ---------------------------- -create table if not exists sys_role_dept -( - role_id int8 not null, - dept_id int8 not null, - constraint sys_role_dept_pk primary key (role_id, dept_id) -); - -comment on table sys_role_dept is '角色和部门关联表'; -comment on column sys_role_dept.role_id is '角色ID'; -comment on column sys_role_dept.dept_id is '部门ID'; - - --- ---------------------------- --- 9、用户与岗位关联表 用户1-N岗位 --- ---------------------------- -create table if not exists sys_user_post -( - user_id int8 not null, - post_id int8 not null, - constraint sys_user_post_pk primary key (user_id, post_id) -); - -comment on table sys_user_post is '用户与岗位关联表'; -comment on column sys_user_post.user_id is '用户ID'; -comment on column sys_user_post.post_id is '岗位ID'; - --- ---------------------------- --- 初始化-用户与岗位关联表数据 --- ---------------------------- -insert into sys_user_post values ('1', '1'); - --- ---------------------------- --- 10、操作日志记录 --- ---------------------------- -create table if not exists sys_oper_log -( - oper_id int8, - tenant_id varchar(20) default '000000'::varchar, - title varchar(50) default ''::varchar, - business_type int4 default 0, - method varchar(100) default ''::varchar, - request_method varchar(10) default ''::varchar, - operator_type int4 default 0, - oper_name varchar(50) default ''::varchar, - dept_name varchar(50) default ''::varchar, - oper_url varchar(255) default ''::varchar, - oper_ip varchar(128) default ''::varchar, - oper_location varchar(255) default ''::varchar, - oper_param varchar(2000) default ''::varchar, - json_result varchar(2000) default ''::varchar, - status int4 default 0, - error_msg varchar(2000) default ''::varchar, - oper_time timestamp, - cost_time int8 default 0, - constraint sys_oper_log_pk primary key (oper_id) -); - -create index idx_sys_oper_log_bt ON sys_oper_log (business_type); -create index idx_sys_oper_log_s ON sys_oper_log (status); -create index idx_sys_oper_log_ot ON sys_oper_log (oper_time); - -comment on table sys_oper_log is '操作日志记录'; -comment on column sys_oper_log.oper_id is '日志主键'; -comment on column sys_oper_log.tenant_id is '租户编号'; -comment on column sys_oper_log.title is '模块标题'; -comment on column sys_oper_log.business_type is '业务类型（0其它 1新增 2修改 3删除）'; -comment on column sys_oper_log.method is '方法名称'; -comment on column sys_oper_log.request_method is '请求方式'; -comment on column sys_oper_log.operator_type is '操作类别（0其它 1后台用户 2手机端用户）'; -comment on column sys_oper_log.oper_name is '操作人员'; -comment on column sys_oper_log.dept_name is '部门名称'; -comment on column sys_oper_log.oper_url is '请求URL'; -comment on column sys_oper_log.oper_ip is '主机地址'; -comment on column sys_oper_log.oper_location is '操作地点'; -comment on column sys_oper_log.oper_param is '请求参数'; -comment on column sys_oper_log.json_result is '返回参数'; -comment on column sys_oper_log.status is '操作状态（0正常 1异常）'; -comment on column sys_oper_log.error_msg is '错误消息'; -comment on column sys_oper_log.oper_time is '操作时间'; -comment on column sys_oper_log.cost_time is '消耗时间'; - --- ---------------------------- --- 11、字典类型表 --- ---------------------------- -create table if not exists sys_dict_type -( - dict_id int8, - tenant_id varchar(20) default '000000'::varchar, - dict_name varchar(100) default ''::varchar, - dict_type varchar(100) default ''::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint sys_dict_type_pk primary key (dict_id) -); - -create unique index sys_dict_type_index1 ON sys_dict_type (tenant_id, dict_type); - -comment on table sys_dict_type is '字典类型表'; -comment on column sys_dict_type.dict_id is '字典主键'; -comment on column sys_dict_type.tenant_id is '租户编号'; -comment on column sys_dict_type.dict_name is '字典名称'; -comment on column sys_dict_type.dict_type is '字典类型'; -comment on column sys_dict_type.create_dept is '创建部门'; -comment on column sys_dict_type.create_by is '创建者'; -comment on column sys_dict_type.create_time is '创建时间'; -comment on column sys_dict_type.update_by is '更新者'; -comment on column sys_dict_type.update_time is '更新时间'; -comment on column sys_dict_type.remark is '备注'; - -insert into sys_dict_type values(1, '000000', '用户性别', 'sys_user_sex', 103, 1, now(), null, null, '用户性别列表'); -insert into sys_dict_type values(2, '000000', '菜单状态', 'sys_show_hide', 103, 1, now(), null, null, '菜单状态列表'); -insert into sys_dict_type values(3, '000000', '系统开关', 'sys_normal_disable', 103, 1, now(), null, null, '系统开关列表'); -insert into sys_dict_type values(6, '000000', '系统是否', 'sys_yes_no', 103, 1, now(), null, null, '系统是否列表'); -insert into sys_dict_type values(7, '000000', '通知类型', 'sys_notice_type', 103, 1, now(), null, null, '通知类型列表'); -insert into sys_dict_type values(8, '000000', '通知状态', 'sys_notice_status', 103, 1, now(), null, null, '通知状态列表'); -insert into sys_dict_type values(9, '000000', '操作类型', 'sys_oper_type', 103, 1, now(), null, null, '操作类型列表'); -insert into sys_dict_type values(10, '000000', '系统状态', 'sys_common_status', 103, 1, now(), null, null, '登录状态列表'); -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, now(), null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, now(), null, null, '客户端设备类型'); - --- ---------------------------- --- 12、字典数据表 --- ---------------------------- -create table if not exists sys_dict_data -( - dict_code int8, - tenant_id varchar(20) default '000000'::varchar, - dict_sort int4 default 0, - dict_label varchar(100) default ''::varchar, - dict_value varchar(100) default ''::varchar, - dict_type varchar(100) default ''::varchar, - css_class varchar(100) default null::varchar, - list_class varchar(100) default null::varchar, - is_default char default 'N'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint sys_dict_data_pk primary key (dict_code) -); - -comment on table sys_dict_data is '字典数据表'; -comment on column sys_dict_data.dict_code is '字典编码'; -comment on column sys_dict_type.tenant_id is '租户编号'; -comment on column sys_dict_data.dict_sort is '字典排序'; -comment on column sys_dict_data.dict_label is '字典标签'; -comment on column sys_dict_data.dict_value is '字典键值'; -comment on column sys_dict_data.dict_type is '字典类型'; -comment on column sys_dict_data.css_class is '样式属性（其他样式扩展）'; -comment on column sys_dict_data.list_class is '表格回显样式'; -comment on column sys_dict_data.is_default is '是否默认（Y是 N否）'; -comment on column sys_dict_data.create_dept is '创建部门'; -comment on column sys_dict_data.create_by is '创建者'; -comment on column sys_dict_data.create_time is '创建时间'; -comment on column sys_dict_data.update_by is '更新者'; -comment on column sys_dict_data.update_time is '更新时间'; -comment on column sys_dict_data.remark is '备注'; - -insert into sys_dict_data values(1, '000000', 1, '男', '0', 'sys_user_sex', '', '', 'Y', 103, 1, now(), null, null, '性别男'); -insert into sys_dict_data values(2, '000000', 2, '女', '1', 'sys_user_sex', '', '', 'N', 103, 1, now(), null, null, '性别女'); -insert into sys_dict_data values(3, '000000', 3, '未知', '2', 'sys_user_sex', '', '', 'N', 103, 1, now(), null, null, '性别未知'); -insert into sys_dict_data values(4, '000000', 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', 103, 1, now(), null, null, '显示菜单'); -insert into sys_dict_data values(5, '000000', 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', 103, 1, now(), null, null, '隐藏菜单'); -insert into sys_dict_data values(6, '000000', 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', 103, 1, now(), null, null, '正常状态'); -insert into sys_dict_data values(7, '000000', 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', 103, 1, now(), null, null, '停用状态'); -insert into sys_dict_data values(12, '000000', 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', 103, 1, now(), null, null, '系统默认是'); -insert into sys_dict_data values(13, '000000', 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', 103, 1, now(), null, null, '系统默认否'); -insert into sys_dict_data values(14, '000000', 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', 103, 1, now(), null, null, '通知'); -insert into sys_dict_data values(15, '000000', 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', 103, 1, now(), null, null, '公告'); -insert into sys_dict_data values(16, '000000', 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', 103, 1, now(), null, null, '正常状态'); -insert into sys_dict_data values(17, '000000', 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', 103, 1, now(), null, null, '关闭状态'); -insert into sys_dict_data values(29, '000000', 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', 103, 1, now(), null, null, '其他操作'); -insert into sys_dict_data values(18, '000000', 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', 103, 1, now(), null, null, '新增操作'); -insert into sys_dict_data values(19, '000000', 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', 103, 1, now(), null, null, '修改操作'); -insert into sys_dict_data values(20, '000000', 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', 103, 1, now(), null, null, '删除操作'); -insert into sys_dict_data values(21, '000000', 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', 103, 1, now(), null, null, '授权操作'); -insert into sys_dict_data values(22, '000000', 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', 103, 1, now(), null, null, '导出操作'); -insert into sys_dict_data values(23, '000000', 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', 103, 1, now(), null, null, '导入操作'); -insert into sys_dict_data values(24, '000000', 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', 103, 1, now(), null, null, '强退操作'); -insert into sys_dict_data values(25, '000000', 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', 103, 1, now(), null, null, '生成操作'); -insert into sys_dict_data values(26, '000000', 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', 103, 1, now(), null, null, '清空操作'); -insert into sys_dict_data values(27, '000000', 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', 103, 1, now(), null, null, '正常状态'); -insert into sys_dict_data values(28, '000000', 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', 103, 1, now(), null, null, '停用状态'); -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', '', 'default', 'N', 103, 1, now(), null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', '', 'default', 'N', 103, 1, now(), null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', '', 'default', 'N', 103, 1, now(), null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', '', 'default', 'N', 103, 1, now(), null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', '', 'default', 'N', 103, 1, now(), null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', 103, 1, now(), null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', 103, 1, now(), null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', 103, 1, now(), null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, now(), null, null, '小程序'); - - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -create table if not exists sys_config -( - config_id int8, - tenant_id varchar(20) default '000000'::varchar, - config_name varchar(100) default ''::varchar, - config_key varchar(100) default ''::varchar, - config_value varchar(500) default ''::varchar, - config_type char default 'N'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint sys_config_pk primary key (config_id) -); - -comment on table sys_config is '参数配置表'; -comment on column sys_config.config_id is '参数主键'; -comment on column sys_config.tenant_id is '租户编号'; -comment on column sys_config.config_name is '参数名称'; -comment on column sys_config.config_key is '参数键名'; -comment on column sys_config.config_value is '参数键值'; -comment on column sys_config.config_type is '系统内置（Y是 N否）'; -comment on column sys_config.create_dept is '创建部门'; -comment on column sys_config.create_by is '创建者'; -comment on column sys_config.create_time is '创建时间'; -comment on column sys_config.update_by is '更新者'; -comment on column sys_config.update_time is '更新时间'; -comment on column sys_config.remark is '备注'; - -insert into sys_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, now(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, now(), null, null, '初始化密码 123456' ); -insert into sys_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, now(), null, null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, now(), null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, now(), null, null, 'true:开启, false:关闭'); - - --- ---------------------------- --- 14、系统访问记录 --- ---------------------------- -create table if not exists sys_logininfor -( - info_id int8, - tenant_id varchar(20) default '000000'::varchar, - user_name varchar(50) default ''::varchar, - client_key varchar(32) default ''::varchar, - device_type varchar(32) default ''::varchar, - ipaddr varchar(128) default ''::varchar, - login_location varchar(255) default ''::varchar, - browser varchar(50) default ''::varchar, - os varchar(50) default ''::varchar, - status char default '0'::bpchar, - msg varchar(255) default ''::varchar, - login_time timestamp, - constraint sys_logininfor_pk primary key (info_id) -); - -create index idx_sys_logininfor_s ON sys_logininfor (status); -create index idx_sys_logininfor_lt ON sys_logininfor (login_time); - -comment on table sys_logininfor is '系统访问记录'; -comment on column sys_logininfor.info_id is '访问ID'; -comment on column sys_logininfor.tenant_id is '租户编号'; -comment on column sys_logininfor.user_name is '用户账号'; -comment on column sys_logininfor.client_key is '客户端'; -comment on column sys_logininfor.device_type is '设备类型'; -comment on column sys_logininfor.ipaddr is '登录IP地址'; -comment on column sys_logininfor.login_location is '登录地点'; -comment on column sys_logininfor.browser is '浏览器类型'; -comment on column sys_logininfor.os is '操作系统'; -comment on column sys_logininfor.status is '登录状态（0成功 1失败）'; -comment on column sys_logininfor.msg is '提示消息'; -comment on column sys_logininfor.login_time is '访问时间'; - --- ---------------------------- --- 17、通知公告表 --- ---------------------------- -create table if not exists sys_notice -( - notice_id int8, - tenant_id varchar(20) default '000000'::varchar, - notice_title varchar(50) not null, - notice_type char not null, - notice_content text, - status char default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(255) default null::varchar, - constraint sys_notice_pk primary key (notice_id) -); - -comment on table sys_notice is '通知公告表'; -comment on column sys_notice.notice_id is '公告ID'; -comment on column sys_notice.tenant_id is '租户编号'; -comment on column sys_notice.notice_title is '公告标题'; -comment on column sys_notice.notice_type is '公告类型（1通知 2公告）'; -comment on column sys_notice.notice_content is '公告内容'; -comment on column sys_notice.status is '公告状态（0正常 1关闭）'; -comment on column sys_notice.create_dept is '创建部门'; -comment on column sys_notice.create_by is '创建者'; -comment on column sys_notice.create_time is '创建时间'; -comment on column sys_notice.update_by is '更新者'; -comment on column sys_notice.update_time is '更新时间'; -comment on column sys_notice.remark is '备注'; - --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, now(), null, null, '管理员'); -insert into sys_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, now(), null, null, '管理员'); - - --- ---------------------------- --- 18、代码生成业务表 --- ---------------------------- -create table if not exists gen_table -( - table_id int8, - data_name varchar(200) default ''::varchar, - table_name varchar(200) default ''::varchar, - table_comment varchar(500) default ''::varchar, - sub_table_name varchar(64) default ''::varchar, - sub_table_fk_name varchar(64) default ''::varchar, - class_name varchar(100) default ''::varchar, - tpl_category varchar(200) default 'crud'::varchar, - package_name varchar(100) default null::varchar, - module_name varchar(30) default null::varchar, - business_name varchar(30) default null::varchar, - function_name varchar(50) default null::varchar, - function_author varchar(50) default null::varchar, - gen_type char default '0'::bpchar not null, - gen_path varchar(200) default '/'::varchar, - options varchar(1000) default null::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default null::varchar, - constraint gen_table_pk primary key (table_id) -); - -comment on table gen_table is '代码生成业务表'; -comment on column gen_table.table_id is '编号'; -comment on column gen_table.data_name is '数据源名称'; -comment on column gen_table.table_name is '表名称'; -comment on column gen_table.table_comment is '表描述'; -comment on column gen_table.sub_table_name is '关联子表的表名'; -comment on column gen_table.sub_table_fk_name is '子表关联的外键名'; -comment on column gen_table.class_name is '实体类名称'; -comment on column gen_table.tpl_category is '使用的模板（CRUD单表操作 TREE树表操作）'; -comment on column gen_table.package_name is '生成包路径'; -comment on column gen_table.module_name is '生成模块名'; -comment on column gen_table.business_name is '生成业务名'; -comment on column gen_table.function_name is '生成功能名'; -comment on column gen_table.function_author is '生成功能作者'; -comment on column gen_table.gen_type is '生成代码方式（0zip压缩包 1自定义路径）'; -comment on column gen_table.gen_path is '生成路径（不填默认项目路径）'; -comment on column gen_table.options is '其它生成选项'; -comment on column gen_table.create_dept is '创建部门'; -comment on column gen_table.create_by is '创建者'; -comment on column gen_table.create_time is '创建时间'; -comment on column gen_table.update_by is '更新者'; -comment on column gen_table.update_time is '更新时间'; -comment on column gen_table.remark is '备注'; - --- ---------------------------- --- 19、代码生成业务表字段 --- ---------------------------- -create table if not exists gen_table_column -( - column_id int8, - table_id int8, - column_name varchar(200) default null::varchar, - column_comment varchar(500) default null::varchar, - column_type varchar(100) default null::varchar, - java_type varchar(500) default null::varchar, - java_field varchar(200) default null::varchar, - is_pk char default null::bpchar, - is_increment char default null::bpchar, - is_required char default null::bpchar, - is_insert char default null::bpchar, - is_edit char default null::bpchar, - is_list char default null::bpchar, - is_query char default null::bpchar, - query_type varchar(200) default 'EQ'::varchar, - html_type varchar(200) default null::varchar, - dict_type varchar(200) default ''::varchar, - sort int4, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint gen_table_column_pk primary key (column_id) -); - -comment on table gen_table_column is '代码生成业务表字段'; -comment on column gen_table_column.column_id is '编号'; -comment on column gen_table_column.table_id is '归属表编号'; -comment on column gen_table_column.column_name is '列名称'; -comment on column gen_table_column.column_comment is '列描述'; -comment on column gen_table_column.column_type is '列类型'; -comment on column gen_table_column.java_type is 'JAVA类型'; -comment on column gen_table_column.java_field is 'JAVA字段名'; -comment on column gen_table_column.is_pk is '是否主键（1是）'; -comment on column gen_table_column.is_increment is '是否自增（1是）'; -comment on column gen_table_column.is_required is '是否必填（1是）'; -comment on column gen_table_column.is_insert is '是否为插入字段（1是）'; -comment on column gen_table_column.is_edit is '是否编辑字段（1是）'; -comment on column gen_table_column.is_list is '是否列表字段（1是）'; -comment on column gen_table_column.is_query is '是否查询字段（1是）'; -comment on column gen_table_column.query_type is '查询方式（等于、不等于、大于、小于、范围）'; -comment on column gen_table_column.html_type is '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）'; -comment on column gen_table_column.dict_type is '字典类型'; -comment on column gen_table_column.sort is '排序'; -comment on column gen_table_column.create_dept is '创建部门'; -comment on column gen_table_column.create_by is '创建者'; -comment on column gen_table_column.create_time is '创建时间'; -comment on column gen_table_column.update_by is '更新者'; -comment on column gen_table_column.update_time is '更新时间'; - --- ---------------------------- --- OSS对象存储表 --- ---------------------------- -create table if not exists sys_oss -( - oss_id int8, - tenant_id varchar(20) default '000000'::varchar, - file_name varchar(255) default ''::varchar not null, - original_name varchar(255) default ''::varchar not null, - file_suffix varchar(10) default ''::varchar not null, - url varchar(500) default ''::varchar not null, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - service varchar(20) default 'minio'::varchar, - constraint sys_oss_pk primary key (oss_id) -); - -comment on table sys_oss is 'OSS对象存储表'; -comment on column sys_oss.oss_id is '对象存储主键'; -comment on column sys_oss.tenant_id is '租户编码'; -comment on column sys_oss.file_name is '文件名'; -comment on column sys_oss.original_name is '原名'; -comment on column sys_oss.file_suffix is '文件后缀名'; -comment on column sys_oss.url is 'URL地址'; -comment on column sys_oss.create_by is '上传人'; -comment on column sys_oss.create_dept is '创建部门'; -comment on column sys_oss.create_time is '创建时间'; -comment on column sys_oss.update_by is '更新者'; -comment on column sys_oss.update_time is '更新时间'; -comment on column sys_oss.service is '服务商'; - --- ---------------------------- --- OSS对象存储动态配置表 --- ---------------------------- -create table if not exists sys_oss_config -( - oss_config_id int8, - tenant_id varchar(20) default '000000'::varchar, - config_key varchar(20) default ''::varchar not null, - access_key varchar(255) default ''::varchar, - secret_key varchar(255) default ''::varchar, - bucket_name varchar(255) default ''::varchar, - prefix varchar(255) default ''::varchar, - endpoint varchar(255) default ''::varchar, - domain varchar(255) default ''::varchar, - is_https char default 'N'::bpchar, - region varchar(255) default ''::varchar, - access_policy char(1) default '1'::bpchar not null, - status char default '1'::bpchar, - ext1 varchar(255) default ''::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - remark varchar(500) default ''::varchar, - constraint sys_oss_config_pk primary key (oss_config_id) -); - -comment on table sys_oss_config is '对象存储配置表'; -comment on column sys_oss_config.oss_config_id is '主键'; -comment on column sys_oss_config.tenant_id is '租户编码'; -comment on column sys_oss_config.config_key is '配置key'; -comment on column sys_oss_config.access_key is 'accessKey'; -comment on column sys_oss_config.secret_key is '秘钥'; -comment on column sys_oss_config.bucket_name is '桶名称'; -comment on column sys_oss_config.prefix is '前缀'; -comment on column sys_oss_config.endpoint is '访问站点'; -comment on column sys_oss_config.domain is '自定义域名'; -comment on column sys_oss_config.is_https is '是否https（Y=是,N=否）'; -comment on column sys_oss_config.region is '域'; -comment on column sys_oss_config.access_policy is '桶权限类型(0=private 1=public 2=custom)'; -comment on column sys_oss_config.status is '是否默认（0=是,1=否）'; -comment on column sys_oss_config.ext1 is '扩展字段'; -comment on column sys_oss_config.create_dept is '创建部门'; -comment on column sys_oss_config.create_by is '创建者'; -comment on column sys_oss_config.create_time is '创建时间'; -comment on column sys_oss_config.update_by is '更新者'; -comment on column sys_oss_config.update_time is '更新时间'; -comment on column sys_oss_config.remark is '备注'; - -insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1', '0', '', 103, 1, now(), 1, now(), null); -insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), null); -insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), null); -insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1', '1', '', 103, 1, now(), 1, now(), null); -insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), NULL); - --- ---------------------------- --- 系统授权表 --- ---------------------------- -create table sys_client ( - id int8, - client_id varchar(64) default ''::varchar, - client_key varchar(32) default ''::varchar, - client_secret varchar(255) default ''::varchar, - grant_type varchar(255) default ''::varchar, - device_type varchar(32) default ''::varchar, - active_timeout int4 default 1800, - timeout int4 default 604800, - status char(1) default '0'::bpchar, - del_flag char(1) default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint sys_client_pk primary key (id) -); - -comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主键'; -comment on column sys_client.client_id is '客户端id'; -comment on column sys_client.client_key is '客户端key'; -comment on column sys_client.client_secret is '客户端秘钥'; -comment on column sys_client.grant_type is '授权类型'; -comment on column sys_client.device_type is '设备类型'; -comment on column sys_client.active_timeout is 'token活跃超时时间'; -comment on column sys_client.timeout is 'token固定超时'; -comment on column sys_client.status is '状态（0正常 1停用）'; -comment on column sys_client.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_client.create_dept is '创建部门'; -comment on column sys_client.create_by is '创建者'; -comment on column sys_client.create_time is '创建时间'; -comment on column sys_client.update_by is '更新者'; -comment on column sys_client.update_time is '更新时间'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, now(), 1, now()); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, now(), 1, now()); - -create table if not exists test_demo -( - id int8, - tenant_id varchar(20) default '000000', - dept_id int8, - user_id int8, - order_num int4 default 0, - test_key varchar(255), - value varchar(255), - version int4 default 0, - create_dept int8, - create_time timestamp, - create_by int8, - update_time timestamp, - update_by int8, - del_flag int4 default 0 -); - -comment on table test_demo is '测试单表'; -comment on column test_demo.id is '主键'; -comment on column test_demo.tenant_id is '租户编号'; -comment on column test_demo.dept_id is '部门id'; -comment on column test_demo.user_id is '用户id'; -comment on column test_demo.order_num is '排序号'; -comment on column test_demo.test_key is 'key键'; -comment on column test_demo.value is '值'; -comment on column test_demo.version is '版本'; -comment on column test_demo.create_dept is '创建部门'; -comment on column test_demo.create_time is '创建时间'; -comment on column test_demo.create_by is '创建人'; -comment on column test_demo.update_time is '更新时间'; -comment on column test_demo.update_by is '更新人'; -comment on column test_demo.del_flag is '删除标志'; - -create table if not exists test_tree -( - id int8, - tenant_id varchar(20) default '000000', - parent_id int8 default 0, - dept_id int8, - user_id int8, - tree_name varchar(255), - version int4 default 0, - create_dept int8, - create_time timestamp, - create_by int8, - update_time timestamp, - update_by int8, - del_flag integer default 0 -); - -comment on table test_tree is '测试树表'; -comment on column test_tree.id is '主键'; -comment on column test_tree.tenant_id is '租户编号'; -comment on column test_tree.parent_id is '父id'; -comment on column test_tree.dept_id is '部门id'; -comment on column test_tree.user_id is '用户id'; -comment on column test_tree.tree_name is '值'; -comment on column test_tree.version is '版本'; -comment on column test_tree.create_dept is '创建部门'; -comment on column test_tree.create_time is '创建时间'; -comment on column test_tree.create_by is '创建人'; -comment on column test_tree.update_time is '更新时间'; -comment on column test_tree.update_by is '更新人'; -comment on column test_tree.del_flag is '删除标志'; - -INSERT INTO test_demo VALUES (1, '000000', 102, 4, 1, '测试数据权限', '测试', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (2, '000000', 102, 3, 2, '子节点1', '111', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (3, '000000', 102, 3, 3, '子节点2', '222', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (4, '000000', 108, 4, 4, '测试数据', 'demo', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (5, '000000', 108, 3, 13, '子节点11', '1111', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (6, '000000', 108, 3, 12, '子节点22', '2222', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (7, '000000', 108, 3, 11, '子节点33', '3333', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (8, '000000', 108, 3, 10, '子节点44', '4444', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (9, '000000', 108, 3, 9, '子节点55', '5555', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (10, '000000', 108, 3, 8, '子节点66', '6666', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (11, '000000', 108, 3, 7, '子节点77', '7777', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (12, '000000', 108, 3, 6, '子节点88', '8888', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (13, '000000', 108, 3, 5, '子节点99', '9999', 0, 103, now(), 1, NULL, NULL, 0); - -INSERT INTO test_tree VALUES (1, '000000', 0, 102, 4, '测试数据权限', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (2, '000000', 1, 102, 3, '子节点1', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (3, '000000', 2, 102, 3, '子节点2', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (4, '000000', 0, 108, 4, '测试树1', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (5, '000000', 4, 108, 3, '子节点11', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (6, '000000', 4, 108, 3, '子节点22', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (7, '000000', 4, 108, 3, '子节点33', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (8, '000000', 5, 108, 3, '子节点44', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (9, '000000', 6, 108, 3, '子节点55', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (10, '000000', 7, 108, 3, '子节点66', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (11, '000000', 7, 108, 3, '子节点77', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (12, '000000', 10, 108, 3, '子节点88', 0, 103, now(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (13, '000000', 10, 108, 3, '子节点99', 0, 103, now(), 1, NULL, NULL, 0); - --- 字符串自动转时间 避免框架时间查询报错问题 -create or replace function cast_varchar_to_timestamp(varchar) returns timestamptz as $$ -select to_timestamp($1, 'yyyy-mm-dd hh24:mi:ss'); -$$ language sql strict ; - -create cast (varchar as timestamptz) with function cast_varchar_to_timestamp as IMPLICIT; diff --git a/template/script/sql/postgres/postgres_ry_workflow.sql b/template/script/sql/postgres/postgres_ry_workflow.sql deleted file mode 100644 index 8a6078d..0000000 --- a/template/script/sql/postgres/postgres_ry_workflow.sql +++ /dev/null @@ -1,275 +0,0 @@ -insert into sys_menu values('11616', '工作流' , '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11617', '模型管理', '11616', '2', 'model', 'workflow/model/index', '', '1', '1', 'C', '0', '0', 'workflow:model:list', 'model', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), NULL, NULL, ''); -insert into sys_menu values('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, ''); - - --- 流程分类管理相关按钮 -insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove','#', 103, 1, now(), null, null, ''); -insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export','#', 103, 1, now(), null, null, ''); --- 请假单信息 -create table test_leave -( - id bigint not null - constraint test_leave_pk - primary key, - leave_type varchar(255), - start_date timestamp, - end_date timestamp, - leave_days bigint, - remark varchar(255), - status varchar(255), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp, - tenant_id varchar(20) -); - -comment on table test_leave is '请假申请表'; -comment on column test_leave.id is '主键'; -comment on column test_leave.leave_type is '请假类型'; -comment on column test_leave.start_date is '开始时间'; -comment on column test_leave.end_date is '结束时间'; -comment on column test_leave.remark is '请假原因'; -comment on column test_leave.status is '状态'; -comment on column test_leave.create_dept is '创建部门'; -comment on column test_leave.create_by is '创建者'; -comment on column test_leave.create_time is '创建时间'; -comment on column test_leave.update_by is '更新者'; -comment on column test_leave.update_time is '更新时间'; -comment on column test_leave.tenant_id is '租户编码'; - -alter table test_leave - owner to postgres; - --- 流程分类信息表 -create table wf_category -( - id bigint not null - constraint wf_category_pk - primary key, - category_name varchar(255), - category_code varchar(255), - parent_id bigint, - sort_num bigint, - tenant_id varchar(20), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp -); - -comment on table wf_category is '流程分类'; -comment on column wf_category.id is '主键'; -comment on column wf_category.category_name is '分类名称'; -comment on column wf_category.category_code is '分类编码'; -comment on column wf_category.parent_id is '父级id'; -comment on column wf_category.sort_num is '排序'; -comment on column wf_category.tenant_id is '租户id'; -comment on column wf_category.create_dept is '创建部门'; -comment on column wf_category.create_by is '创建者'; -comment on column wf_category.create_time is '创建时间'; -comment on column wf_category.update_by is '修改者'; -comment on column wf_category.update_time is '修改时间'; - -alter table wf_category - owner to postgres; - -create unique index uni_category_code - on wf_category (category_code); - -INSERT INTO wf_category values (1, 'OA', 'OA', 0, 0, '000000', 103, 1, now(), 1, now()); - -create table wf_task_back_node -( - id bigint not null - constraint pk_wf_task_back_node - primary key, - node_id varchar(255) not null, - node_name varchar(255) not null, - order_no bigint not null, - instance_id varchar(255) not null, - task_type varchar(255) not null, - assignee varchar(2000) not null, - tenant_id varchar(20), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp -); - -comment on table wf_task_back_node is '节点审批记录'; -comment on column wf_task_back_node.id is '主键'; -comment on column wf_task_back_node.node_id is '节点id'; -comment on column wf_task_back_node.node_name is '节点名称'; -comment on column wf_task_back_node.order_no is '排序'; -comment on column wf_task_back_node.instance_id is '流程实例id'; -comment on column wf_task_back_node.task_type is '节点类型'; -comment on column wf_task_back_node.assignee is '审批人'; -comment on column wf_task_back_node.tenant_id is '租户id'; -comment on column wf_task_back_node.create_dept is '创建部门'; -comment on column wf_task_back_node.create_by is '创建者'; -comment on column wf_task_back_node.create_time is '创建时间'; -comment on column wf_task_back_node.update_by is '修改者'; -comment on column wf_task_back_node.update_time is '修改时间'; - -alter table wf_task_back_node - owner to postgres; - -create table wf_definition_config -( - id bigint not null - constraint pk_wf_definition_config - primary key, - table_name varchar(255) not null, - definition_id varchar(255) not null, - process_key varchar(255) not null, - version bigint not null, - tenant_id varchar(20), - remark varchar(500), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp -); - -comment on table wf_definition_config is '流程定义配置'; -comment on column wf_definition_config.id is '主键'; -comment on column wf_definition_config.table_name is '表名'; -comment on column wf_definition_config.definition_id is '流程定义ID'; -comment on column wf_definition_config.process_key is '流程KEY'; -comment on column wf_definition_config.version is '流程版本'; -comment on column wf_definition_config.tenant_id is '租户id'; -comment on column wf_definition_config.remark is '备注'; -comment on column wf_definition_config.create_dept is '创建部门'; -comment on column wf_definition_config.create_by is '创建者'; -comment on column wf_definition_config.create_time is '创建时间'; -comment on column wf_definition_config.update_by is '修改者'; -comment on column wf_definition_config.update_time is '修改时间'; - -alter table wf_definition_config - owner to postgres; -create unique index uni_definition_id - on wf_definition_config (definition_id); - -create table wf_form_manage -( - id bigint not null - constraint pk_wf_form_manage - primary key, - form_name varchar(255) not null, - form_type varchar(255) not null, - router varchar(255) not null, - remark varchar(500), - tenant_id varchar(20), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp -); - -comment on table wf_form_manage is '表单管理'; -comment on column wf_form_manage.id is '主键'; -comment on column wf_form_manage.form_name is '表单名称'; -comment on column wf_form_manage.form_type is '表单类型'; -comment on column wf_form_manage.router is '路由地址/表单ID'; -comment on column wf_form_manage.remark is '备注'; -comment on column wf_form_manage.tenant_id is '租户id'; -comment on column wf_form_manage.create_dept is '创建部门'; -comment on column wf_form_manage.create_by is '创建者'; -comment on column wf_form_manage.create_time is '创建时间'; -comment on column wf_form_manage.update_by is '修改者'; -comment on column wf_form_manage.update_time is '修改时间'; - -insert into wf_form_manage(id, form_name, form_type, router, remark, tenant_id, create_dept, create_by, create_time, update_by, update_time) VALUES (1, '请假申请', 'static', '/workflow/leaveEdit/index', NULL, '000000', 103, 1, now(), 1, now()); - -create table wf_node_config -( - id bigint not null - constraint pk_wf_node_config - primary key, - form_id bigint, - form_type varchar(255), - node_name varchar(255) not null, - node_id varchar(255) not null, - definition_id varchar(255) not null, - apply_user_task char(1) default '0', - tenant_id varchar(20), - create_dept bigint, - create_by bigint, - create_time timestamp, - update_by bigint, - update_time timestamp -); - -comment on table wf_node_config is '节点配置'; -comment on column wf_node_config.id is '主键'; -comment on column wf_node_config.form_id is '表单id'; -comment on column wf_node_config.form_type is '表单类型'; -comment on column wf_node_config.node_id is '节点id'; -comment on column wf_node_config.node_name is '节点名称'; -comment on column wf_node_config.definition_id is '流程定义id'; -comment on column wf_node_config.apply_user_task is '是否为申请人节点 （0是 1否）'; -comment on column wf_node_config.tenant_id is '租户id'; -comment on column wf_node_config.create_dept is '创建部门'; -comment on column wf_node_config.create_by is '创建者'; -comment on column wf_node_config.create_time is '创建时间'; -comment on column wf_node_config.update_by is '修改者'; -comment on column wf_node_config.update_time is '修改时间'; - -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11638, '请假申请', 5, 1, 'leave', 'workflow/leave/index', 1, 0, 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, now(), NULL, NULL, '请假申请菜单'); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11639, '请假申请查询', 11638, 1, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11640, '请假申请新增', 11638, 2, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11641, '请假申请修改', 11638, 3, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11642, '请假申请删除', 11638, 4, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11643, '请假申请导出', 11638, 5, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, now(), NULL, NULL, ''); - -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (13, '000000', '业务状态', 'wf_business_status', 103, 1, now(), NULL, NULL, '业务状态列表'); -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (14, '000000', '表单类型', 'wf_form_type', 103, 1, now(), NULL, NULL, '表单类型列表'); - -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (39, '000000', 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已撤销'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (40, '000000', 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, now(), NULL, NULL, '草稿'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (41, '000000', 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1,now(), NULL, NULL, '待审核'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (42, '000000', 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, now(), NULL, NULL, '已完成'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (43, '000000', 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已作废'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (44, '000000', 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已退回'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (45, '000000', 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1,now(), NULL, NULL, '已终止'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (46, '000000', 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, now(), NULL, NULL, '自定义表单'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (47, '000000', 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '动态表单'); - --- 表单管理 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11628, '表单管理', '11616', '5', 'formManage', 'workflow/formManage/index', 1, 0, 'C', '0', '0', 'workflow:formManage:list', 'tree-table', 103, 1, now(), null, null, '表单管理菜单'); - --- 表单管理按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11644, '表单管理查询', 11628, '1', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:query', '', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11645, '表单管理新增', 11628, '2', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:add', '', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11646, '表单管理修改', 11628, '3', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:edit', '', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11647, '表单管理删除', 11628, '4', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:remove', '', 103, 1, now(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11648, '表单管理导出', 11628, '5', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:export', 'tree-table', 103, 1, now(), null, null, ''); diff --git a/template/script/sql/ry_job.sql b/template/script/sql/ry_job.sql deleted file mode 100644 index 396798e..0000000 --- a/template/script/sql/ry_job.sql +++ /dev/null @@ -1,515 +0,0 @@ -SET NAMES utf8mb4; - -CREATE TABLE `sj_namespace` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(64) NOT NULL COMMENT '名称', - `unique_id` varchar(64) NOT NULL COMMENT '唯一id', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_name` (`name`), - UNIQUE KEY `uk_unique_id` (`unique_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='命名空间'; - -INSERT INTO `sj_namespace` VALUES (1, 'Development', 'dev', '', 0, now(), now()); -INSERT INTO `sj_namespace` VALUES (2, 'Production', 'prod', '', 0, now(), now()); - -CREATE TABLE `sj_group_config` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '组描述', - `token` varchar(64) NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT' COMMENT 'token', - `group_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '组状态 0、未启用 1、启用', - `version` int(11) NOT NULL COMMENT '版本号', - `group_partition` int(11) NOT NULL COMMENT '分区', - `id_generator_mode` tinyint(4) NOT NULL DEFAULT 1 COMMENT '唯一id生成模式 默认号段模式', - `init_scene` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否初始化场景 0:否 1:是', - `bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='组配置'; - -INSERT INTO `sj_group_config` VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now()); -INSERT INTO `sj_group_config` VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now()); - -CREATE TABLE `sj_notify_config` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `business_id` varchar(64) NOT NULL COMMENT '业务id (job_id或workflow_id或scene_name)', - `system_task_type` tinyint(4) NOT NULL DEFAULT 3 COMMENT '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务', - `notify_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '通知状态 0、未启用 1、启用', - `recipient_ids` varchar(128) NOT NULL COMMENT '接收人id列表', - `notify_threshold` int(11) NOT NULL DEFAULT 0 COMMENT '通知阈值', - `notify_scene` tinyint(4) NOT NULL DEFAULT 0 COMMENT '通知场景', - `rate_limiter_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '限流状态 0、未启用 1、启用', - `rate_limiter_threshold` int(11) NOT NULL DEFAULT 0 COMMENT '每秒限流阈值', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `business_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='通知配置'; - -CREATE TABLE `sj_notify_recipient` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `recipient_name` varchar(64) NOT NULL COMMENT '接收人名称', - `notify_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook', - `notify_attribute` varchar(512) NOT NULL COMMENT '配置属性', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id` (`namespace_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='告警通知接收人'; - -CREATE TABLE `sj_retry_dead_letter_0` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `scene_name` varchar(64) NOT NULL COMMENT '场景名称', - `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', - `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', - `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', - `args_str` text NOT NULL COMMENT '执行方法参数', - `ext_attrs` text NOT NULL COMMENT '扩展字段', - `task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), - KEY `idx_idempotent_id` (`idempotent_id`), - KEY `idx_biz_no` (`biz_no`), - KEY `idx_create_dt` (`create_dt`), - UNIQUE KEY `uk_namespace_id_group_name_unique_id` (`namespace_id`, `group_name`, `unique_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='死信队列表'; - -CREATE TABLE `sj_retry_task_0` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `scene_name` varchar(64) NOT NULL COMMENT '场景名称', - `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', - `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', - `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', - `args_str` text NOT NULL COMMENT '执行方法参数', - `ext_attrs` text NOT NULL COMMENT '扩展字段', - `next_trigger_at` datetime NOT NULL COMMENT '下次触发时间', - `retry_count` int(11) NOT NULL DEFAULT 0 COMMENT '重试次数', - `retry_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '重试状态 0、重试中 1、成功 2、最大重试次数', - `task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), - KEY `idx_namespace_id_group_name_task_type` (`namespace_id`, `group_name`, `task_type`), - KEY `idx_namespace_id_group_name_retry_status` (`namespace_id`, `group_name`, `retry_status`), - KEY `idx_idempotent_id` (`idempotent_id`), - KEY `idx_biz_no` (`biz_no`), - KEY `idx_create_dt` (`create_dt`), - UNIQUE KEY `uk_name_unique_id` (`namespace_id`, `group_name`, `unique_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务表'; - -CREATE TABLE `sj_retry_task_log` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `scene_name` varchar(64) NOT NULL COMMENT '场景名称', - `idempotent_id` varchar(64) NOT NULL COMMENT '幂等id', - `biz_no` varchar(64) NOT NULL DEFAULT '' COMMENT '业务编号', - `executor_name` varchar(512) NOT NULL DEFAULT '' COMMENT '执行器名称', - `args_str` text NOT NULL COMMENT '执行方法参数', - `ext_attrs` text NOT NULL COMMENT '扩展字段', - `retry_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '重试状态 0、重试中 1、成功 2、最大次数', - `task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), - KEY `idx_retry_status` (`retry_status`), - KEY `idx_idempotent_id` (`idempotent_id`), - KEY `idx_unique_id` (`unique_id`), - KEY `idx_biz_no` (`biz_no`), - KEY `idx_create_dt` (`create_dt`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务日志基础信息表'; - -CREATE TABLE `sj_retry_task_log_message` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', - `message` longtext NOT NULL COMMENT '异常信息', - `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量', - `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `unique_id`), - KEY `idx_create_dt` (`create_dt`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务调度日志信息记录表'; - -CREATE TABLE `sj_retry_scene_config` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `scene_name` varchar(64) NOT NULL COMMENT '场景名称', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `scene_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '组状态 0、未启用 1、启用', - `max_retry_count` int(11) NOT NULL DEFAULT 5 COMMENT '最大重试次数', - `back_off` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1、默认等级 2、固定间隔时间 3、CRON 表达式', - `trigger_interval` varchar(16) NOT NULL DEFAULT '' COMMENT '间隔时长', - `deadline_request` bigint(20) unsigned NOT NULL DEFAULT 60000 COMMENT 'Deadline Request 调用链超时 单位毫秒', - `executor_timeout` int(11) unsigned NOT NULL DEFAULT 5 COMMENT '任务执行超时时间，单位秒', - `route_key` tinyint(4) NOT NULL DEFAULT 4 COMMENT '路由策略', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='场景配置'; - -CREATE TABLE `sj_server_node` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `host_id` varchar(64) NOT NULL COMMENT '主机id', - `host_ip` varchar(64) NOT NULL COMMENT '机器ip', - `host_port` int(16) NOT NULL COMMENT '机器端口', - `expire_at` datetime NOT NULL COMMENT '过期时间', - `node_type` tinyint(4) NOT NULL COMMENT '节点类型 1、客户端 2、是服务端', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), - KEY `idx_expire_at_node_type` (`expire_at`, `node_type`), - UNIQUE KEY `uk_host_id_host_ip` (`host_id`, `host_ip`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='服务器节点'; - -CREATE TABLE `sj_distributed_lock` -( - `name` varchar(64) NOT NULL COMMENT '锁名称', - `lock_until` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '锁定时长', - `locked_at` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '锁定时间', - `locked_by` varchar(255) NOT NULL COMMENT '锁定者', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='锁定表'; - -CREATE TABLE `sj_system_user` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `username` varchar(64) NOT NULL COMMENT '账号', - `password` varchar(128) NOT NULL COMMENT '密码', - `role` tinyint(4) NOT NULL DEFAULT 0 COMMENT '角色：1-普通用户、2-管理员', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_username` (`username`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户表'; - --- pwd: admin -INSERT INTO `sj_system_user` VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now()); - -CREATE TABLE `sj_system_user_permission` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `system_user_id` bigint(20) NOT NULL COMMENT '系统用户id', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_namespace_id_group_name_system_user_id` (`namespace_id`, `group_name`, `system_user_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户权限表'; - -CREATE TABLE `sj_sequence_alloc` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', - `max_id` bigint(20) NOT NULL DEFAULT 1 COMMENT '最大id', - `step` int(11) NOT NULL DEFAULT 100 COMMENT '步长', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='号段模式序号ID分配表'; - --- 分布式调度DDL -CREATE TABLE `sj_job` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `job_name` varchar(64) NOT NULL COMMENT '名称', - `args_str` text DEFAULT NULL COMMENT '执行方法参数', - `args_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '参数类型 ', - `next_trigger_at` bigint(13) NOT NULL COMMENT '下次触发时间', - `job_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务状态 0、关闭、1、开启', - `task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、集群 2、广播 3、切片', - `route_key` tinyint(4) NOT NULL DEFAULT 4 COMMENT '路由策略', - `executor_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '执行器类型', - `executor_info` varchar(255) DEFAULT NULL COMMENT '执行器名称', - `trigger_type` tinyint(4) NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间', - `trigger_interval` varchar(255) NOT NULL COMMENT '间隔时长', - `block_strategy` tinyint(4) NOT NULL DEFAULT 1 COMMENT '阻塞策略 1、丢弃 2、覆盖 3、并行', - `executor_timeout` int(11) NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒', - `max_retry_times` int(11) NOT NULL DEFAULT 0 COMMENT '最大重试次数', - `parallel_num` int(11) NOT NULL DEFAULT 1 COMMENT '并行数', - `retry_interval` int(11) NOT NULL DEFAULT 0 COMMENT '重试间隔(s)', - `bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket', - `resident` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是常驻任务', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), - KEY `idx_job_status_bucket_index` (`job_status`, `bucket_index`), - KEY `idx_create_dt` (`create_dt`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务信息'; - -INSERT INTO `sj_job` VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', 0 , now(), now()); - -CREATE TABLE `sj_job_log_message` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `job_id` bigint(20) NOT NULL COMMENT '任务信息id', - `task_batch_id` bigint(20) NOT NULL COMMENT '任务批次id', - `task_id` bigint(20) NOT NULL COMMENT '调度任务id', - `message` longtext NOT NULL COMMENT '调度信息', - `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量', - `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `idx_task_batch_id_task_id` (`task_batch_id`, `task_id`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='调度日志'; - -CREATE TABLE `sj_job_task` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `job_id` bigint(20) NOT NULL COMMENT '任务信息id', - `task_batch_id` bigint(20) NOT NULL COMMENT '调度任务id', - `parent_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '父执行器id', - `task_status` tinyint NOT NULL DEFAULT 0 COMMENT '执行的状态 0、失败 1、成功', - `retry_count` int(11) NOT NULL DEFAULT 0 COMMENT '重试次数', - `mr_stage` tinyint DEFAULT NULL COMMENT '动态分片所处阶段 1:map 2:reduce 3:mergeReduce', - `leaf` tinyint NOT NULL DEFAULT '1' COMMENT '叶子节点', - `task_name` varchar(255) NOT NULL DEFAULT '' COMMENT '任务名称', - `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port', - `wf_context` text DEFAULT NULL COMMENT '工作流全局上下文', - `result_message` text NOT NULL COMMENT '执行结果', - `args_str` text DEFAULT NULL COMMENT '执行方法参数', - `args_type` tinyint NOT NULL DEFAULT 1 COMMENT '参数类型 ', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_task_batch_id_task_status` (`task_batch_id`, `task_status`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务实例'; - -CREATE TABLE `sj_job_task_batch` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `job_id` bigint(20) NOT NULL COMMENT '任务id', - `workflow_node_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '工作流节点id', - `parent_workflow_node_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '工作流任务父批次id', - `workflow_task_batch_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '工作流任务批次id', - `task_batch_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '任务批次状态 0、失败 1、成功', - `operation_reason` tinyint(4) NOT NULL DEFAULT 0 COMMENT '操作原因', - `execution_at` bigint(13) NOT NULL DEFAULT 0 COMMENT '任务执行时间', - `system_task_type` tinyint(4) NOT NULL DEFAULT 3 COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务', - `parent_id` varchar(64) NOT NULL DEFAULT '' COMMENT '父节点', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_job_id_task_batch_status` (`job_id`, `task_batch_status`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), - KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`, `workflow_node_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='任务批次'; - -CREATE TABLE `sj_job_summary` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组名称', - `business_id` bigint NOT NULL COMMENT '业务id (job_id或workflow_id)', - `system_task_type` tinyint(4) NOT NULL DEFAULT 3 COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务', - `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间', - `success_num` int NOT NULL DEFAULT 0 COMMENT '执行成功-日志数量', - `fail_num` int NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量', - `fail_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `stop_num` int NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量', - `stop_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `cancel_num` int NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量', - `cancel_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_business_id` (`namespace_id`, `group_name`, business_id), - UNIQUE KEY `uk_trigger_at_system_task_type_business_id` (`trigger_at`, `system_task_type`, `business_id`) USING BTREE -) ENGINE = InnoDB - AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Job'; - -CREATE TABLE `sj_retry_summary` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组名称', - `scene_name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '场景名称', - `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间', - `running_num` int NOT NULL DEFAULT 0 COMMENT '重试中-日志数量', - `finish_num` int NOT NULL DEFAULT 0 COMMENT '重试完成-日志数量', - `max_count_num` int NOT NULL DEFAULT 0 COMMENT '重试到达最大次数-日志数量', - `suspend_num` int NOT NULL DEFAULT 0 COMMENT '暂停重试-日志数量', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_trigger_at` (`trigger_at`), - UNIQUE KEY `uk_scene_name_trigger_at` (`namespace_id`, `group_name`, `scene_name`, `trigger_at`) USING BTREE -) ENGINE = InnoDB - AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Retry'; - -CREATE TABLE `sj_workflow` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `workflow_name` varchar(64) NOT NULL COMMENT '工作流名称', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `workflow_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '工作流状态 0、关闭、1、开启', - `trigger_type` tinyint(4) NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间', - `trigger_interval` varchar(255) NOT NULL COMMENT '间隔时长', - `next_trigger_at` bigint(13) NOT NULL COMMENT '下次触发时间', - `block_strategy` tinyint(4) NOT NULL DEFAULT 1 COMMENT '阻塞策略 1、丢弃 2、覆盖 3、并行', - `executor_timeout` int(11) NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒', - `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', - `flow_info` text DEFAULT NULL COMMENT '流程信息', - `wf_context` text DEFAULT NULL COMMENT '上下文', - `bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket', - `version` int(11) NOT NULL COMMENT '版本号', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='工作流'; - -CREATE TABLE `sj_workflow_node` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `node_name` varchar(64) NOT NULL COMMENT '节点名称', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `job_id` bigint(20) NOT NULL COMMENT '任务信息id', - `workflow_id` bigint(20) NOT NULL COMMENT '工作流ID', - `node_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1、任务节点 2、条件节点', - `expression_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '1、SpEl、2、Aviator 3、QL', - `fail_strategy` tinyint(4) NOT NULL DEFAULT 1 COMMENT '失败策略 1、跳过 2、阻塞', - `workflow_node_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '工作流节点状态 0、关闭、1、开启', - `priority_level` int(11) NOT NULL DEFAULT 1 COMMENT '优先级', - `node_info` text DEFAULT NULL COMMENT '节点信息 ', - `version` int(11) NOT NULL COMMENT '版本号', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='工作流节点'; - -CREATE TABLE `sj_workflow_task_batch` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `workflow_id` bigint(20) NOT NULL COMMENT '工作流任务id', - `task_batch_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '任务批次状态 0、失败 1、成功', - `operation_reason` tinyint(4) NOT NULL DEFAULT 0 COMMENT '操作原因', - `flow_info` text DEFAULT NULL COMMENT '流程信息', - `wf_context` text DEFAULT NULL COMMENT '全局上下文', - `execution_at` bigint(13) NOT NULL DEFAULT 0 COMMENT '任务执行时间', - `ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '扩展字段', - `version` int(11) NOT NULL DEFAULT 1 COMMENT '版本号', - `deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`), - KEY `idx_job_id_task_batch_status` (`workflow_id`, `task_batch_status`), - KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) -) ENGINE = InnoDB - AUTO_INCREMENT = 0 - DEFAULT CHARSET = utf8mb4 COMMENT ='工作流批次'; diff --git a/template/script/sql/ry_vue_5.X.sql b/template/script/sql/ry_vue_5.X.sql deleted file mode 100644 index 3e3562d..0000000 --- a/template/script/sql/ry_vue_5.X.sql +++ /dev/null @@ -1,935 +0,0 @@ --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -create table sys_social -( - id bigint not null comment '主键', - user_id bigint not null comment '用户ID', - tenant_id varchar(20) default null comment '租户id', - auth_id varchar(255) not null comment '平台+平台唯一id', - source varchar(255) not null comment '用户来源', - open_id varchar(255) default null comment '平台编号唯一id', - user_name varchar(30) not null comment '登录账号', - nick_name varchar(30) default '' comment '用户昵称', - email varchar(255) default '' comment '用户邮箱', - avatar varchar(500) default '' comment '头像地址', - access_token varchar(255) not null comment '用户的授权令牌', - expire_in int default null comment '用户的授权令牌的有效期，部分平台可能没有', - refresh_token varchar(255) default null comment '刷新令牌，部分平台可能没有', - access_code varchar(255) default null comment '平台的授权信息，部分平台可能没有', - union_id varchar(255) default null comment '用户的 unionid', - scope varchar(255) default null comment '授予的权限，部分平台可能没有', - token_type varchar(255) default null comment '个别平台的授权信息，部分平台可能没有', - id_token varchar(2000) default null comment 'id token，部分平台可能没有', - mac_algorithm varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - mac_key varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - code varchar(255) default null comment '用户的授权code，部分平台可能没有', - oauth_token varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - oauth_token_secret varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - PRIMARY KEY (id) -) engine=innodb comment = '社会化关系表'; - - --- ---------------------------- --- 租户表 --- ---------------------------- -create table sys_tenant -( - id bigint(20) not null comment 'id', - tenant_id varchar(20) not null comment '租户编号', - contact_user_name varchar(20) comment '联系人', - contact_phone varchar(20) comment '联系电话', - company_name varchar(50) comment '企业名称', - license_number varchar(30) comment '统一社会信用代码', - address varchar(200) comment '地址', - intro varchar(200) comment '企业简介', - domain varchar(200) comment '域名', - remark varchar(200) comment '备注', - package_id bigint(20) comment '租户套餐编号', - expire_time datetime comment '过期时间', - account_count int default -1 comment '用户数量（-1不限制）', - status char(1) default '0' comment '租户状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - primary key (id) -) engine=innodb comment = '租户表'; - - --- ---------------------------- --- 初始化-租户表数据 --- ---------------------------- - -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); - - --- ---------------------------- --- 租户套餐表 --- ---------------------------- -create table sys_tenant_package ( - package_id bigint(20) not null comment '租户套餐id', - package_name varchar(20) comment '套餐名称', - menu_ids varchar(3000) comment '关联菜单id', - remark varchar(200) comment '备注', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - primary key (package_id) -) engine=innodb comment = '租户套餐表'; - - --- ---------------------------- --- 1、部门表 --- ---------------------------- -create table sys_dept ( - dept_id bigint(20) not null comment '部门id', - tenant_id varchar(20) default '000000' comment '租户编号', - parent_id bigint(20) default 0 comment '父部门id', - ancestors varchar(500) default '' comment '祖级列表', - dept_name varchar(30) default '' comment '部门名称', - dept_category varchar(100) default null comment '部门类别编码', - order_num int(4) default 0 comment '显示顺序', - leader bigint(20) default null comment '负责人', - phone varchar(11) default null comment '联系电话', - email varchar(50) default null comment '邮箱', - status char(1) default '0' comment '部门状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - primary key (dept_id) -) engine=innodb comment = '部门表'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- - - -insert into sys_dept values(100, '000000', 0, '0', 'XXX科技', null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(101, '000000', 100, '0,100', '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(102, '000000', 100, '0,100', '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(103, '000000', 101, '0,100,101', '研发部门', null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(104, '000000', 101, '0,100,101', '市场部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(105, '000000', 101, '0,100,101', '测试部门', null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(106, '000000', 101, '0,100,101', '财务部门', null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(107, '000000', 101, '0,100,101', '运维部门', null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(108, '000000', 102, '0,100,102', '市场部门', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(109, '000000', 102, '0,100,102', '财务部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); - - --- ---------------------------- --- 2、用户信息表 --- ---------------------------- -create table sys_user ( - user_id bigint(20) not null comment '用户ID', - tenant_id varchar(20) default '000000' comment '租户编号', - dept_id bigint(20) default null comment '部门ID', - user_name varchar(30) not null comment '用户账号', - nick_name varchar(30) not null comment '用户昵称', - user_type varchar(10) default 'sys_user' comment '用户类型（sys_user系统用户）', - email varchar(50) default '' comment '用户邮箱', - phonenumber varchar(11) default '' comment '手机号码', - sex char(1) default '0' comment '用户性别（0男 1女 2未知）', - avatar bigint(20) comment '头像地址', - password varchar(100) default '' comment '密码', - status char(1) default '0' comment '帐号状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(128) default '' comment '最后登录IP', - login_date datetime comment '最后登录时间', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (user_id) -) engine=innodb comment = '用户信息表'; - --- ---------------------------- --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), null, null, '管理员'); -insert into sys_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null); -insert into sys_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null); - --- ---------------------------- --- 3、岗位信息表 --- ---------------------------- -create table sys_post -( - post_id bigint(20) not null comment '岗位ID', - tenant_id varchar(20) default '000000' comment '租户编号', - dept_id bigint(20) not null comment '部门id', - post_code varchar(64) not null comment '岗位编码', - post_category varchar(100) default null comment '岗位类别编码', - post_name varchar(50) not null comment '岗位名称', - post_sort int(4) not null comment '显示顺序', - status char(1) not null comment '状态（0正常 1停用）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (post_id) -) engine=innodb comment = '岗位信息表'; - --- ---------------------------- --- 初始化-岗位信息表数据 --- ---------------------------- -insert into sys_post values(1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate(), null, null, ''); - - --- ---------------------------- --- 4、角色信息表 --- ---------------------------- -create table sys_role ( - role_id bigint(20) not null comment '角色ID', - tenant_id varchar(20) default '000000' comment '租户编号', - role_name varchar(30) not null comment '角色名称', - role_key varchar(100) not null comment '角色权限字符串', - role_sort int(4) not null comment '显示顺序', - data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', - status char(1) not null comment '角色状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (role_id) -) engine=innodb comment = '角色信息表'; - --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_role values(1, '000000', '超级管理员', 'superadmin', 1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员'); -insert into sys_role values(3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); -insert into sys_role values(4, '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); - --- ---------------------------- --- 5、菜单权限表 --- ---------------------------- -create table sys_menu ( - menu_id bigint(20) not null comment '菜单ID', - menu_name varchar(50) not null comment '菜单名称', - parent_id bigint(20) default 0 comment '父菜单ID', - order_num int(4) default 0 comment '显示顺序', - path varchar(200) default '' comment '路由地址', - component varchar(255) default null comment '组件路径', - query_param varchar(255) default null comment '路由参数', - is_frame int(1) default 1 comment '是否为外链（0是 1否）', - is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', - menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '显示状态（0显示 1隐藏）', - status char(1) default 0 comment '菜单状态（0正常 1停用）', - perms varchar(100) default null comment '权限标识', - icon varchar(100) default '#' comment '菜单图标', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', - primary key (menu_id) -) engine=innodb comment = '菜单权限表'; - --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, sysdate(), null, null, '系统管理目录'); -insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate(), null, null, '租户管理目录'); -insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), null, null, '系统监控目录'); -insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate(), null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址'); -insert into sys_menu values('5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, sysdate(), null, null, '测试菜单'); --- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate(), null, null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, sysdate(), null, null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, sysdate(), null, null, '部门管理菜单'); -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, sysdate(), null, null, '岗位管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, sysdate(), null, null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, sysdate(), null, null, '参数设置菜单'); -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, sysdate(), null, null, '通知公告菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, sysdate(), null, null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate(), null, null, '在线用户菜单'); -insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate(), null, null, '缓存监控菜单'); -insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate(), null, null, '代码生成菜单'); -insert into sys_menu values('121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, sysdate(), null, null, '租户管理菜单'); -insert into sys_menu values('122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, sysdate(), null, null, '租户套餐管理菜单'); -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate(), null, null, '客户端管理菜单'); - --- springboot-admin监控 -insert into sys_menu values('117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, sysdate(), null, null, 'Admin监控菜单'); --- oss菜单 -insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate(), null, null, '文件管理菜单'); --- snail-job server控制台 -insert into sys_menu values('120', '任务调度中心', '2', '6', 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, sysdate(), null, null, 'SnailJob控制台菜单'); - --- 三级菜单 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate(), null, null, '操作日志菜单'); -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, sysdate(), null, null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_menu values('1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, sysdate(), null, null, ''); --- 角色管理按钮 -insert into sys_menu values('1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, sysdate(), null, null, ''); --- 菜单管理按钮 -insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, sysdate(), null, null, ''); --- 部门管理按钮 -insert into sys_menu values('1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, sysdate(), null, null, ''); --- 岗位管理按钮 -insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, sysdate(), null, null, ''); --- 字典管理按钮 -insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, sysdate(), null, null, ''); --- 参数设置按钮 -insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, sysdate(), null, null, ''); --- 通知公告按钮 -insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, sysdate(), null, null, ''); --- 操作日志按钮 -insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, sysdate(), null, null, ''); --- 登录日志按钮 -insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, sysdate(), null, null, ''); --- 在线用户按钮 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate(), null, null, ''); --- 代码生成按钮 -insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, sysdate(), null, null, ''); --- oss相关按钮 -insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate(), null, null, ''); - --- 租户管理相关按钮 -insert into sys_menu values ('1606', '租户查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1607', '租户新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1608', '租户修改', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1609', '租户删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1610', '租户导出', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, sysdate(), null, null, ''); --- 租户套餐管理相关按钮 -insert into sys_menu values ('1611', '租户套餐查询', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1612', '租户套餐新增', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1613', '租户套餐修改', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1614', '租户套餐删除', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1615', '租户套餐导出', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, sysdate(), null, null, ''); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate(), null, null, ''); --- 测试菜单 -insert into sys_menu values('1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate(), null, null, '测试单表菜单'); -insert into sys_menu values('1501', '测试单表查询', '1500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1502', '测试单表新增', '1500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1503', '测试单表修改', '1500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1504', '测试单表删除', '1500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1505', '测试单表导出', '1500', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate(), null, null, '测试树表菜单'); -insert into sys_menu values('1507', '测试树表查询', '1506', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1508', '测试树表新增', '1506', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1509', '测试树表修改', '1506', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate(), null, null, ''); - --- ---------------------------- --- 6、用户和角色关联表 用户N-1角色 --- ---------------------------- -create table sys_user_role ( - user_id bigint(20) not null comment '用户ID', - role_id bigint(20) not null comment '角色ID', - primary key(user_id, role_id) -) engine=innodb comment = '用户和角色关联表'; - --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('3', '3'); -insert into sys_user_role values ('4', '4'); - --- ---------------------------- --- 7、角色和菜单关联表 角色1-N菜单 --- ---------------------------- -create table sys_role_menu ( - role_id bigint(20) not null comment '角色ID', - menu_id bigint(20) not null comment '菜单ID', - primary key(role_id, menu_id) -) engine=innodb comment = '角色和菜单关联表'; - --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -insert into sys_role_menu values ('3', '1'); -insert into sys_role_menu values ('3', '5'); -insert into sys_role_menu values ('3', '100'); -insert into sys_role_menu values ('3', '101'); -insert into sys_role_menu values ('3', '102'); -insert into sys_role_menu values ('3', '103'); -insert into sys_role_menu values ('3', '104'); -insert into sys_role_menu values ('3', '105'); -insert into sys_role_menu values ('3', '106'); -insert into sys_role_menu values ('3', '107'); -insert into sys_role_menu values ('3', '108'); -insert into sys_role_menu values ('3', '500'); -insert into sys_role_menu values ('3', '501'); -insert into sys_role_menu values ('3', '1001'); -insert into sys_role_menu values ('3', '1002'); -insert into sys_role_menu values ('3', '1003'); -insert into sys_role_menu values ('3', '1004'); -insert into sys_role_menu values ('3', '1005'); -insert into sys_role_menu values ('3', '1006'); -insert into sys_role_menu values ('3', '1007'); -insert into sys_role_menu values ('3', '1008'); -insert into sys_role_menu values ('3', '1009'); -insert into sys_role_menu values ('3', '1010'); -insert into sys_role_menu values ('3', '1011'); -insert into sys_role_menu values ('3', '1012'); -insert into sys_role_menu values ('3', '1013'); -insert into sys_role_menu values ('3', '1014'); -insert into sys_role_menu values ('3', '1015'); -insert into sys_role_menu values ('3', '1016'); -insert into sys_role_menu values ('3', '1017'); -insert into sys_role_menu values ('3', '1018'); -insert into sys_role_menu values ('3', '1019'); -insert into sys_role_menu values ('3', '1020'); -insert into sys_role_menu values ('3', '1021'); -insert into sys_role_menu values ('3', '1022'); -insert into sys_role_menu values ('3', '1023'); -insert into sys_role_menu values ('3', '1024'); -insert into sys_role_menu values ('3', '1025'); -insert into sys_role_menu values ('3', '1026'); -insert into sys_role_menu values ('3', '1027'); -insert into sys_role_menu values ('3', '1028'); -insert into sys_role_menu values ('3', '1029'); -insert into sys_role_menu values ('3', '1030'); -insert into sys_role_menu values ('3', '1031'); -insert into sys_role_menu values ('3', '1032'); -insert into sys_role_menu values ('3', '1033'); -insert into sys_role_menu values ('3', '1034'); -insert into sys_role_menu values ('3', '1035'); -insert into sys_role_menu values ('3', '1036'); -insert into sys_role_menu values ('3', '1037'); -insert into sys_role_menu values ('3', '1038'); -insert into sys_role_menu values ('3', '1039'); -insert into sys_role_menu values ('3', '1040'); -insert into sys_role_menu values ('3', '1041'); -insert into sys_role_menu values ('3', '1042'); -insert into sys_role_menu values ('3', '1043'); -insert into sys_role_menu values ('3', '1044'); -insert into sys_role_menu values ('3', '1045'); -insert into sys_role_menu values ('3', '1500'); -insert into sys_role_menu values ('3', '1501'); -insert into sys_role_menu values ('3', '1502'); -insert into sys_role_menu values ('3', '1503'); -insert into sys_role_menu values ('3', '1504'); -insert into sys_role_menu values ('3', '1505'); -insert into sys_role_menu values ('3', '1506'); -insert into sys_role_menu values ('3', '1507'); -insert into sys_role_menu values ('3', '1508'); -insert into sys_role_menu values ('3', '1509'); -insert into sys_role_menu values ('3', '1510'); -insert into sys_role_menu values ('3', '1511'); -insert into sys_role_menu values ('4', '5'); -insert into sys_role_menu values ('4', '1500'); -insert into sys_role_menu values ('4', '1501'); -insert into sys_role_menu values ('4', '1502'); -insert into sys_role_menu values ('4', '1503'); -insert into sys_role_menu values ('4', '1504'); -insert into sys_role_menu values ('4', '1505'); -insert into sys_role_menu values ('4', '1506'); -insert into sys_role_menu values ('4', '1507'); -insert into sys_role_menu values ('4', '1508'); -insert into sys_role_menu values ('4', '1509'); -insert into sys_role_menu values ('4', '1510'); -insert into sys_role_menu values ('4', '1511'); - --- ---------------------------- --- 8、角色和部门关联表 角色1-N部门 --- ---------------------------- -create table sys_role_dept ( - role_id bigint(20) not null comment '角色ID', - dept_id bigint(20) not null comment '部门ID', - primary key(role_id, dept_id) -) engine=innodb comment = '角色和部门关联表'; - --- ---------------------------- --- 9、用户与岗位关联表 用户1-N岗位 --- ---------------------------- -create table sys_user_post -( - user_id bigint(20) not null comment '用户ID', - post_id bigint(20) not null comment '岗位ID', - primary key (user_id, post_id) -) engine=innodb comment = '用户与岗位关联表'; - --- ---------------------------- --- 初始化-用户与岗位关联表数据 --- ---------------------------- -insert into sys_user_post values ('1', '1'); - --- ---------------------------- --- 10、操作日志记录 --- ---------------------------- -create table sys_oper_log ( - oper_id bigint(20) not null comment '日志主键', - tenant_id varchar(20) default '000000' comment '租户编号', - title varchar(50) default '' comment '模块标题', - business_type int(2) default 0 comment '业务类型（0其它 1新增 2修改 3删除）', - method varchar(100) default '' comment '方法名称', - request_method varchar(10) default '' comment '请求方式', - operator_type int(1) default 0 comment '操作类别（0其它 1后台用户 2手机端用户）', - oper_name varchar(50) default '' comment '操作人员', - dept_name varchar(50) default '' comment '部门名称', - oper_url varchar(255) default '' comment '请求URL', - oper_ip varchar(128) default '' comment '主机地址', - oper_location varchar(255) default '' comment '操作地点', - oper_param varchar(2000) default '' comment '请求参数', - json_result varchar(2000) default '' comment '返回参数', - status int(1) default 0 comment '操作状态（0正常 1异常）', - error_msg varchar(2000) default '' comment '错误消息', - oper_time datetime comment '操作时间', - cost_time bigint(20) default 0 comment '消耗时间', - primary key (oper_id), - key idx_sys_oper_log_bt (business_type), - key idx_sys_oper_log_s (status), - key idx_sys_oper_log_ot (oper_time) -) engine=innodb comment = '操作日志记录'; - - --- ---------------------------- --- 11、字典类型表 --- ---------------------------- -create table sys_dict_type -( - dict_id bigint(20) not null comment '字典主键', - tenant_id varchar(20) default '000000' comment '租户编号', - dict_name varchar(100) default '' comment '字典名称', - dict_type varchar(100) default '' comment '字典类型', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_id), - unique (tenant_id, dict_type) -) engine=innodb comment = '字典类型表'; - -insert into sys_dict_type values(1, '000000', '用户性别', 'sys_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); -insert into sys_dict_type values(2, '000000', '菜单状态', 'sys_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); -insert into sys_dict_type values(3, '000000', '系统开关', 'sys_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); -insert into sys_dict_type values(6, '000000', '系统是否', 'sys_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); -insert into sys_dict_type values(7, '000000', '通知类型', 'sys_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); -insert into sys_dict_type values(8, '000000', '通知状态', 'sys_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); -insert into sys_dict_type values(9, '000000', '操作类型', 'sys_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); -insert into sys_dict_type values(10, '000000', '系统状态', 'sys_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); - - --- ---------------------------- --- 12、字典数据表 --- ---------------------------- -create table sys_dict_data -( - dict_code bigint(20) not null comment '字典编码', - tenant_id varchar(20) default '000000' comment '租户编号', - dict_sort int(4) default 0 comment '字典排序', - dict_label varchar(100) default '' comment '字典标签', - dict_value varchar(100) default '' comment '字典键值', - dict_type varchar(100) default '' comment '字典类型', - css_class varchar(100) default null comment '样式属性（其他样式扩展）', - list_class varchar(100) default null comment '表格回显样式', - is_default char(1) default 'N' comment '是否默认（Y是 N否）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_code) -) engine=innodb comment = '字典数据表'; - -insert into sys_dict_data values(1, '000000', 1, '男', '0', 'sys_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); -insert into sys_dict_data values(2, '000000', 2, '女', '1', 'sys_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); -insert into sys_dict_data values(3, '000000', 3, '未知', '2', 'sys_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); -insert into sys_dict_data values(4, '000000', 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); -insert into sys_dict_data values(5, '000000', 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); -insert into sys_dict_data values(6, '000000', 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(7, '000000', 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_dict_data values(12, '000000', 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); -insert into sys_dict_data values(13, '000000', 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); -insert into sys_dict_data values(14, '000000', 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); -insert into sys_dict_data values(15, '000000', 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); -insert into sys_dict_data values(16, '000000', 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(17, '000000', 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); -insert into sys_dict_data values(29, '000000', 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); -insert into sys_dict_data values(18, '000000', 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); -insert into sys_dict_data values(19, '000000', 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); -insert into sys_dict_data values(20, '000000', 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); -insert into sys_dict_data values(21, '000000', 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); -insert into sys_dict_data values(22, '000000', 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); -insert into sys_dict_data values(23, '000000', 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); -insert into sys_dict_data values(24, '000000', 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); -insert into sys_dict_data values(25, '000000', 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); -insert into sys_dict_data values(26, '000000', 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); -insert into sys_dict_data values(27, '000000', 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(28, '000000', 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); - - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -create table sys_config ( - config_id bigint(20) not null comment '参数主键', - tenant_id varchar(20) default '000000' comment '租户编号', - config_name varchar(100) default '' comment '参数名称', - config_key varchar(100) default '' comment '参数键名', - config_value varchar(500) default '' comment '参数键值', - config_type char(1) default 'N' comment '系统内置（Y是 N否）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (config_id) -) engine=innodb comment = '参数配置表'; - -insert into sys_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' ); -insert into sys_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); - - --- ---------------------------- --- 14、系统访问记录 --- ---------------------------- -create table sys_logininfor ( - info_id bigint(20) not null comment '访问ID', - tenant_id varchar(20) default '000000' comment '租户编号', - user_name varchar(50) default '' comment '用户账号', - client_key varchar(32) default '' comment '客户端', - device_type varchar(32) default '' comment '设备类型', - ipaddr varchar(128) default '' comment '登录IP地址', - login_location varchar(255) default '' comment '登录地点', - browser varchar(50) default '' comment '浏览器类型', - os varchar(50) default '' comment '操作系统', - status char(1) default '0' comment '登录状态（0成功 1失败）', - msg varchar(255) default '' comment '提示消息', - login_time datetime comment '访问时间', - primary key (info_id), - key idx_sys_logininfor_s (status), - key idx_sys_logininfor_lt (login_time) -) engine=innodb comment = '系统访问记录'; - - --- ---------------------------- --- 17、通知公告表 --- ---------------------------- -create table sys_notice ( - notice_id bigint(20) not null comment '公告ID', - tenant_id varchar(20) default '000000' comment '租户编号', - notice_title varchar(50) not null comment '公告标题', - notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', - status char(1) default '0' comment '公告状态（0正常 1关闭）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(255) default null comment '备注', - primary key (notice_id) -) engine=innodb comment = '通知公告表'; - --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); -insert into sys_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); - - --- ---------------------------- --- 18、代码生成业务表 --- ---------------------------- -create table gen_table ( - table_id bigint(20) not null comment '编号', - data_name varchar(200) default '' comment '数据源名称', - table_name varchar(200) default '' comment '表名称', - table_comment varchar(500) default '' comment '表描述', - sub_table_name varchar(64) default null comment '关联子表的表名', - sub_table_fk_name varchar(64) default null comment '子表关联的外键名', - class_name varchar(100) default '' comment '实体类名称', - tpl_category varchar(200) default 'crud' comment '使用的模板（crud单表操作 tree树表操作）', - package_name varchar(100) comment '生成包路径', - module_name varchar(30) comment '生成模块名', - business_name varchar(30) comment '生成业务名', - function_name varchar(50) comment '生成功能名', - function_author varchar(50) comment '生成功能作者', - gen_type char(1) default '0' comment '生成代码方式（0zip压缩包 1自定义路径）', - gen_path varchar(200) default '/' comment '生成路径（不填默认项目路径）', - options varchar(1000) comment '其它生成选项', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (table_id) -) engine=innodb comment = '代码生成业务表'; - - --- ---------------------------- --- 19、代码生成业务表字段 --- ---------------------------- -create table gen_table_column ( - column_id bigint(20) not null comment '编号', - table_id bigint(20) comment '归属表编号', - column_name varchar(200) comment '列名称', - column_comment varchar(500) comment '列描述', - column_type varchar(100) comment '列类型', - java_type varchar(500) comment 'JAVA类型', - java_field varchar(200) comment 'JAVA字段名', - is_pk char(1) comment '是否主键（1是）', - is_increment char(1) comment '是否自增（1是）', - is_required char(1) comment '是否必填（1是）', - is_insert char(1) comment '是否为插入字段（1是）', - is_edit char(1) comment '是否编辑字段（1是）', - is_list char(1) comment '是否列表字段（1是）', - is_query char(1) comment '是否查询字段（1是）', - query_type varchar(200) default 'EQ' comment '查询方式（等于、不等于、大于、小于、范围）', - html_type varchar(200) comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）', - dict_type varchar(200) default '' comment '字典类型', - sort int comment '排序', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - primary key (column_id) -) engine=innodb comment = '代码生成业务表字段'; - --- ---------------------------- --- OSS对象存储表 --- ---------------------------- -create table sys_oss ( - oss_id bigint(20) not null comment '对象存储主键', - tenant_id varchar(20) default '000000' comment '租户编号', - file_name varchar(255) not null default '' comment '文件名', - original_name varchar(255) not null default '' comment '原名', - file_suffix varchar(10) not null default '' comment '文件后缀名', - url varchar(500) not null comment 'URL地址', - create_dept bigint(20) default null comment '创建部门', - create_time datetime default null comment '创建时间', - create_by bigint(20) default null comment '上传人', - update_time datetime default null comment '更新时间', - update_by bigint(20) default null comment '更新人', - service varchar(20) not null default 'minio' comment '服务商', - primary key (oss_id) -) engine=innodb comment ='OSS对象存储表'; - --- ---------------------------- --- OSS对象存储动态配置表 --- ---------------------------- -create table sys_oss_config ( - oss_config_id bigint(20) not null comment '主键', - tenant_id varchar(20) default '000000'comment '租户编号', - config_key varchar(20) not null default '' comment '配置key', - access_key varchar(255) default '' comment 'accessKey', - secret_key varchar(255) default '' comment '秘钥', - bucket_name varchar(255) default '' comment '桶名称', - prefix varchar(255) default '' comment '前缀', - endpoint varchar(255) default '' comment '访问站点', - domain varchar(255) default '' comment '自定义域名', - is_https char(1) default 'N' comment '是否https（Y=是,N=否）', - region varchar(255) default '' comment '域', - access_policy char(1) not null default '1' comment '桶权限类型(0=private 1=public 2=custom)', - status char(1) default '1' comment '是否默认（0=是,1=否）', - ext1 varchar(255) default '' comment '扩展字段', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (oss_config_id) -) engine=innodb comment='对象存储配置表'; - -insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); - --- ---------------------------- --- 系统授权表 --- ---------------------------- -create table sys_client ( - id bigint(20) not null comment 'id', - client_id varchar(64) default null comment '客户端id', - client_key varchar(32) default null comment '客户端key', - client_secret varchar(255) default null comment '客户端秘钥', - grant_type varchar(255) default null comment '授权类型', - device_type varchar(32) default null comment '设备类型', - active_timeout int(11) default 1800 comment 'token活跃超时时间', - timeout int(11) default 604800 comment 'token固定超时', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - primary key (id) -) engine=innodb comment='系统授权表'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); - - -CREATE TABLE test_demo -( - id bigint(0) NOT NULL COMMENT '主键', - tenant_id varchar(20) NULL DEFAULT '000000' COMMENT '租户编号', - dept_id bigint(0) NULL DEFAULT NULL COMMENT '部门id', - user_id bigint(0) NULL DEFAULT NULL COMMENT '用户id', - order_num int(0) NULL DEFAULT 0 COMMENT '排序号', - test_key varchar(255) NULL DEFAULT NULL COMMENT 'key键', - value varchar(255) NULL DEFAULT NULL COMMENT '值', - version int(0) NULL DEFAULT 0 COMMENT '版本', - create_dept bigint(0) NULL DEFAULT NULL COMMENT '创建部门', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - create_by bigint(0) NULL DEFAULT NULL COMMENT '创建人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - update_by bigint(0) NULL DEFAULT NULL COMMENT '更新人', - del_flag int(0) NULL DEFAULT 0 COMMENT '删除标志', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB COMMENT = '测试单表'; - -CREATE TABLE test_tree -( - id bigint(0) NOT NULL COMMENT '主键', - tenant_id varchar(20) NULL DEFAULT '000000' COMMENT '租户编号', - parent_id bigint(0) NULL DEFAULT 0 COMMENT '父id', - dept_id bigint(0) NULL DEFAULT NULL COMMENT '部门id', - user_id bigint(0) NULL DEFAULT NULL COMMENT '用户id', - tree_name varchar(255) NULL DEFAULT NULL COMMENT '值', - version int(0) NULL DEFAULT 0 COMMENT '版本', - create_dept bigint(0) NULL DEFAULT NULL COMMENT '创建部门', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - create_by bigint(0) NULL DEFAULT NULL COMMENT '创建人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - update_by bigint(0) NULL DEFAULT NULL COMMENT '更新人', - del_flag int(0) NULL DEFAULT 0 COMMENT '删除标志', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB COMMENT = '测试树表'; - -INSERT INTO test_demo VALUES (1, '000000', 102, 4, 1, '测试数据权限', '测试', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (2, '000000', 102, 3, 2, '子节点1', '111', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (3, '000000', 102, 3, 3, '子节点2', '222', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (4, '000000', 108, 4, 4, '测试数据', 'demo', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (5, '000000', 108, 3, 13, '子节点11', '1111', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (6, '000000', 108, 3, 12, '子节点22', '2222', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (7, '000000', 108, 3, 11, '子节点33', '3333', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (8, '000000', 108, 3, 10, '子节点44', '4444', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (9, '000000', 108, 3, 9, '子节点55', '5555', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (10, '000000', 108, 3, 8, '子节点66', '6666', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (11, '000000', 108, 3, 7, '子节点77', '7777', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (12, '000000', 108, 3, 6, '子节点88', '8888', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (13, '000000', 108, 3, 5, '子节点99', '9999', 0, 103, sysdate(), 1, NULL, NULL, 0); - -INSERT INTO test_tree VALUES (1, '000000', 0, 102, 4, '测试数据权限', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (2, '000000', 1, 102, 3, '子节点1', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (3, '000000', 2, 102, 3, '子节点2', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (4, '000000', 0, 108, 4, '测试树1', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (5, '000000', 4, 108, 3, '子节点11', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (6, '000000', 4, 108, 3, '子节点22', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (7, '000000', 4, 108, 3, '子节点33', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (8, '000000', 5, 108, 3, '子节点44', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (9, '000000', 6, 108, 3, '子节点55', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (10, '000000', 7, 108, 3, '子节点66', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (11, '000000', 7, 108, 3, '子节点77', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (12, '000000', 10, 108, 3, '子节点88', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (13, '000000', 10, 108, 3, '子节点99', 0, 103, sysdate(), 1, NULL, NULL, 0); diff --git a/template/script/sql/ry_workflow.sql b/template/script/sql/ry_workflow.sql deleted file mode 100644 index e8dc798..0000000 --- a/template/script/sql/ry_workflow.sql +++ /dev/null @@ -1,176 +0,0 @@ -insert into sys_menu values('11616', '工作流' , '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11617', '模型管理', '11616', '2', 'model', 'workflow/model/index', '', '1', '1', 'C', '0', '0', 'workflow:model:list', 'model', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, ''); - - --- 流程分类管理相关按钮 -insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove','#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export','#', 103, 1, sysdate(), null, null, ''); --- 请假单信息 -create table test_leave -( - id bigint not null comment '主键', - leave_type varchar(255) not null comment '请假类型', - start_date datetime not null comment '开始时间', - end_date datetime not null comment '结束时间', - leave_days int(10) not null comment '请假天数', - remark varchar(255) null comment '请假原因', - status varchar(255) null comment '状态', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间', - tenant_id varchar(20) null comment '租户编号', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB COMMENT = '请假申请表'; - --- 流程分类信息表 -create table wf_category -( - id bigint not null comment '主键' - primary key, - category_name varchar(255) null comment '分类名称', - category_code varchar(255) null comment '分类编码', - parent_id bigint null comment '父级id', - sort_num int(19) null comment '排序', - tenant_id varchar(20) null comment '租户编号', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间', - constraint uni_category_code - unique (category_code) -) engine=innodb comment= '流程分类'; -INSERT INTO wf_category values (1, 'OA', 'OA', 0, 0, '000000', 103, 1, sysdate(), 1, sysdate()); - -create table wf_task_back_node -( - id bigint not null - primary key, - node_id varchar(255) not null comment '节点id', - node_name varchar(255) not null comment '节点名称', - order_no int not null comment '排序', - instance_id varchar(255) null comment '流程实例id', - task_type varchar(255) not null comment '节点类型', - assignee varchar(2000) not null comment '审批人', - tenant_id varchar(20) null comment '租户编号', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间' -) - comment '节点审批记录'; - -create table wf_definition_config -( - id bigint not null comment '主键' - primary key, - table_name varchar(255) not null comment '表名', - definition_id varchar(255) not null comment '流程定义ID', - process_key varchar(255) not null comment '流程KEY', - version int(10) not null comment '流程版本', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间', - remark varchar(500) default '' null comment '备注', - tenant_id varchar(20) null comment '租户编号', - constraint uni_definition_id - unique (definition_id) -) - comment '流程定义配置'; - -create table wf_form_manage -( - id bigint not null comment '主键' - primary key, - form_name varchar(255) not null comment '表单名称', - form_type varchar(255) not null comment '表单类型', - router varchar(255) not null comment '路由地址/表单ID', - remark varchar(500) null comment '备注', - tenant_id varchar(20) null comment '租户编号', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间' -) - comment '表单管理'; - -insert into wf_form_manage(id, form_name, form_type, router, remark, tenant_id, create_dept, create_by, create_time, update_by, update_time) VALUES (1, '请假申请', 'static', '/workflow/leaveEdit/index', NULL, '000000', 103, 1, sysdate(), 1, sysdate()); - -create table wf_node_config -( - id bigint not null comment '主键' - primary key, - form_id bigint null comment '表单id', - form_type varchar(255) null comment '表单类型', - node_name varchar(255) not null comment '节点名称', - node_id varchar(255) not null comment '节点id', - definition_id varchar(255) not null comment '流程定义id', - apply_user_task char(1) default '0' comment '是否为申请人节点 （0是 1否）', - create_dept bigint null comment '创建部门', - create_by bigint null comment '创建者', - create_time datetime null comment '创建时间', - update_by bigint null comment '更新者', - update_time datetime null comment '更新时间', - tenant_id varchar(20) null comment '租户编号' -) - comment '节点配置'; - - -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11638, '请假申请', 5, 1, 'leave', 'workflow/leave/index', 1, 0, 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, sysdate(), NULL, NULL, '请假申请菜单'); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11639, '请假申请查询', 11638, 1, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, sysdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11640, '请假申请新增', 11638, 2, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, sysdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11641, '请假申请修改', 11638, 3, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11642, '请假申请删除', 11638, 4, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, sysdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11643, '请假申请导出', 11638, 5, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, sysdate(), NULL, NULL, ''); - -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (13, '000000', '业务状态', 'wf_business_status', 103, 1, sysdate(), NULL, NULL, '业务状态列表'); -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (14, '000000', '表单类型', 'wf_form_type', 103, 1, sysdate(), NULL, NULL, '表单类型列表'); - -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (39, '000000', 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '已撤销'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (40, '000000', 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, sysdate(), NULL, NULL, '草稿'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (41, '000000', 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1,sysdate(), NULL, NULL, '待审核'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (42, '000000', 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, sysdate(), NULL, NULL, '已完成'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (43, '000000', 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '已作废'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (44, '000000', 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '已退回'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (45, '000000', 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1,sysdate(), NULL, NULL, '已终止'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (46, '000000', 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, sysdate(), NULL, NULL, '自定义表单'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (47, '000000', 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '动态表单'); - --- 表单管理 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11628, '表单管理', '11616', '5', 'formManage', 'workflow/formManage/index', 1, 0, 'C', '0', '0', 'workflow:formManage:list', 'tree-table', 103, 1, sysdate(), null, null, '表单管理菜单'); - --- 表单管理按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11644, '表单管理查询', 11628, '1', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:query', '', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11645, '表单管理新增', 11628, '2', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:add', '', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11646, '表单管理修改', 11628, '3', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:edit', '', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11647, '表单管理删除', 11628, '4', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:remove', '', 103, 1, sysdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11648, '表单管理导出', 11628, '5', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:export', 'tree-table', 103, 1, sysdate(), null, null, ''); diff --git a/template/script/sql/sqlserver/sqlserver_ry_job.sql b/template/script/sql/sqlserver/sqlserver_ry_job.sql deleted file mode 100644 index bcf87f6..0000000 --- a/template/script/sql/sqlserver/sqlserver_ry_job.sql +++ /dev/null @@ -1,2747 +0,0 @@ -/* - SnailJob Database Transfer Tool - Source Server Type : MySQL - Target Server Type : Microsoft SQL Server - Date: 2024-07-06 12:55:47 -*/ - - --- sj_namespace -CREATE TABLE sj_namespace -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - name nvarchar(64) NOT NULL, - unique_id nvarchar(64) NOT NULL, - description nvarchar(256) NOT NULL DEFAULT '', - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'唯一id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'unique_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_namespace' -GO - -INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES (N'Development', N'dev', N'', 0, getdate(), getdate()) -GO -INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES (N'Production', N'prod', N'', 0, getdate(), getdate()) -GO - --- sj_group_config -CREATE TABLE sj_group_config -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL DEFAULT '', - description nvarchar(256) NOT NULL DEFAULT '', - token nvarchar(64) NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', - group_status tinyint NOT NULL DEFAULT 0, - version int NOT NULL, - group_partition int NOT NULL, - id_generator_mode tinyint NOT NULL DEFAULT 1, - init_scene tinyint NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'token', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'token' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组状态 0、未启用 1、启用', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'group_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'version' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'分区', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'group_partition' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'唯一id生成模式 默认号段模式', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'id_generator_mode' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'是否初始化场景 0:否 1:是', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'init_scene' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'bucket', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'bucket_index' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组配置', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config' -GO - -INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate()) -GO -INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES (N'prod', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate()) -GO - --- sj_notify_config -CREATE TABLE sj_notify_config -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - business_id nvarchar(64) NOT NULL, - system_task_type tinyint NOT NULL DEFAULT 3, - notify_status tinyint NOT NULL DEFAULT 0, - recipient_ids nvarchar(128) NOT NULL, - notify_threshold int NOT NULL DEFAULT 0, - notify_scene tinyint NOT NULL DEFAULT 0, - rate_limiter_status tinyint NOT NULL DEFAULT 0, - rate_limiter_threshold int NOT NULL DEFAULT 0, - description nvarchar(256) NOT NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name, business_id) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务id ( job_id或workflow_id或scene_name ) ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'business_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'system_task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'通知状态 0、未启用 1、启用', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'notify_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'接收人id列表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'recipient_ids' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'通知阈值', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'notify_threshold' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'通知场景', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'notify_scene' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'限流状态 0、未启用 1、启用', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'rate_limiter_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'每秒限流阈值', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'rate_limiter_threshold' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'通知配置', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_config' -GO - --- sj_notify_recipient -CREATE TABLE sj_notify_recipient -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - recipient_name nvarchar(64) NOT NULL, - notify_type tinyint NOT NULL DEFAULT 0, - notify_attribute nvarchar(512) NOT NULL, - description nvarchar(256) NOT NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'接收人名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'recipient_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'notify_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'配置属性', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'notify_attribute' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'告警通知接收人', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_notify_recipient' -GO - --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_name nvarchar(64) NOT NULL, - idempotent_id nvarchar(64) NOT NULL, - biz_no nvarchar(64) NOT NULL DEFAULT '', - executor_name nvarchar(512) NOT NULL DEFAULT '', - args_str nvarchar(max) NOT NULL, - ext_attrs nvarchar(max) NOT NULL, - task_type tinyint NOT NULL DEFAULT 1, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id) -GO - -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name) -GO -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id) -GO -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no) -GO -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'unique_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'scene_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'幂等id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'idempotent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务编号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'biz_no' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'executor_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'args_str' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1、重试数据 2、回调数据', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'死信队列表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0' -GO - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_name nvarchar(64) NOT NULL, - idempotent_id nvarchar(64) NOT NULL, - biz_no nvarchar(64) NOT NULL DEFAULT '', - executor_name nvarchar(512) NOT NULL DEFAULT '', - args_str nvarchar(max) NOT NULL, - ext_attrs nvarchar(max) NOT NULL, - next_trigger_at datetime2 NOT NULL, - retry_count int NOT NULL DEFAULT 0, - retry_status tinyint NOT NULL DEFAULT 0, - task_type tinyint NOT NULL DEFAULT 1, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id) -GO - -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name) -GO -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type) -GO -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status) -GO -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id) -GO -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no) -GO -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'unique_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'scene_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'幂等id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'idempotent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务编号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'biz_no' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'executor_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'args_str' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'下次触发时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'next_trigger_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'retry_count' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试状态 0、重试中 1、成功 2、最大重试次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'retry_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1、重试数据 2、回调数据', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0' -GO - --- sj_retry_task_log -CREATE TABLE sj_retry_task_log -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_name nvarchar(64) NOT NULL, - idempotent_id nvarchar(64) NOT NULL, - biz_no nvarchar(64) NOT NULL DEFAULT '', - executor_name nvarchar(512) NOT NULL DEFAULT '', - args_str nvarchar(max) NOT NULL, - ext_attrs nvarchar(max) NOT NULL, - retry_status tinyint NOT NULL DEFAULT 0, - task_type tinyint NOT NULL DEFAULT 1, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name) -GO -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status) -GO -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id) -GO -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id) -GO -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no) -GO -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'unique_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'scene_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'幂等id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'idempotent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务编号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'biz_no' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'executor_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'args_str' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试状态 0、重试中 1、成功 2、最大次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'retry_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1、重试数据 2、回调数据', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务日志基础信息表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log' -GO - --- sj_retry_task_log_message -CREATE TABLE sj_retry_task_log_message -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - unique_id nvarchar(64) NOT NULL, - message nvarchar(max) NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id) -GO -CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'unique_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'异常信息', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'message' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'log_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'上报时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'real_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务调度日志信息记录表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log_message' -GO - --- sj_retry_scene_config -CREATE TABLE sj_retry_scene_config -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - scene_name nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_status tinyint NOT NULL DEFAULT 0, - max_retry_count int NOT NULL DEFAULT 5, - back_off tinyint NOT NULL DEFAULT 1, - trigger_interval nvarchar(16) NOT NULL DEFAULT '', - deadline_request bigint NOT NULL DEFAULT 60000, - executor_timeout int NOT NULL DEFAULT 5, - route_key tinyint NOT NULL DEFAULT 4, - description nvarchar(256) NOT NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'scene_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组状态 0、未启用 1、启用', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'scene_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'最大重试次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'max_retry_count' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'1、默认等级 2、固定间隔时间 3、CRON 表达式', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'back_off' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'间隔时长', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'trigger_interval' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'Deadline Request 调用链超时 单位毫秒', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'deadline_request' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务执行超时时间，单位秒', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'executor_timeout' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'路由策略', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'route_key' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景配置', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_scene_config' -GO - --- sj_server_node -CREATE TABLE sj_server_node -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - host_id nvarchar(64) NOT NULL, - host_ip nvarchar(64) NOT NULL, - host_port int NOT NULL, - expire_at datetime2 NOT NULL, - node_type tinyint NOT NULL, - ext_attrs nvarchar(256) NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip) -GO - -CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name) -GO -CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主机id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'host_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'机器ip', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'host_ip' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'机器端口', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'host_port' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'过期时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'expire_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'节点类型 1、客户端 2、是服务端', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'node_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'服务器节点', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_server_node' -GO - --- sj_distributed_lock -CREATE TABLE sj_distributed_lock -( - name nvarchar(64) NOT NULL PRIMARY KEY, - lock_until datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - locked_at datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - locked_by nvarchar(255) NOT NULL, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'锁名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'锁定时长', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'lock_until' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'锁定时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'locked_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'锁定者', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'locked_by' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'锁定表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_distributed_lock' -GO - --- sj_system_user -CREATE TABLE sj_system_user -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - username nvarchar(64) NOT NULL, - password nvarchar(128) NOT NULL, - role tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'账号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'username' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'密码', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'password' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'角色：1-普通用户、2-管理员', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'role' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'系统用户表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user' -GO - --- pwd: admin -INSERT INTO sj_system_user(username, password, role, create_dt, update_dt) VALUES (N'admin', N'465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', N'2', getdate(), getdate()) -GO - --- sj_system_user_permission -CREATE TABLE sj_system_user_permission -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - group_name nvarchar(64) NOT NULL, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - system_user_id bigint NOT NULL, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'系统用户id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'system_user_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'系统用户权限表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_system_user_permission' -GO - --- sj_sequence_alloc -CREATE TABLE sj_sequence_alloc -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL DEFAULT '', - max_id bigint NOT NULL DEFAULT 1, - step int NOT NULL DEFAULT 100, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'最大id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'max_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'步长', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'step' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'号段模式序号ID分配表', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_sequence_alloc' -GO - --- sj_job -CREATE TABLE sj_job -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - job_name nvarchar(64) NOT NULL, - args_str nvarchar(max) NULL DEFAULT NULL, - args_type tinyint NOT NULL DEFAULT 1, - next_trigger_at bigint NOT NULL, - job_status tinyint NOT NULL DEFAULT 1, - task_type tinyint NOT NULL DEFAULT 1, - route_key tinyint NOT NULL DEFAULT 4, - executor_type tinyint NOT NULL DEFAULT 1, - executor_info nvarchar(255) NULL DEFAULT NULL, - trigger_type tinyint NOT NULL, - trigger_interval nvarchar(255) NOT NULL, - block_strategy tinyint NOT NULL DEFAULT 1, - executor_timeout int NOT NULL DEFAULT 0, - max_retry_times int NOT NULL DEFAULT 0, - parallel_num int NOT NULL DEFAULT 1, - retry_interval int NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, - resident tinyint NOT NULL DEFAULT 0, - description nvarchar(256) NOT NULL DEFAULT '', - ext_attrs nvarchar(256) NULL DEFAULT '', - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name) -GO -CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index) -GO -CREATE INDEX idx_sj_job_03 ON sj_job (create_dt) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'job_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'args_str' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'参数类型 ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'args_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'下次触发时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'next_trigger_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务状态 0、关闭、1、开启', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'job_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1、集群 2、广播 3、切片', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'路由策略', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'route_key' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器类型', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'executor_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'executor_info' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'触发类型 1.CRON 表达式 2. 固定时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'trigger_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'间隔时长', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'trigger_interval' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'block_strategy' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务执行超时时间，单位秒', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'executor_timeout' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'最大重试次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'max_retry_times' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'并行数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'parallel_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试间隔 ( s ) ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'retry_interval' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'bucket', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'bucket_index' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'是否是常驻任务', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'resident' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务信息', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job' -GO - -INSERT INTO sj_job (namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, description, ext_attrs, deleted, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, N'testJobExecutor', 2, N'60', 1, 60, 3, 1, 1, 116, 0, N'', N'', 0, getdate(), getdate()) -GO - --- sj_job_log_message -CREATE TABLE sj_job_log_message -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - job_id bigint NOT NULL, - task_batch_id bigint NOT NULL, - task_id bigint NOT NULL, - message nvarchar(max) NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - ext_attrs nvarchar(256) NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id) -GO -CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt) -GO -CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务信息id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'job_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务批次id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'task_batch_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'调度任务id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'task_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'调度信息', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'message' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'log_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'上报时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'real_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'调度日志', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_log_message' -GO - --- sj_job_task -CREATE TABLE sj_job_task -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - job_id bigint NOT NULL, - task_batch_id bigint NOT NULL, - parent_id bigint NOT NULL DEFAULT 0, - task_status tinyint NOT NULL DEFAULT 0, - retry_count int NOT NULL DEFAULT 0, - mr_stage tinyint NULL DEFAULT NULL, - leaf tinyint NOT NULL DEFAULT '1', - task_name nvarchar(255) NOT NULL DEFAULT '', - client_info nvarchar(128) NULL DEFAULT NULL, - wf_context nvarchar(max) NULL DEFAULT NULL, - result_message nvarchar(max) NOT NULL, - args_str nvarchar(max) NULL DEFAULT NULL, - args_type tinyint NOT NULL DEFAULT 1, - ext_attrs nvarchar(256) NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status) -GO -CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt) -GO -CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务信息id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'job_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'调度任务id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'task_batch_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'父执行器id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'parent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行的状态 0、失败 1、成功', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'task_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试次数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'retry_count' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'动态分片所处阶段 1:map 2:reduce 3:mergeReduce', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'mr_stage' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'叶子节点', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'leaf' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'task_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'客户端地址 clientId#ip:port', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'client_info' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流全局上下文', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'wf_context' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行结果', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'result_message' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'args_str' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'参数类型 ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'args_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务实例', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task' -GO - --- sj_job_task_batch -CREATE TABLE sj_job_task_batch -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - job_id bigint NOT NULL, - workflow_node_id bigint NOT NULL DEFAULT 0, - parent_workflow_node_id bigint NOT NULL DEFAULT 0, - workflow_task_batch_id bigint NOT NULL DEFAULT 0, - task_batch_status tinyint NOT NULL DEFAULT 0, - operation_reason tinyint NOT NULL DEFAULT 0, - execution_at bigint NOT NULL DEFAULT 0, - system_task_type tinyint NOT NULL DEFAULT 3, - parent_id nvarchar(64) NOT NULL DEFAULT '', - ext_attrs nvarchar(256) NULL DEFAULT '', - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status) -GO -CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt) -GO -CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name) -GO -CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'job_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流节点id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'workflow_node_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流任务父批次id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'parent_workflow_node_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流任务批次id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'workflow_task_batch_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务批次状态 0、失败 1、成功', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'task_batch_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'操作原因', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'operation_reason' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务执行时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'execution_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 3、JOB任务 4、WORKFLOW任务', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'system_task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'父节点', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'parent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务批次', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_task_batch' -GO - --- sj_job_summary -CREATE TABLE sj_job_summary -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL DEFAULT '', - business_id bigint NOT NULL, - system_task_type tinyint NOT NULL DEFAULT 3, - trigger_at datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - success_num int NOT NULL DEFAULT 0, - fail_num int NOT NULL DEFAULT 0, - fail_reason nvarchar(512) NOT NULL DEFAULT '', - stop_num int NOT NULL DEFAULT 0, - stop_reason nvarchar(512) NOT NULL DEFAULT '', - cancel_num int NOT NULL DEFAULT 0, - cancel_reason nvarchar(512) NOT NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id) -GO - -CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务id ( job_id或workflow_id ) ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'business_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 3、JOB任务 4、WORKFLOW任务', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'system_task_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'统计时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'trigger_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行成功-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'success_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行失败-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'fail_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'失败原因', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'fail_reason' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行失败-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'stop_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'失败原因', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'stop_reason' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行失败-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'cancel_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'失败原因', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'cancel_reason' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'DashBoard_Job', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_job_summary' -GO - --- sj_retry_summary -CREATE TABLE sj_retry_summary -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL DEFAULT '', - scene_name nvarchar(50) NOT NULL DEFAULT '', - trigger_at datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - running_num int NOT NULL DEFAULT 0, - finish_num int NOT NULL DEFAULT 0, - max_count_num int NOT NULL DEFAULT 0, - suspend_num int NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at) -GO - -CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'场景名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'scene_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'统计时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'trigger_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试中-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'running_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试完成-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'finish_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'重试到达最大次数-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'max_count_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'暂停重试-日志数量', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'suspend_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'DashBoard_Retry', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_summary' -GO - --- sj_workflow -CREATE TABLE sj_workflow -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - workflow_name nvarchar(64) NOT NULL, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - workflow_status tinyint NOT NULL DEFAULT 1, - trigger_type tinyint NOT NULL, - trigger_interval nvarchar(255) NOT NULL, - next_trigger_at bigint NOT NULL, - block_strategy tinyint NOT NULL DEFAULT 1, - executor_timeout int NOT NULL DEFAULT 0, - description nvarchar(256) NOT NULL DEFAULT '', - flow_info nvarchar(max) NULL DEFAULT NULL, - wf_context nvarchar(max) NULL DEFAULT NULL, - bucket_index int NOT NULL DEFAULT 0, - version int NOT NULL, - ext_attrs nvarchar(256) NULL DEFAULT '', - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt) -GO -CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'workflow_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流状态 0、关闭、1、开启', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'workflow_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'触发类型 1.CRON 表达式 2. 固定时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'trigger_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'间隔时长', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'trigger_interval' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'下次触发时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'next_trigger_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'block_strategy' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务执行超时时间，单位秒', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'executor_timeout' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'描述', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'description' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'流程信息', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'flow_info' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'上下文', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'wf_context' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'bucket', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'bucket_index' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'version' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow' -GO - --- sj_workflow_node -CREATE TABLE sj_workflow_node -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - node_name nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - job_id bigint NOT NULL, - workflow_id bigint NOT NULL, - node_type tinyint NOT NULL DEFAULT 1, - expression_type tinyint NOT NULL DEFAULT 0, - fail_strategy tinyint NOT NULL DEFAULT 1, - workflow_node_status tinyint NOT NULL DEFAULT 1, - priority_level int NOT NULL DEFAULT 1, - node_info nvarchar(max) NULL DEFAULT NULL, - version int NOT NULL, - ext_attrs nvarchar(256) NULL DEFAULT '', - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt) -GO -CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'节点名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'node_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务信息id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'job_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流ID', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'workflow_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'1、任务节点 2、条件节点', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'node_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'1、SpEl、2、Aviator 3、QL', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'expression_type' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'失败策略 1、跳过 2、阻塞', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'fail_strategy' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流节点状态 0、关闭、1、开启', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'workflow_node_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'优先级', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'priority_level' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'节点信息 ', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'node_info' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'version' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流节点', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_node' -GO - --- sj_workflow_task_batch -CREATE TABLE sj_workflow_task_batch -( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - workflow_id bigint NOT NULL, - task_batch_status tinyint NOT NULL DEFAULT 0, - operation_reason tinyint NOT NULL DEFAULT 0, - flow_info nvarchar(max) NULL DEFAULT NULL, - wf_context nvarchar(max) NULL DEFAULT NULL, - execution_at bigint NOT NULL DEFAULT 0, - ext_attrs nvarchar(256) NULL DEFAULT '', - version int NOT NULL DEFAULT 1, - deleted tinyint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP -) -GO - -CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status) -GO -CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt) -GO -CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name) -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'命名空间id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'namespace_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'组名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'group_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流任务id', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'workflow_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务批次状态 0、失败 1、成功', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'task_batch_status' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'操作原因', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'operation_reason' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'流程信息', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'flow_info' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'全局上下文', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'wf_context' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'任务执行时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'execution_at' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'ext_attrs' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'version' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'逻辑删除 1、删除', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'deleted' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'create_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'修改时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch', - 'COLUMN', N'update_dt' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'工作流批次', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_workflow_task_batch' -GO - diff --git a/template/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/template/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql deleted file mode 100644 index ad9a0b5..0000000 --- a/template/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql +++ /dev/null @@ -1,3549 +0,0 @@ -create table sys_social -( - id bigint NOT NULL, - user_id bigint NOT NULL, - tenant_id nvarchar(20) NULL, - auth_id nvarchar(255) NOT NULL, - source nvarchar(255) NOT NULL, - open_id nvarchar(255) NULL, - user_name nvarchar(30) NOT NULL, - nick_name nvarchar(30) DEFAULT ('') NULL, - email nvarchar(255) DEFAULT ('') NULL, - avatar nvarchar(500) DEFAULT ('') NULL, - access_token nvarchar(255) NOT NULL, - expire_in bigint NULL, - refresh_token nvarchar(255) NULL, - access_code nvarchar(255) NULL, - union_id nvarchar(255) NULL, - scope nvarchar(255) NULL, - token_type nvarchar(255) NULL, - id_token nvarchar(2000) NULL, - mac_algorithm nvarchar(255) NULL, - mac_key nvarchar(255) NULL, - code nvarchar(255) NULL, - oauth_token nvarchar(255) NULL, - oauth_token_secret nvarchar(255) NULL, - create_dept bigint, - create_by bigint, - create_time datetime2(7), - update_by bigint, - update_time datetime2(7), - del_flag nchar DEFAULT ('0') NULL, - CONSTRAINT PK__sys_social__B21E8F2427725F8A PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'user_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台+平台唯一id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'auth_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户来源' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'source' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台编号唯一id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'open_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'登录账号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'user_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户昵称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'nick_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户邮箱' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'email' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'头像地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'avatar' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权令牌' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'access_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权令牌的有效期，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'expire_in' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'刷新令牌，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'refresh_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台的授权信息，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'access_code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的 unionid' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'union_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'授予的权限，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'scope' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'个别平台的授权信息，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'token_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'id token，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'id_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'mac_algorithm' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'mac_key' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权code，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'oauth_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'oauth_token_secret' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'update_time' -GO - - -CREATE TABLE sys_tenant -( - id bigint NOT NULL, - tenant_id nvarchar(20) NOT NULL, - contact_user_name nvarchar(20) NULL, - contact_phone nvarchar(20) NULL, - company_name nvarchar(50) NULL, - license_number nvarchar(30) NULL, - address nvarchar(200) NULL, - intro nvarchar(200) NULL, - domain nvarchar(200) NULL, - remark nvarchar(200) NULL, - package_id bigint NULL, - expire_time datetime2(7) NULL, - account_count int DEFAULT ((-1)) NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - CONSTRAINT PK__sys_tenant__B21E8F2427725F8A PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'联系人' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'contact_user_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'联系电话' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'contact_phone' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'企业名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'company_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'统一社会信用代码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'license_number' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'address' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'企业简介' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'intro' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'域名' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'domain' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户套餐编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'package_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'过期时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'expire_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户数量（-1不限制）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'account_count' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant' -GO - -INSERT sys_tenant VALUES (1, N'000000', N'管理组', N'15888888888', N'XXX有限公司', NULL, NULL, N'多租户通用后台管理管理系统', NULL, NULL, NULL, NULL, -1, N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO - - -CREATE TABLE sys_tenant_package -( - package_id bigint NOT NULL, - package_name nvarchar(20) NOT NULL, - menu_ids nvarchar(20) NULL, - remark nvarchar(200) NULL, - menu_check_strictly tinyint DEFAULT ((1)) NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - CONSTRAINT PK__sys_tenant_package__B21E8F2427725F8A PRIMARY KEY CLUSTERED (package_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户套餐id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'package_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'套餐名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'package_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'关联菜单id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'menu_ids' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户套餐表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_tenant_package' -GO - - -CREATE TABLE gen_table -( - table_id bigint NOT NULL, - data_name nvarchar(200) DEFAULT '' NULL, - table_name nvarchar(200) DEFAULT '' NULL, - table_comment nvarchar(500) DEFAULT '' NULL, - sub_table_name nvarchar(64) NULL, - sub_table_fk_name nvarchar(64) NULL, - class_name nvarchar(100) DEFAULT '' NULL, - tpl_category nvarchar(200) DEFAULT ('crud') NULL, - package_name nvarchar(100) NULL, - module_name nvarchar(30) NULL, - business_name nvarchar(30) NULL, - function_name nvarchar(50) NULL, - function_author nvarchar(50) NULL, - gen_type nchar(1) DEFAULT ('0') NULL, - gen_path nvarchar(200) DEFAULT ('/') NULL, - options nvarchar(1000) NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__gen_tabl__B21E8F2427725F8A PRIMARY KEY CLUSTERED (table_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'table_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'数据源名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'data_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'表名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'table_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'表描述' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'table_comment' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'关联子表的表名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'sub_table_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'子表关联的外键名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'sub_table_fk_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'实体类名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'class_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'使用的模板（crud单表操作 tree树表操作）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'tpl_category' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成包路径' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'package_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成模块名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'module_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成业务名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'business_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成功能名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'function_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成功能作者' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'function_author' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成代码方式（0zip压缩包 1自定义路径）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'gen_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'生成路径（不填默认项目路径）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'gen_path' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'其它生成选项' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'options' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'代码生成业务表' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table' -GO - -CREATE TABLE gen_table_column -( - column_id bigint NOT NULL, - table_id bigint NULL, - column_name nvarchar(200) NULL, - column_comment nvarchar(500) NULL, - column_type nvarchar(100) NULL, - java_type nvarchar(500) NULL, - java_field nvarchar(200) NULL, - is_pk nchar(1) NULL, - is_increment nchar(1) NULL, - is_required nchar(1) NULL, - is_insert nchar(1) NULL, - is_edit nchar(1) NULL, - is_list nchar(1) NULL, - is_query nchar(1) NULL, - query_type nvarchar(200) DEFAULT ('EQ') NULL, - html_type nvarchar(200) NULL, - dict_type nvarchar(200) DEFAULT '' NULL, - sort int NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - CONSTRAINT PK__gen_tabl__E301851F2E68B4E8 PRIMARY KEY CLUSTERED (column_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'column_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'归属表编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'table_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'列名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'column_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'列描述' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'column_comment' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'列类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'column_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'JAVA类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'java_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'JAVA字段名' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'java_field' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否主键（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_pk' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否自增（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_increment' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否必填（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_required' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否为插入字段（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_insert' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否编辑字段（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_edit' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否列表字段（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_list' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否查询字段（1是）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'is_query' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'查询方式（等于、不等于、大于、小于、范围）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'query_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'html_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'dict_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'排序' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'sort' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'代码生成业务表字段' , - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table_column' -GO - -CREATE TABLE sys_config -( - config_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT '000000' NULL, - config_name nvarchar(100) DEFAULT '' NULL, - config_key nvarchar(100) DEFAULT '' NULL, - config_value nvarchar(500) DEFAULT '' NULL, - config_type nchar(1) DEFAULT ('N') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_conf__4AD1BFF182643682 PRIMARY KEY CLUSTERED (config_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'参数主键' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'config_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'参数名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'config_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'参数键名' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'config_key' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'参数键值' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'config_value' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'系统内置（Y是 N否）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'config_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'参数配置表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_config' -GO - -INSERT sys_config VALUES (1, N'000000', N'主框架页-默认皮肤样式名称', N'sys.index.skinName', N'skin-blue', N'Y', 103, 1, getdate(), NULL, NULL, N'蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow') -GO -INSERT sys_config VALUES (2, N'000000', N'用户管理-账号初始密码', N'sys.user.initPassword', N'123456', N'Y', 103, 1, getdate(), NULL, NULL, N'初始化密码 123456') -GO -INSERT sys_config VALUES (3, N'000000', N'主框架页-侧边栏主题', N'sys.index.sideTheme', N'theme-dark', N'Y', 103, 1, getdate(), NULL, NULL, N'深色主题theme-dark，浅色主题theme-light') -GO -INSERT sys_config VALUES (5, N'000000', N'账号自助-是否开启用户注册功能', N'sys.account.registerUser', N'false', N'Y', 103, 1, getdate(), NULL, NULL, N'是否开启注册用户功能（true开启，false关闭）') -GO -INSERT sys_config VALUES (11, N'000000', N'OSS预览列表资源开关', N'sys.oss.previewListResource', N'true', N'Y', 103, 1, getdate(), NULL, NULL, N'true:开启, false:关闭'); -GO - -CREATE TABLE sys_dept -( - dept_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - parent_id bigint DEFAULT ((0)) NULL, - ancestors nvarchar(500)DEFAULT '' NULL, - dept_name nvarchar(30) NULL, - dept_category nvarchar(100) DEFAULT '' NULL, - order_num int DEFAULT ((0)) NULL, - leader bigint NULL, - phone nvarchar(11) NULL, - email nvarchar(50) NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - CONSTRAINT PK__sys_dept__DCA659747DE13804 PRIMARY KEY CLUSTERED (dept_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'dept_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'父部门id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'parent_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'祖级列表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'ancestors' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'dept_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门类别编码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'dept_category' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示顺序' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'order_num' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'负责人' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'leader' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'联系电话' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'phone' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'邮箱' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'email' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept' -GO - -INSERT sys_dept VALUES (100, N'000000', 0, N'0', N'XXX科技', NULL, 0, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (101, N'000000', 100, N'0,100', N'深圳总公司', NULL, 1, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (102, N'000000', 100, N'0,100', N'长沙分公司', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (103, N'000000', 101, N'0,100,101', N'研发部门', NULL, 1, 1, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (104, N'000000', 101, N'0,100,101', N'市场部门', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (105, N'000000', 101, N'0,100,101', N'测试部门', NULL, 3, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (106, N'000000', 101, N'0,100,101', N'财务部门', NULL, 4, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (107, N'000000', 101, N'0,100,101', N'运维部门', NULL, 5, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (108, N'000000', 102, N'0,100,102', N'市场部门', NULL, 1, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO -INSERT sys_dept VALUES (109, N'000000', 102, N'0,100,102', N'财务部门', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL) -GO - -CREATE TABLE sys_dict_data -( - dict_code bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - dict_sort int DEFAULT ((0)) NULL, - dict_label nvarchar(100) DEFAULT '' NULL, - dict_value nvarchar(100) DEFAULT '' NULL, - dict_type nvarchar(100) DEFAULT '' NULL, - css_class nvarchar(100) NULL, - list_class nvarchar(100) NULL, - is_default nchar(1) DEFAULT ('N') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_dict__19CBC34B661AF3B3 PRIMARY KEY CLUSTERED (dict_code) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典编码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'dict_code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典编码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典排序' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'dict_sort' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典标签' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'dict_label' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典键值' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'dict_value' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'dict_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'样式属性（其他样式扩展）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'css_class' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'表格回显样式' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'list_class' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否默认（Y是 N否）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'is_default' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典数据表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_data' -GO - -INSERT sys_dict_data VALUES (1, N'000000', 1, N'男', N'0', N'sys_user_sex', N'', N'', N'Y', 103, 1, getdate(), NULL, NULL, N'性别男') -GO -INSERT sys_dict_data VALUES (2, N'000000', 2, N'女', N'1', N'sys_user_sex', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'性别女') -GO -INSERT sys_dict_data VALUES (3, N'000000', 3, N'未知', N'2', N'sys_user_sex', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'性别未知') -GO -INSERT sys_dict_data VALUES (4, N'000000', 1, N'显示', N'0', N'sys_show_hide', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'显示菜单') -GO -INSERT sys_dict_data VALUES (5, N'000000', 2, N'隐藏', N'1', N'sys_show_hide', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'隐藏菜单') -GO -INSERT sys_dict_data VALUES (6, N'000000', 1, N'正常', N'0', N'sys_normal_disable', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态') -GO -INSERT sys_dict_data VALUES (7, N'000000', 2, N'停用', N'1', N'sys_normal_disable', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态') -GO -INSERT sys_dict_data VALUES (8, N'000000', 1, N'正常', N'0', N'sys_job_status', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态') -GO -INSERT sys_dict_data VALUES (9, N'000000', 2, N'暂停', N'1', N'sys_job_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态') -GO -INSERT sys_dict_data VALUES (10, N'000000', 1, N'默认', N'DEFAULT', N'sys_job_group', N'', N'', N'Y', 103, 1, getdate(), NULL, NULL, N'默认分组') -GO -INSERT sys_dict_data VALUES (11, N'000000', 2, N'系统', N'SYSTEM', N'sys_job_group', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'系统分组') -GO -INSERT sys_dict_data VALUES (12, N'000000', 1, N'是', N'Y', N'sys_yes_no', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'系统默认是') -GO -INSERT sys_dict_data VALUES (13, N'000000', 2, N'否', N'N', N'sys_yes_no', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'系统默认否') -GO -INSERT sys_dict_data VALUES (14, N'000000', 1, N'通知', N'1', N'sys_notice_type', N'', N'warning', N'Y', 103, 1, getdate(), NULL, NULL, N'通知') -GO -INSERT sys_dict_data VALUES (15, N'000000', 2, N'公告', N'2', N'sys_notice_type', N'', N'success', N'N', 103, 1, getdate(), NULL, NULL, N'公告') -GO -INSERT sys_dict_data VALUES (16, N'000000', 1, N'正常', N'0', N'sys_notice_status', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态') -GO -INSERT sys_dict_data VALUES (17, N'000000', 2, N'关闭', N'1', N'sys_notice_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'关闭状态') -GO -INSERT sys_dict_data VALUES (29, N'000000', 99, N'其他', N'0', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'其他操作'); -GO -INSERT sys_dict_data VALUES (18, N'000000', 1, N'新增', N'1', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'新增操作') -GO -INSERT sys_dict_data VALUES (19, N'000000', 2, N'修改', N'2', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'修改操作') -GO -INSERT sys_dict_data VALUES (20, N'000000', 3, N'删除', N'3', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'删除操作') -GO -INSERT sys_dict_data VALUES (21, N'000000', 4, N'授权', N'4', N'sys_oper_type', N'', N'primary', N'N', 103, 1, getdate(), NULL, NULL, N'授权操作') -GO -INSERT sys_dict_data VALUES (22, N'000000', 5, N'导出', N'5', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'导出操作') -GO -INSERT sys_dict_data VALUES (23, N'000000', 6, N'导入', N'6', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'导入操作') -GO -INSERT sys_dict_data VALUES (24, N'000000', 7, N'强退', N'7', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'强退操作') -GO -INSERT sys_dict_data VALUES (25, N'000000', 8, N'生成代码', N'8', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'生成操作') -GO -INSERT sys_dict_data VALUES (26, N'000000', 9, N'清空数据', N'9', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'清空操作') -GO -INSERT sys_dict_data VALUES (27, N'000000', 1, N'成功', N'0', N'sys_common_status', N'', N'primary', N'N', 103, 1, getdate(), NULL, NULL, N'正常状态') -GO -INSERT sys_dict_data VALUES (28, N'000000', 2, N'失败', N'1', N'sys_common_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态') -GO -INSERT sys_dict_data VALUES (30, N'000000', 0, N'密码认证', N'password', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'密码认证') -GO -INSERT sys_dict_data VALUES (31, N'000000', 0, N'短信认证', N'sms', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'短信认证') -GO -INSERT sys_dict_data VALUES (32, N'000000', 0, N'邮件认证', N'email', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'邮件认证') -GO -INSERT sys_dict_data VALUES (33, N'000000', 0, N'小程序认证', N'xcx', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'小程序认证') -GO -INSERT sys_dict_data VALUES (34, N'000000', 0, N'三方登录认证', N'`social`', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'三方登录认证') -GO -INSERT sys_dict_data VALUES (35, N'000000', 0, N'PC', N'`pc`', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'PC') -GO -INSERT sys_dict_data VALUES (36, N'000000', 0, N'安卓', N'`android`', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'安卓') -GO -INSERT sys_dict_data VALUES (37, N'000000', 0, N'iOS', N'`ios`', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'iOS') -GO -INSERT sys_dict_data VALUES (38, N'000000', 0, N'小程序', N'`xcx`', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'小程序') -GO - -CREATE TABLE sys_dict_type -( - dict_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - dict_name nvarchar(100) DEFAULT '' NULL, - dict_type nvarchar(100) DEFAULT '' NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_dict__3BD4186C409C5391 PRIMARY KEY CLUSTERED (dict_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -CREATE NONCLUSTERED INDEX sys_dict_type_index1 ON sys_dict_type (tenant_id, dict_type) -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典主键' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'dict_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典主键' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'dict_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'dict_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'字典类型表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dict_type' -GO - -INSERT sys_dict_type VALUES (1, N'000000', N'用户性别', N'sys_user_sex', 103, 1, getdate(), NULL, NULL, N'用户性别列表') -GO -INSERT sys_dict_type VALUES (2, N'000000', N'菜单状态', N'sys_show_hide', 103, 1, getdate(), NULL, NULL, N'菜单状态列表') -GO -INSERT sys_dict_type VALUES (3, N'000000', N'系统开关', N'sys_normal_disable', 103, 1, getdate(), NULL, NULL, N'系统开关列表') -GO -INSERT sys_dict_type VALUES (4, N'000000', N'任务状态', N'sys_job_status', 103, 1, getdate(), NULL, NULL, N'任务状态列表') -GO -INSERT sys_dict_type VALUES (5, N'000000', N'任务分组', N'sys_job_group', 103, 1, getdate(), NULL, NULL, N'任务分组列表') -GO -INSERT sys_dict_type VALUES (6, N'000000', N'系统是否', N'sys_yes_no', 103, 1, getdate(), NULL, NULL, N'系统是否列表') -GO -INSERT sys_dict_type VALUES (7, N'000000', N'通知类型', N'sys_notice_type', 103, 1, getdate(), NULL, NULL, N'通知类型列表') -GO -INSERT sys_dict_type VALUES (8, N'000000', N'通知状态', N'sys_notice_status', 103, 1, getdate(), NULL, NULL, N'通知状态列表') -GO -INSERT sys_dict_type VALUES (9, N'000000', N'操作类型', N'sys_oper_type', 103, 1, getdate(), NULL, NULL, N'操作类型列表') -GO -INSERT sys_dict_type VALUES (10, N'000000', N'系统状态', N'sys_common_status', 103, 1, getdate(), NULL, NULL, N'登录状态列表') -GO -INSERT sys_dict_type VALUES (11, N'000000', N'授权类型', N'sys_grant_type', 103, 1, getdate(), NULL, NULL, N'认证授权类型') -GO -INSERT sys_dict_type VALUES (12, N'000000', N'设备类型', N'sys_device_type', 103, 1, getdate(), NULL, NULL, N'客户端设备类型') -GO - -CREATE TABLE sys_logininfor -( - info_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - user_name nvarchar(50) DEFAULT '' NULL, - client_key nvarchar(32) DEFAULT '' NULL, - device_type nvarchar(32) DEFAULT '' NULL, - ipaddr nvarchar(128) DEFAULT '' NULL, - login_location nvarchar(255) DEFAULT '' NULL, - browser nvarchar(50) DEFAULT '' NULL, - os nvarchar(50) DEFAULT '' NULL, - status nchar(1) DEFAULT ('0') NULL, - msg nvarchar(255) DEFAULT '' NULL, - login_time datetime2(7) NULL, - CONSTRAINT PK__sys_logi__3D8A9C1A1854AE10 PRIMARY KEY CLUSTERED (info_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -CREATE NONCLUSTERED INDEX idx_sys_logininfor_s ON sys_logininfor (status) -GO -CREATE NONCLUSTERED INDEX idx_sys_logininfor_lt ON sys_logininfor (login_time) -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'访问ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'info_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户账号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'user_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'客户端' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'client_key' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'设备类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'device_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'登录IP地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'ipaddr' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'登录地点' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'login_location' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'浏览器类型' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'browser' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作系统' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'os' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'登录状态（0成功 1失败）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'提示消息' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'msg' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'访问时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'login_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'系统访问记录' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor' -GO - -CREATE TABLE sys_menu -( - menu_id bigint NOT NULL, - menu_name nvarchar(50) NOT NULL, - parent_id bigint DEFAULT ((0)) NULL, - order_num int DEFAULT ((0)) NULL, - path nvarchar(200) DEFAULT '' NULL, - component nvarchar(255) NULL, - query_param nvarchar(255) NULL, - is_frame int DEFAULT ((1)) NULL, - is_cache int DEFAULT ((0)) NULL, - menu_type nchar(1) DEFAULT '' NULL, - visible nchar(1) DEFAULT ((0)) NULL, - status nchar(1) DEFAULT ((0)) NULL, - perms nvarchar(100) NULL, - icon nvarchar(100) DEFAULT ('#') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) DEFAULT '' NULL, - CONSTRAINT PK__sys_menu__4CA0FADCF8545C58 PRIMARY KEY CLUSTERED (menu_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'menu_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'menu_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'父菜单ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'parent_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示顺序' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'order_num' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'路由地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'path' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'组件路径' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'component' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'路由参数' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'query_param' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否为外链（0是 1否）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'is_frame' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'是否缓存（0缓存 1不缓存）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'is_cache' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单类型（M目录 C菜单 F按钮）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'menu_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示状态（0显示 1隐藏）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'visible' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'权限标识' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'perms' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单图标' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'icon' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单权限表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_menu' -GO - -INSERT sys_menu VALUES (1, N'系统管理', 0, 1, N'system', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'system', 103, 1, getdate(), NULL, NULL, N'系统管理目录') -GO -INSERT sys_menu VALUES (6, N'租户管理', 0, 2, N'tenant', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'chart', 103, 1, getdate(), NULL, NULL, N'租户管理目录') -GO -INSERT sys_menu VALUES (2, N'系统监控', 0, 3, N'monitor', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'monitor', 103, 1, getdate(), NULL, NULL, N'系统监控目录') -GO -INSERT sys_menu VALUES (3, N'系统工具', 0, 4, N'tool', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'tool', 103, 1, getdate(), NULL, NULL, N'系统工具目录') -GO -INSERT sys_menu VALUES (4, N'PLUS官网', 0, 5, N'https://gitee.com/dromara/RuoYi-Vue-Plus', null, N'', 0, 0, N'M', N'0', N'0', N'', N'guide', 103, 1, getdate(), null, null, N'RuoYi-Vue-Plus官网地址'); -GO -INSERT sys_menu VALUES (5, N'测试菜单', 0, 5, N'demo', NULL, N'', 1, 0, N'M', N'0', N'0', NULL, N'star', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (100, N'用户管理', 1, 1, N'user', N'system/user/index', N'', 1, 0, N'C', N'0', N'0', N'system:user:list', N'user', 103, 1, getdate(), NULL, NULL, N'用户管理菜单') -GO -INSERT sys_menu VALUES (101, N'角色管理', 1, 2, N'role', N'system/role/index', N'', 1, 0, N'C', N'0', N'0', N'system:role:list', N'peoples', 103, 1, getdate(), NULL, NULL, N'角色管理菜单') -GO -INSERT sys_menu VALUES (102, N'菜单管理', 1, 3, N'menu', N'system/menu/index', N'', 1, 0, N'C', N'0', N'0', N'system:menu:list', N'tree-table', 103, 1, getdate(), NULL, NULL, N'菜单管理菜单') -GO -INSERT sys_menu VALUES (103, N'部门管理', 1, 4, N'dept', N'system/dept/index', N'', 1, 0, N'C', N'0', N'0', N'system:dept:list', N'tree', 103, 1, getdate(), NULL, NULL, N'部门管理菜单') -GO -INSERT sys_menu VALUES (104, N'岗位管理', 1, 5, N'post', N'system/post/index', N'', 1, 0, N'C', N'0', N'0', N'system:post:list', N'post', 103, 1, getdate(), NULL, NULL, N'岗位管理菜单') -GO -INSERT sys_menu VALUES (105, N'字典管理', 1, 6, N'dict', N'system/dict/index', N'', 1, 0, N'C', N'0', N'0', N'system:dict:list', N'dict', 103, 1, getdate(), NULL, NULL, N'字典管理菜单') -GO -INSERT sys_menu VALUES (106, N'参数设置', 1, 7, N'config', N'system/config/index', N'', 1, 0, N'C', N'0', N'0', N'system:config:list', N'edit', 103, 1, getdate(), NULL, NULL, N'参数设置菜单') -GO -INSERT sys_menu VALUES (107, N'通知公告', 1, 8, N'notice', N'system/notice/index', N'', 1, 0, N'C', N'0', N'0', N'system:notice:list', N'message', 103, 1, getdate(), NULL, NULL, N'通知公告菜单') -GO -INSERT sys_menu VALUES (108, N'日志管理', 1, 9, N'log', N'', N'', 1, 0, N'M', N'0', N'0', N'', N'log', 103, 1, getdate(), NULL, NULL, N'日志管理菜单') -GO -INSERT sys_menu VALUES (109, N'在线用户', 2, 1, N'online', N'monitor/online/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:online:list', N'online', 103, 1, getdate(), NULL, NULL, N'在线用户菜单') -GO -INSERT sys_menu VALUES (113, N'缓存监控', 2, 5, N'cache', N'monitor/cache/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis', 103, 1, getdate(), NULL, NULL, N'缓存监控菜单') -GO -INSERT sys_menu VALUES (115, N'代码生成', 3, 2, N'gen', N'tool/gen/index', N'', 1, 0, N'C', N'0', N'0', N'tool:gen:list', N'code', 103, 1, getdate(), NULL, NULL, N'代码生成菜单') -GO -INSERT sys_menu VALUES (121, N'租户管理', 6, 1, N'tenant', N'system/tenant/index', N'', 1, 0, N'C', N'0', N'0', N'system:tenant:list', N'code', 103, 1, getdate(), NULL, NULL, N'租户管理菜单') -GO -INSERT sys_menu VALUES (122, N'租户套餐管理', 6, 2, N'tenantPackage', N'system/tenantPackage/index', N'', 1, 0, N'C', N'0', N'0', N'system:tenantPackage:list', N'code', 103, 1, getdate(), NULL, NULL, N'租户套餐管理菜单') -GO -INSERT sys_menu VALUES (123, N'客户端管理', 1, 11, N'client', N'system/client/index', N'', 1, 0, N'C', N'0', N'0', N'system:client:list', N'international', 103, 1, getdate(), NULL, NULL, N'客户端管理菜单') -GO -INSERT sys_menu VALUES (117, N'Admin监控', 2, 5, N'Admin', N'monitor/admin/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:admin:list', N'dashboard', 103, 1, getdate(), NULL, NULL, N'Admin监控菜单'); -GO -INSERT sys_menu VALUES (118, N'文件管理', 1, 10, N'oss', N'system/oss/index', N'', 1, 0, N'C', '0', N'0', N'system:oss:list', N'upload', 103, 1, getdate(), NULL, NULL, N'文件管理菜单'); -GO -INSERT sys_menu VALUES (120, N'任务调度中心', 2, 5, N'snailjob', N'monitor/snailjob/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:snailjob:list', N'job', 103, 1, getdate(), NULL, NULL, N'SnailJob控制台菜单'); -GO -INSERT sys_menu VALUES (500, N'操作日志', 108, 1, N'operlog', N'monitor/operlog/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:operlog:list', N'form', 103, 1, getdate(), NULL, NULL, N'操作日志菜单') -GO -INSERT sys_menu VALUES (501, N'登录日志', 108, 2, N'logininfor', N'monitor/logininfor/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:logininfor:list', N'logininfor', 103, 1, getdate(), NULL, NULL, N'登录日志菜单') -GO -INSERT sys_menu VALUES (1001, N'用户查询', 100, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1002, N'用户新增', 100, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1003, N'用户修改', 100, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1004, N'用户删除', 100, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1005, N'用户导出', 100, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1006, N'用户导入', 100, 6, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:import', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1007, N'重置密码', 100, 7, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:resetPwd', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1008, N'角色查询', 101, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1009, N'角色新增', 101, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1010, N'角色修改', 101, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1011, N'角色删除', 101, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1012, N'角色导出', 101, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1013, N'菜单查询', 102, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1014, N'菜单新增', 102, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1015, N'菜单修改', 102, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1016, N'菜单删除', 102, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1017, N'部门查询', 103, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1018, N'部门新增', 103, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1019, N'部门修改', 103, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1020, N'部门删除', 103, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1021, N'岗位查询', 104, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1022, N'岗位新增', 104, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1023, N'岗位修改', 104, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1024, N'岗位删除', 104, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1025, N'岗位导出', 104, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1026, N'字典查询', 105, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1027, N'字典新增', 105, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1028, N'字典修改', 105, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1029, N'字典删除', 105, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1030, N'字典导出', 105, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1031, N'参数查询', 106, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1032, N'参数新增', 106, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1033, N'参数修改', 106, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1034, N'参数删除', 106, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1035, N'参数导出', 106, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1036, N'公告查询', 107, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1037, N'公告新增', 107, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:add', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1038, N'公告修改', 107, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1039, N'公告删除', 107, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1040, N'操作查询', 500, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1041, N'操作删除', 500, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1042, N'日志导出', 500, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1043, N'登录查询', 501, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1044, N'登录删除', 501, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1045, N'日志导出', 501, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:export', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1050, N'账户解锁', 501, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:unlock', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1046, N'在线查询', 109, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1047, N'批量强退', 109, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:batchLogout', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1048, N'单条强退', 109, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:forceLogout', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1055, N'生成查询', 115, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:query', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1056, N'生成修改', 115, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:edit', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1057, N'生成删除', 115, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:remove', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1058, N'导入代码', 115, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:import', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1059, N'预览代码', 115, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:preview', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_menu VALUES (1060, N'生成代码', 115, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:code', N'#', 103, 1, getdate(), NULL, NULL, N'') -GO --- oss相关按钮 -INSERT sys_menu VALUES (1600, N'文件查询', 118, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1601, N'文件上传', 118, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:upload', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1602, N'文件下载', 118, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:download', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1603, N'文件删除', 118, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1620, N'配置列表', 118, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:list', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1621, N'配置添加', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1622, N'配置编辑', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1623, N'配置删除', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO --- 租户管理相关按钮 -INSERT sys_menu VALUES (1606, N'租户查询', 121, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenant:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1607, N'租户新增', 121, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenant:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1608, N'租户修改', 121, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenant:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1609, N'租户删除', 121, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenant:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1610, N'租户导出', 121, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenant:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO --- 租户套餐管理相关按钮 -INSERT sys_menu VALUES (1611, N'租户套餐查询', 122, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenantPackage:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1612, N'租户套餐新增', 122, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenantPackage:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1613, N'租户套餐修改', 122, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenantPackage:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1614, N'租户套餐删除', 122, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenantPackage:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1615, N'租户套餐导出', 122, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:tenantPackage:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO --- 客户端管理按钮 -INSERT sys_menu VALUES (1061, N'客户端管理查询', 123, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1062, N'客户端管理新增', 123, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1063, N'客户端管理修改', 123, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1064, N'客户端管理删除', 123, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1065, N'客户端管理导出', 123, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO --- 测试菜单 -INSERT sys_menu VALUES (1500, N'测试单表', 5, 1, N'demo', N'demo/demo/index', N'', 1, 0, N'C', N'0', N'0', N'demo:demo:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试单表菜单'); -GO -INSERT sys_menu VALUES (1501, N'测试单表查询', 1500, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1502, N'测试单表新增', 1500, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1503, N'测试单表修改', 1500, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1504, N'测试单表删除', 1500, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1505, N'测试单表导出', 1500, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO - -INSERT sys_menu VALUES (1506, N'测试树表', 5, 1, N'tree', N'demo/tree/index', N'', 1, 0, N'C', N'0', N'0', N'demo:tree:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试树表菜单'); -GO -INSERT sys_menu VALUES (1507, N'测试树表查询', 1506, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1508, N'测试树表新增', 1506, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1509, N'测试树表修改', 1506, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1510, N'测试树表删除', 1506, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1511, N'测试树表导出', 1506, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO - -CREATE TABLE sys_notice -( - notice_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - notice_title nvarchar(50) NOT NULL, - notice_type nchar(1) NOT NULL, - notice_content nvarchar(max) NULL, - status nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(255) NULL, - CONSTRAINT PK__sys_noti__3E82A5DB0EC94801 PRIMARY KEY CLUSTERED (notice_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -TEXTIMAGE_ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'公告ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'notice_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'公告标题' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'notice_title' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'公告类型（1通知 2公告）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'notice_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'公告内容' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'notice_content' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'公告状态（0正常 1关闭）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'通知公告表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_notice' -GO - -INSERT sys_notice VALUES (1, N'000000', N'温馨提醒：2018-07-01 若依新版本发布啦', N'2', N'新版本内容', N'0', 103, 1, getdate(), NULL, NULL, N'管理员') -GO -INSERT sys_notice VALUES (2, N'000000', N'维护通知：2018-07-01 若依系统凌晨维护', N'1', N'维护内容', N'0', 103, 1, getdate(), NULL, NULL, N'管理员') -GO - -CREATE TABLE sys_oper_log -( - oper_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - title nvarchar(50) DEFAULT '' NULL, - business_type int DEFAULT ((0)) NULL, - method nvarchar(100) DEFAULT '' NULL, - request_method nvarchar(10) DEFAULT '' NULL, - operator_type int DEFAULT ((0)) NULL, - oper_name nvarchar(50) DEFAULT '' NULL, - dept_name nvarchar(50) DEFAULT '' NULL, - oper_url nvarchar(255) DEFAULT '' NULL, - oper_ip nvarchar(128) DEFAULT '' NULL, - oper_location nvarchar(255) DEFAULT '' NULL, - oper_param nvarchar(2000) DEFAULT '' NULL, - json_result nvarchar(2000) DEFAULT '' NULL, - status int DEFAULT ((0)) NULL, - error_msg nvarchar(2000) DEFAULT '' NULL, - oper_time datetime2(7) NULL, - cost_time bigint DEFAULT ((0)) NULL, - CONSTRAINT PK__sys_oper__34723BF9BD954573 PRIMARY KEY CLUSTERED (oper_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -CREATE NONCLUSTERED INDEX idx_sys_oper_log_bt ON sys_oper_log (business_type) -GO -CREATE NONCLUSTERED INDEX idx_sys_oper_log_s ON sys_oper_log (status) -GO -CREATE NONCLUSTERED INDEX idx_sys_oper_log_ot ON sys_oper_log (oper_time) -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'日志主键' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'模块标题' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'title' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'业务类型（0其它 1新增 2修改 3删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'business_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'方法名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'method' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'请求方式' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'request_method' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作类别（0其它 1后台用户 2手机端用户）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'operator_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作人员' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'dept_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'请求URL' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_url' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'主机地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_ip' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作地点' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_location' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'请求参数' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_param' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'返回参数' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'json_result' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作状态（0正常 1异常）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'错误消息' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'error_msg' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'oper_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'消耗时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log', - 'COLUMN', N'cost_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'操作日志记录' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oper_log' -GO - -CREATE TABLE sys_post -( - post_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - dept_id bigint NOT NULL, - post_code nvarchar(64) NOT NULL, - post_category nvarchar(100) NULL, - post_name nvarchar(50) NOT NULL, - post_sort int NOT NULL, - status nchar(1) NOT NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_post__3ED7876668E2D081 PRIMARY KEY CLUSTERED (post_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'dept_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位编码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位类别编码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_category' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示顺序' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_sort' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位信息表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post' -GO - -INSERT sys_post VALUES (1, N'000000', 103, N'ceo', NULL, N'董事长', 1, N'0', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_post VALUES (2, N'000000', 100, N'se', NULL, N'项目经理', 2, N'0', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_post VALUES (3, N'000000', 100, N'hr', NULL, N'人力资源', 3, N'0', 103, 1, getdate(), NULL, NULL, N'') -GO -INSERT sys_post VALUES (4, N'000000', 100, N'user', NULL, N'普通员工', 4, N'0', 103, 1, getdate(), NULL, NULL, N'') -GO - -CREATE TABLE sys_role -( - role_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - role_name nvarchar(30) NOT NULL, - role_key nvarchar(100) NOT NULL, - role_sort int NOT NULL, - data_scope nchar(1) DEFAULT ('1') NULL, - menu_check_strictly tinyint DEFAULT ((1)) NULL, - dept_check_strictly tinyint DEFAULT ((1)) NULL, - status nchar(1) NOT NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_role__760965CCF9383145 PRIMARY KEY CLUSTERED (role_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'role_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色名称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'role_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色权限字符串' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'role_key' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'显示顺序' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'role_sort' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'data_scope' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单树选择项是否关联显示' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'menu_check_strictly' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门树选择项是否关联显示' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'dept_check_strictly' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色信息表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role' -GO - -INSERT sys_role VALUES (1, N'000000', N'超级管理员', N'superadmin', 1, N'1', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N'超级管理员') -GO -INSERT sys_role VALUES (3, N'000000', N'本部门及以下', N'test1', 3, N'4', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_role VALUES (4, N'000000', N'仅本人', N'test2', 4, N'5', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N''); -GO - -CREATE TABLE sys_role_dept -( - role_id bigint NOT NULL, - dept_id bigint NOT NULL, - CONSTRAINT PK__sys_role__2BC3005BABBCA08A PRIMARY KEY CLUSTERED (role_id, dept_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_dept', - 'COLUMN', N'role_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_dept', - 'COLUMN', N'dept_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色和部门关联表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_dept' -GO - -CREATE TABLE sys_role_menu -( - role_id bigint NOT NULL, - menu_id bigint NOT NULL, - CONSTRAINT PK__sys_role__A2C36A6187BA4B17 PRIMARY KEY CLUSTERED (role_id, menu_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_menu', - 'COLUMN', N'role_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_menu', - 'COLUMN', N'menu_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色和菜单关联表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_role_menu' -GO - --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -INSERT sys_role_menu VALUES (3, 1); -GO -INSERT sys_role_menu VALUES (3, 5); -GO -INSERT sys_role_menu VALUES (3, 100); -GO -INSERT sys_role_menu VALUES (3, 101); -GO -INSERT sys_role_menu VALUES (3, 102); -GO -INSERT sys_role_menu VALUES (3, 103); -GO -INSERT sys_role_menu VALUES (3, 104); -GO -INSERT sys_role_menu VALUES (3, 105); -GO -INSERT sys_role_menu VALUES (3, 106); -GO -INSERT sys_role_menu VALUES (3, 107); -GO -INSERT sys_role_menu VALUES (3, 108); -GO -INSERT sys_role_menu VALUES (3, 500); -GO -INSERT sys_role_menu VALUES (3, 501); -GO -INSERT sys_role_menu VALUES (3, 1001); -GO -INSERT sys_role_menu VALUES (3, 1002); -GO -INSERT sys_role_menu VALUES (3, 1003); -GO -INSERT sys_role_menu VALUES (3, 1004); -GO -INSERT sys_role_menu VALUES (3, 1005); -GO -INSERT sys_role_menu VALUES (3, 1006); -GO -INSERT sys_role_menu VALUES (3, 1007); -GO -INSERT sys_role_menu VALUES (3, 1008); -GO -INSERT sys_role_menu VALUES (3, 1009); -GO -INSERT sys_role_menu VALUES (3, 1010); -GO -INSERT sys_role_menu VALUES (3, 1011); -GO -INSERT sys_role_menu VALUES (3, 1012); -GO -INSERT sys_role_menu VALUES (3, 1013); -GO -INSERT sys_role_menu VALUES (3, 1014); -GO -INSERT sys_role_menu VALUES (3, 1015); -GO -INSERT sys_role_menu VALUES (3, 1016); -GO -INSERT sys_role_menu VALUES (3, 1017); -GO -INSERT sys_role_menu VALUES (3, 1018); -GO -INSERT sys_role_menu VALUES (3, 1019); -GO -INSERT sys_role_menu VALUES (3, 1020); -GO -INSERT sys_role_menu VALUES (3, 1021); -GO -INSERT sys_role_menu VALUES (3, 1022); -GO -INSERT sys_role_menu VALUES (3, 1023); -GO -INSERT sys_role_menu VALUES (3, 1024); -GO -INSERT sys_role_menu VALUES (3, 1025); -GO -INSERT sys_role_menu VALUES (3, 1026); -GO -INSERT sys_role_menu VALUES (3, 1027); -GO -INSERT sys_role_menu VALUES (3, 1028); -GO -INSERT sys_role_menu VALUES (3, 1029); -GO -INSERT sys_role_menu VALUES (3, 1030); -GO -INSERT sys_role_menu VALUES (3, 1031); -GO -INSERT sys_role_menu VALUES (3, 1032); -GO -INSERT sys_role_menu VALUES (3, 1033); -GO -INSERT sys_role_menu VALUES (3, 1034); -GO -INSERT sys_role_menu VALUES (3, 1035); -GO -INSERT sys_role_menu VALUES (3, 1036); -GO -INSERT sys_role_menu VALUES (3, 1037); -GO -INSERT sys_role_menu VALUES (3, 1038); -GO -INSERT sys_role_menu VALUES (3, 1039); -GO -INSERT sys_role_menu VALUES (3, 1040); -GO -INSERT sys_role_menu VALUES (3, 1041); -GO -INSERT sys_role_menu VALUES (3, 1042); -GO -INSERT sys_role_menu VALUES (3, 1043); -GO -INSERT sys_role_menu VALUES (3, 1044); -GO -INSERT sys_role_menu VALUES (3, 1045); -GO -INSERT sys_role_menu VALUES (3, 1500); -GO -INSERT sys_role_menu VALUES (3, 1501); -GO -INSERT sys_role_menu VALUES (3, 1502); -GO -INSERT sys_role_menu VALUES (3, 1503); -GO -INSERT sys_role_menu VALUES (3, 1504); -GO -INSERT sys_role_menu VALUES (3, 1505); -GO -INSERT sys_role_menu VALUES (3, 1506); -GO -INSERT sys_role_menu VALUES (3, 1507); -GO -INSERT sys_role_menu VALUES (3, 1508); -GO -INSERT sys_role_menu VALUES (3, 1509); -GO -INSERT sys_role_menu VALUES (3, 1510); -GO -INSERT sys_role_menu VALUES (3, 1511); -GO -INSERT sys_role_menu VALUES (4, 5); -GO -INSERT sys_role_menu VALUES (4, 1500); -GO -INSERT sys_role_menu VALUES (4, 1501); -GO -INSERT sys_role_menu VALUES (4, 1502); -GO -INSERT sys_role_menu VALUES (4, 1503); -GO -INSERT sys_role_menu VALUES (4, 1504); -GO -INSERT sys_role_menu VALUES (4, 1505); -GO -INSERT sys_role_menu VALUES (4, 1506); -GO -INSERT sys_role_menu VALUES (4, 1507); -GO -INSERT sys_role_menu VALUES (4, 1508); -GO -INSERT sys_role_menu VALUES (4, 1509); -GO -INSERT sys_role_menu VALUES (4, 1510); -GO -INSERT sys_role_menu VALUES (4, 1511); -GO - -CREATE TABLE sys_user -( - user_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - dept_id bigint NULL, - user_name nvarchar(30) NOT NULL, - nick_name nvarchar(30) NOT NULL, - user_type nvarchar(10) DEFAULT ('sys_user') NULL, - email nvarchar(50) DEFAULT '' NULL, - phonenumber nvarchar(11) DEFAULT '' NULL, - sex nchar(1) DEFAULT ('0') NULL, - avatar bigint NULL, - password nvarchar(100) DEFAULT '' NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - login_ip nvarchar(128) DEFAULT '' NULL, - login_date datetime2(7) NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_user__B9BE370F79170B6A PRIMARY KEY CLUSTERED (user_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'user_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'部门ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'dept_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户账号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'user_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户昵称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'nick_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户类型（sys_user系统用户）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'user_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户邮箱' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'email' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'手机号码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'phonenumber' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户性别（0男 1女 2未知）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'sex' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'头像地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'avatar' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'密码' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'password' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'帐号状态（0正常 1停用）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'status' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'最后登录IP' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'login_ip' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'最后登录时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'login_date' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'update_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'备注' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user', - 'COLUMN', N'remark' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户信息表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user' -GO - -INSERT sys_user VALUES (1, N'000000', 103, N'admin', N'疯狂的狮子Li', N'sys_user', N'crazyLionLi@163.com', N'15888888888', N'1', NULL, N'$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), NULL, NULL, N'管理员') -GO -INSERT sys_user VALUES (3, N'000000', 108, N'test', N'本部门及以下 密码666666', N'sys_user', N'', N'', N'0', NULL, N'$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), 3, getdate(), NULL); -GO -INSERT sys_user VALUES (4, N'000000', 102, N'test1', N'仅本人 密码666666', N'sys_user', N'', N'', N'0', NULL, N'$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), 4, getdate(), NULL); -GO - -CREATE TABLE sys_user_post -( - user_id bigint NOT NULL, - post_id bigint NOT NULL, - CONSTRAINT PK__sys_user__CA534F799C04589B PRIMARY KEY CLUSTERED (user_id, post_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_post', - 'COLUMN', N'user_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'岗位ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_post', - 'COLUMN', N'post_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户与岗位关联表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_post' -GO - -INSERT sys_user_post VALUES (1, 1) -GO - -CREATE TABLE sys_user_role -( - user_id bigint NOT NULL, - role_id bigint NOT NULL, - CONSTRAINT PK__sys_user__6EDEA153FB34D8F0 PRIMARY KEY CLUSTERED (user_id, role_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_role', - 'COLUMN', N'user_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'角色ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_role', - 'COLUMN', N'role_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户和角色关联表' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_user_role' -GO - -INSERT sys_user_role VALUES (1, 1) -GO -INSERT sys_user_role VALUES (3, 3); -GO -INSERT sys_user_role VALUES (4, 4); -GO - -CREATE TABLE sys_oss -( - oss_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - file_name nvarchar(255) DEFAULT '' NOT NULL, - original_name nvarchar(255) DEFAULT '' NOT NULL, - file_suffix nvarchar(10) DEFAULT '' NOT NULL, - url nvarchar(500) NOT NULL, - create_dept bigint NULL, - create_time datetime2(7) NULL, - create_by bigint NULL, - update_time datetime2(7) NULL, - update_by bigint NULL, - service nvarchar(20) DEFAULT ('minio') NOT NULL, - CONSTRAINT PK__sys_oss__91241EA442389F0D PRIMARY KEY CLUSTERED (oss_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'对象存储主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'oss_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'tenant_id' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'文件名', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'file_name' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'原名', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'original_name' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'文件后缀名', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'file_suffix' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'URL地址', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'url' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'create_dept' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'create_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'上传人', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'create_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'update_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新人', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'update_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'服务商', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss', - 'COLUMN', N'service' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'OSS对象存储表', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss' -GO - -CREATE TABLE sys_oss_config -( - oss_config_id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - config_key nvarchar(20) DEFAULT '' NOT NULL, - access_key nvarchar(255) DEFAULT '' NULL, - secret_key nvarchar(255) DEFAULT '' NULL, - bucket_name nvarchar(255) DEFAULT '' NULL, - prefix nvarchar(255) DEFAULT '' NULL, - endpoint nvarchar(255) DEFAULT '' NULL, - domain nvarchar(255) DEFAULT '' NULL, - is_https nchar(1) DEFAULT ('N') NULL, - region nvarchar(255) DEFAULT '' NULL, - access_policy nchar(1) DEFAULT ('1') NOT NULL, - status nchar(1) DEFAULT ('1') NULL, - ext1 nvarchar(255) DEFAULT '' NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL, - remark nvarchar(500) NULL, - CONSTRAINT PK__sys_oss___BFBDE87009ED2882 PRIMARY KEY CLUSTERED (oss_config_id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'oss_config_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户编号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'tenant_id' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'配置key', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'config_key' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'accessKey', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'access_key' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'秘钥', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'secret_key' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'桶名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'bucket_name' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'前缀', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'prefix' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'访问站点', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'endpoint' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'自定义域名', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'domain' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'是否https（Y=是,N=否）', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'is_https' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'域', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'region' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'桶权限类型(0=private 1=public 2=custom)', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'access_policy' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'是否默认（0=是,1=否）', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'status' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'扩展字段', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'ext1' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'create_dept' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'创建者', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'create_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'create_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新者', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'update_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'update_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'备注', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config', - 'COLUMN', N'remark' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'对象存储配置表', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_oss_config' -GO - -INSERT INTO sys_oss_config VALUES (N'1', N'000000', N'minio', N'ruoyi', N'ruoyi123', N'ruoyi', N'', N'127.0.0.1:9000', N'',N'N', N'', N'1', N'0', N'', 103, 1, getdate(), 1, getdate(), NULL) -GO -INSERT INTO sys_oss_config VALUES (N'2', N'000000', N'qiniu', N'XXXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi', N'', N's3-cn-north-1.qiniucs.com', N'',N'N', N'', N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL) -GO -INSERT INTO sys_oss_config VALUES (N'3', N'000000', N'aliyun', N'XXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi', N'', N'oss-cn-beijing.aliyuncs.com', N'',N'N', N'', N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL) -GO -INSERT INTO sys_oss_config VALUES (N'4', N'000000', N'qcloud', N'XXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi-1250000000', N'', N'cos.ap-beijing.myqcloud.com', N'',N'N', N'ap-beijing', N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL) -GO -INSERT INTO sys_oss_config VALUES (N'5', N'000000', N'image', N'ruoyi', N'ruoyi123', N'ruoyi', N'image', N'127.0.0.1:9000', N'',N'N', N'', N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL) -GO - - -CREATE TABLE sys_client -( - id bigint NOT NULL, - client_id nvarchar(64) DEFAULT '' NULL, - client_key nvarchar(32) DEFAULT '' NULL, - client_secret nvarchar(255) DEFAULT '' NULL, - grant_type nvarchar(255) DEFAULT '' NULL, - device_type nvarchar(32) DEFAULT '' NULL, - active_timeout int DEFAULT ((1800)) NULL, - timeout int DEFAULT ((604800)) NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL - CONSTRAINT PK__sys_client___BFBDE87009ED2882 PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'客户端id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'client_id' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'客户端key', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'client_key' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'客户端秘钥', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'client_secret' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'授权类型', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'grant_type' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'设备类型', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'device_type' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'token活跃超时时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'active_timeout' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'token固定超时', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'timeout' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'状态（0正常 1停用）', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'status' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'create_dept' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'创建者', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'create_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'create_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新者', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'update_by' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client', - 'COLUMN', N'update_time' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'系统授权表', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_client' -GO - -INSERT INTO sys_client VALUES (N'1', N'e5cd7e4891bf95d1d19206ce24a7b32e', N'pc', N'pc123', N'password,social', N'pc', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate()) -GO -INSERT INTO sys_client VALUES (N'2', N'428a8310cd442757ae699df5d894f051', N'app', N'app123', N'password,sms,social', N'android', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate()) -GO - -CREATE TABLE test_demo -( - id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - dept_id bigint NULL, - user_id bigint NULL, - order_num int DEFAULT ((0)) NULL, - test_key nvarchar(255) NULL, - value nvarchar(255) NULL, - version int DEFAULT ((0)) NULL, - create_dept bigint NULL, - create_time datetime2(0) NULL, - create_by bigint NULL, - update_time datetime2(0) NULL, - update_by bigint NULL, - del_flag int DEFAULT ((0)) NULL, - CONSTRAINT PK__test_dem__3213E83F176051C8 PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'租户id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'tenant_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'部门id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'dept_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'用户id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'user_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'排序号', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'order_num' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'key键', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'test_key' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'值', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'value' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'version' -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'create_dept' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'create_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建人', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'create_by' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'update_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'更新人', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'update_by' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'删除标志', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo', - 'COLUMN', N'del_flag' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'测试单表', - 'SCHEMA', N'dbo', - 'TABLE', N'test_demo' -GO - -CREATE TABLE test_tree -( - id bigint NOT NULL, - tenant_id nvarchar(20) DEFAULT ('000000') NULL, - parent_id bigint DEFAULT ((0)) NULL, - dept_id bigint NULL, - user_id bigint NULL, - tree_name nvarchar(255) NULL, - version int DEFAULT ((0)) NULL, - create_dept bigint NULL, - create_time datetime2(0) NULL, - create_by bigint NULL, - update_time datetime2(0) NULL, - update_by bigint NULL, - del_flag int DEFAULT ((0)) NULL, - CONSTRAINT PK__test_tre__3213E83FC75A1B63 PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'主键', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'租户id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'tenant_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'父id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'parent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'部门id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'dept_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'用户id', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'user_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'值', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'tree_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'版本', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'version' -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'create_dept' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建时间', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'create_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'创建人', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'create_by' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'更新时间', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'update_time' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'更新人', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'update_by' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'删除标志', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree', - 'COLUMN', N'del_flag' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'测试树表', - 'SCHEMA', N'dbo', - 'TABLE', N'test_tree' -GO - -INSERT test_demo VALUES (1, N'000000', 102, 4, 1, N'测试数据权限', N'测试', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (2, N'000000', 102, 3, 2, N'子节点1', N'111', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (3, N'000000', 102, 3, 3, N'子节点2', N'222', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (4, N'000000', 108, 4, 4, N'测试数据', N'demo', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (5, N'000000', 108, 3, 13, N'子节点11', N'1111', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (6, N'000000', 108, 3, 12, N'子节点22', N'2222', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (7, N'000000', 108, 3, 11, N'子节点33', N'3333', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (8, N'000000', 108, 3, 10, N'子节点44', N'4444', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (9, N'000000', 108, 3, 9, N'子节点55', N'5555', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (10, N'000000', 108, 3, 8, N'子节点66', N'6666', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (11, N'000000', 108, 3, 7, N'子节点77', N'7777', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (12, N'000000', 108, 3, 6, N'子节点88', N'8888', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_demo VALUES (13, N'000000', 108, 3, 5, N'子节点99', N'9999', 0, 103, getdate(), 1, NULL, NULL, 0); -GO - -INSERT test_tree VALUES (1, N'000000', 0, 102, 4, N'测试数据权限', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (2, N'000000', 1, 102, 3, N'子节点1', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (3, N'000000', 2, 102, 3, N'子节点2', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (4, N'000000', 0, 108, 4, N'测试树1', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (5, N'000000', 4, 108, 3, N'子节点11', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (6, N'000000', 4, 108, 3, N'子节点22', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (7, N'000000', 4, 108, 3, N'子节点33', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (8, N'000000', 5, 108, 3, N'子节点44', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (9, N'000000', 6, 108, 3, N'子节点55', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (10, N'000000', 7, 108, 3, N'子节点66', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (11, N'000000', 7, 108, 3, N'子节点77', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (12, N'000000', 10, 108, 3, N'子节点88', 0, 103, getdate(), 1, NULL, NULL, 0); -GO -INSERT test_tree VALUES (13, N'000000', 10, 108, 3, N'子节点99', 0, 103, getdate(), 1, NULL, NULL, 0); -GO diff --git a/template/script/sql/sqlserver/sqlserver_ry_workflow.sql b/template/script/sql/sqlserver/sqlserver_ry_workflow.sql deleted file mode 100644 index 2397c35..0000000 --- a/template/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ /dev/null @@ -1,456 +0,0 @@ -insert into sys_menu values('11616', '工作流' , '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11617', '模型管理', '11616', '2', 'model', 'workflow/model/index', '', '1', '1', 'C', '0', '0', 'workflow:model:list', 'model', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, getdate(), NULL, NULL, ''); -insert into sys_menu values('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, getdate(), NULL, NULL, ''); - - --- 流程分类管理相关按钮 -insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1, getdate(), null, null, ''); -insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1, getdate(), null, null, ''); -insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, getdate(), null, null, ''); -insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove','#', 103, 1, getdate(), null, null, ''); -insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export','#', 103, 1, getdate(), null, null, ''); --- 请假单信息 -create table test_leave -( - id bigint not null - primary key, - leave_type nvarchar(255) not null, - start_date datetime2 not null, - end_date datetime2 not null, - leave_days int not null, - remark nvarchar(255), - status nvarchar(255), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2, - tenant_id nvarchar(20) -) -go - -exec sp_addextendedproperty 'MS_Description', N'请假申请表', 'SCHEMA', 'dbo', 'TABLE', 'test_leave' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'请假类型', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'leave_type' -go - -exec sp_addextendedproperty 'MS_Description', N'开始时间', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'start_date' -go - -exec sp_addextendedproperty 'MS_Description', N'结束时间', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'end_date' -go - -exec sp_addextendedproperty 'MS_Description', N'请假天数', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'leave_days' -go - -exec sp_addextendedproperty 'MS_Description', N'请假原因', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'remark' -go - -exec sp_addextendedproperty 'MS_Description', N'状态', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'status' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', - 'update_time' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'tenant_id' -go - --- 流程分类信息表 -create table wf_category -( - id bigint not null - primary key, - category_name nvarchar(255), - category_code nvarchar(255) - constraint uni_category_code - unique, - parent_id bigint, - sort_num int, - tenant_id nvarchar(20), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2 -) -go - -exec sp_addextendedproperty 'MS_Description', N'流程分类', 'SCHEMA', 'dbo', 'TABLE', 'wf_category' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'分类名称', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'category_name' -go - -exec sp_addextendedproperty 'MS_Description', N'分类编码', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'category_code' -go - -exec sp_addextendedproperty 'MS_Description', N'父级id', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', 'parent_id' -go - -exec sp_addextendedproperty 'MS_Description', N'排序', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', 'sort_num' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'tenant_id' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_category', 'COLUMN', - 'update_time' -go - -INSERT INTO wf_category values (1, 'OA', 'OA', 0, 0, '000000', 103, 1, getdate(), 1, getdate()); - -create table wf_task_back_node -( - id bigint not null primary key, - node_id nvarchar(255) not null, - node_name nvarchar(255) not null, - order_no int not null, - instance_id nvarchar(255) not null, - task_type nvarchar(255) not null, - assignee nvarchar(2000) not null, - tenant_id nvarchar(20), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2 -) - -go -exec sp_addextendedproperty 'MS_Description', N'节点审批记录', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'节点id', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'node_id' -go - -exec sp_addextendedproperty 'MS_Description', N'节点名称', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'node_name' -go - -exec sp_addextendedproperty 'MS_Description', N'排序', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'order_no' -go - -exec sp_addextendedproperty 'MS_Description', N'流程实例id', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'instance_id' -go - -exec sp_addextendedproperty 'MS_Description', N'节点类型', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'task_type' -go - -exec sp_addextendedproperty 'MS_Description', N'审批人', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'assignee' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'tenant_id' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_task_back_node', 'COLUMN', - 'update_time' -go - -create table wf_definition_config -( - id bigint not null primary key, - table_name nvarchar(255) not null, - definition_id nvarchar(255) not null - constraint uni_definition_id - unique, - process_key nvarchar(255) not null, - version bigint not null, - remark nvarchar(500) DEFAULT ('') null, - tenant_id nvarchar(20), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2 -) - -go -exec sp_addextendedproperty 'MS_Description', N'流程定义配置', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'表名', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'table_name' -go - -exec sp_addextendedproperty 'MS_Description', N'流程定义ID', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'definition_id' -go - -exec sp_addextendedproperty 'MS_Description', N'流程KEY', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'process_key' -go - -exec sp_addextendedproperty 'MS_Description', N'流程版本', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'version' -go - -exec sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'remark' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'tenant_id' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_definition_config', 'COLUMN', - 'update_time' -go - -create table wf_form_manage -( - id bigint not null primary key, - form_name nvarchar(255) not null, - form_type nvarchar(255) not null, - router nvarchar(255) not null, - remark nvarchar(500) null, - tenant_id nvarchar(20), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2 -) - -go -exec sp_addextendedproperty 'MS_Description', N'表单管理', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'表单名称', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'form_name' -go - -exec sp_addextendedproperty 'MS_Description', N'表单类型', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'form_type' -go - -exec sp_addextendedproperty 'MS_Description', N'路由地址/表单ID', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'router' -go - -exec sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'remark' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'tenant_id' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_form_manage', 'COLUMN', - 'update_time' -go - -insert into wf_form_manage(id, form_name, form_type, router, remark, tenant_id, create_dept, create_by, create_time, update_by, update_time) VALUES (1, '请假申请', 'static', '/workflow/leaveEdit/index', NULL, '000000', 103, 1, getdate(), 1, getdate()); - -create table wf_node_config -( - id bigint not null primary key, - form_id bigint, - form_type nvarchar(255) , - node_name nvarchar(255) not null, - node_id nvarchar(255) not null, - definition_id nvarchar(255) not null, - apply_user_task nchar default ('0') null, - tenant_id nvarchar(20), - create_dept bigint, - create_by bigint, - create_time datetime2, - update_by bigint, - update_time datetime2 -) - -go -exec sp_addextendedproperty 'MS_Description', N'节点配置', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config' -go - -exec sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', 'id' -go - -exec sp_addextendedproperty 'MS_Description', N'表单id', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'form_id' -go - -exec sp_addextendedproperty 'MS_Description', N'表单类型', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'form_type' -go - -exec sp_addextendedproperty 'MS_Description', N'节点名称', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'node_name' -go - -exec sp_addextendedproperty 'MS_Description', N'节点id', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'node_id' -go - -exec sp_addextendedproperty 'MS_Description', N'流程定义id', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'definition_id' -go - -exec sp_addextendedproperty 'MS_Description', N'是否为申请人节点 （0是 1否）', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'apply_user_task' -go - -exec sp_addextendedproperty 'MS_Description', N'租户编号', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'tenant_id' -go - -exec sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'create_dept' -go - -exec sp_addextendedproperty 'MS_Description', N'创建者', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', 'create_by' -go - -exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'create_time' -go - -exec sp_addextendedproperty 'MS_Description', N'更新者', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', 'update_by' -go - -exec sp_addextendedproperty 'MS_Description', N'更新时间', 'SCHEMA', 'dbo', 'TABLE', 'wf_node_config', 'COLUMN', - 'update_time' -go - -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11638, '请假申请', 5, 1, 'leave', 'workflow/leave/index', 1, 0, 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, getdate(), NULL, NULL, '请假申请菜单'); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11639, '请假申请查询', 11638, 1, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, getdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11640, '请假申请新增', 11638, 2, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, getdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11641, '请假申请修改', 11638, 3, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, getdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11642, '请假申请删除', 11638, 4, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, getdate(), NULL, NULL, ''); -INSERT INTO sys_menu(menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11643, '请假申请导出', 11638, 5, '#', '', 1, 0, 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, getdate(), NULL, NULL, ''); - -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (13, '000000', '业务状态', 'wf_business_status', 103, 1, getdate(), NULL, NULL, '业务状态列表'); -INSERT INTO sys_dict_type(dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (14, '000000', '表单类型', 'wf_form_type', 103, 1, getdate(), NULL, NULL, '表单类型列表'); - -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (39, '000000', 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, getdate(), NULL, NULL, '已撤销'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (40, '000000', 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, getdate(), NULL, NULL, '草稿'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (41, '000000', 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1,getdate(), NULL, NULL, '待审核'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (42, '000000', 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, getdate(), NULL, NULL, '已完成'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (43, '000000', 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, getdate(), NULL, NULL, '已作废'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (44, '000000', 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, getdate(), NULL, NULL, '已退回'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (45, '000000', 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1,getdate(), NULL, NULL, '已终止'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (46, '000000', 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, getdate(), NULL, NULL, '自定义表单'); -INSERT INTO sys_dict_data(dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (47, '000000', 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, getdate(), NULL, NULL, '动态表单'); - --- 表单管理 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11628, '表单管理', '11616', '5', 'formManage', 'workflow/formManage/index', 1, 0, 'C', '0', '0', 'workflow:formManage:list', 'tree-table', 103, 1, getdate(), null, null, '表单管理菜单'); - --- 表单管理按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11644, '表单管理查询', 11628, '1', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:query', '', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11645, '表单管理新增', 11628, '2', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:add', '', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11646, '表单管理修改', 11628, '3', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:edit', '', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11647, '表单管理删除', 11628, '4', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:remove', '', 103, 1, getdate(), null, null, ''); - -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(11648, '表单管理导出', 11628, '5', '#', '', 1, 0, 'F', '0', '0', 'workflow:formManage:export', 'tree-table', 103, 1, getdate(), null, null, ''); diff --git a/template/script/sql/update/oracle/update_5.0-5.1.sql b/template/script/sql/update/oracle/update_5.0-5.1.sql deleted file mode 100644 index 09cfae8..0000000 --- a/template/script/sql/update/oracle/update_5.0-5.1.sql +++ /dev/null @@ -1,151 +0,0 @@ -ALTER TABLE gen_table ADD (data_name VARCHAR2(200) DEFAULT ''); - -COMMENT ON COLUMN gen_table.data_name IS '数据源名称'; - -UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob控制台菜单' WHERE menu_id = 120; - --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -create table sys_social -( - id number(20) not null, - user_id number(20) not null, - tenant_id varchar2(20) default null, - auth_id varchar2(255) not null, - source varchar2(255) not null, - open_id varchar2(255) default null, - user_name varchar2(30) not null, - nick_name varchar2(30) default '', - email varchar2(255) default '', - avatar varchar2(500) default '', - access_token varchar2(255) not null, - expire_in number(20) default null, - refresh_token varchar2(255) default null, - access_code varchar2(255) default null, - union_id varchar2(255) default null, - scope varchar2(255) default null, - token_type varchar2(255) default null, - id_token varchar2(255) default null, - mac_algorithm varchar2(255) default null, - mac_key varchar2(255) default null, - code varchar2(255) default null, - oauth_token varchar2(255) default null, - oauth_token_secret varchar2(255) default null, - create_dept number(20), - create_by number(20), - create_time date, - update_by number(20), - update_time date, - del_flag char(1) default '0' -); - -alter table sys_social add constraint pk_sys_social primary key (id); - -comment on table sys_social is '社会化关系表'; -comment on column sys_social.id is '主键'; -comment on column sys_social.user_id is '用户ID'; -comment on column sys_social.tenant_id is '租户id'; -comment on column sys_social.auth_id is '平台+平台唯一id'; -comment on column sys_social.source is '用户来源'; -comment on column sys_social.open_id is '平台编号唯一id'; -comment on column sys_social.user_name is '登录账号'; -comment on column sys_social.nick_name is '用户昵称'; -comment on column sys_social.email is '用户邮箱'; -comment on column sys_social.avatar is '头像地址'; -comment on column sys_social.access_token is '用户的授权令牌'; -comment on column sys_social.expire_in is '用户的授权令牌的有效期，部分平台可能没有'; -comment on column sys_social.refresh_token is '刷新令牌，部分平台可能没有'; -comment on column sys_social.access_code is '平台的授权信息，部分平台可能没有'; -comment on column sys_social.union_id is '用户的 unionid'; -comment on column sys_social.scope is '授予的权限，部分平台可能没有'; -comment on column sys_social.token_type is '个别平台的授权信息，部分平台可能没有'; -comment on column sys_social.id_token is 'id token，部分平台可能没有'; -comment on column sys_social.mac_algorithm is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.mac_key is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.code is '用户的授权code，部分平台可能没有'; -comment on column sys_social.oauth_token is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.create_dept is '创建部门'; -comment on column sys_social.create_by is '创建者'; -comment on column sys_social.create_time is '创建时间'; -comment on column sys_social.update_by is '更新者'; -comment on column sys_social.update_time is '更新时间'; -comment on column sys_social.del_flag is '删除标志（0代表存在 2代表删除）'; - - --- ---------------------------- --- 系统授权表 --- ---------------------------- -create table sys_client ( - id number(20) not null, - client_id varchar2(64) default null, - client_key varchar2(32) default null, - client_secret varchar2(255) default null, - grant_type varchar2(255) default null, - device_type varchar2(32) default null, - active_timeout number(11) default 1800, - timeout number(11) default 604800, - status char(1) default '0', - del_flag char(1) default '0', - create_dept number(20) default null, - create_by number(20) default null, - create_time date, - update_by number(20) default null, - update_time date -); - -alter table sys_client add constraint pk_sys_client primary key (id); - -comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主键'; -comment on column sys_client.client_id is '客户端id'; -comment on column sys_client.client_key is '客户端key'; -comment on column sys_client.client_secret is '客户端秘钥'; -comment on column sys_client.grant_type is '授权类型'; -comment on column sys_client.device_type is '设备类型'; -comment on column sys_client.active_timeout is 'token活跃超时时间'; -comment on column sys_client.timeout is 'token固定超时'; -comment on column sys_client.status is '状态（0正常 1停用）'; -comment on column sys_client.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_client.create_dept is '创建部门'; -comment on column sys_client.create_by is '创建者'; -comment on column sys_client.create_time is '创建时间'; -comment on column sys_client.update_by is '更新者'; -comment on column sys_client.update_time is '更新时间'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate); - -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', '0', 103, 1, sysdate, null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', '0', 103, 1, sysdate, null, null, '客户端设备类型'); - -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', '0', 103, 1, sysdate, null, null, '小程序'); - --- 二级菜单 -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate, null, null, '客户端管理菜单'); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate, null, null, ''); - --- 角色菜单权限 -insert into sys_role_menu values ('2', '1061'); -insert into sys_role_menu values ('2', '1062'); -insert into sys_role_menu values ('2', '1063'); -insert into sys_role_menu values ('2', '1064'); -insert into sys_role_menu values ('2', '1065'); - - -update sys_dept set leader = null; -ALTER TABLE sys_dept MODIFY (leader NUMBER(20)) diff --git a/template/script/sql/update/oracle/update_5.1.0-5.1.1.sql b/template/script/sql/update/oracle/update_5.1.0-5.1.1.sql deleted file mode 100644 index 979a4bd..0000000 --- a/template/script/sql/update/oracle/update_5.1.0-5.1.1.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE sys_logininfor ADD (client_key varchar2(32) DEFAULT ''); -COMMENT ON COLUMN sys_logininfor.client_key IS '客户端'; - -ALTER TABLE sys_logininfor ADD (device_type varchar2(32) DEFAULT ''); -COMMENT ON COLUMN sys_logininfor.device_type IS '设备类型'; diff --git a/template/script/sql/update/oracle/update_5.1.1-5.1.2.sql b/template/script/sql/update/oracle/update_5.1.1-5.1.2.sql deleted file mode 100644 index d7c030c..0000000 --- a/template/script/sql/update/oracle/update_5.1.1-5.1.2.sql +++ /dev/null @@ -1,6 +0,0 @@ -delete from sys_menu where menu_id in (1604, 1605); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate, null, null, ''); - diff --git a/template/script/sql/update/oracle/update_5.1.2-5.2.0.sql b/template/script/sql/update/oracle/update_5.1.2-5.2.0.sql deleted file mode 100644 index 1aa585a..0000000 --- a/template/script/sql/update/oracle/update_5.1.2-5.2.0.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE sys_dept ADD (dept_category varchar2(100) DEFAULT NULL) COMMENT '部门类别编码'; -COMMENT ON COLUMN sys_dept.dept_category IS '部门类别编码'; -ALTER TABLE sys_post ADD (dept_id number(20) NOT NULL) COMMENT '部门id'; -COMMENT ON COLUMN sys_post.dept_id IS '部门id'; -ALTER TABLE sys_post ADD (post_category VARCHAR2(100) DEFAULT NULL) COMMENT '岗位类别编码'; -COMMENT ON COLUMN sys_post.post_category IS '岗位类别编码'; -UPDATE sys_post SET dept_id = 100; -UPDATE sys_post SET dept_id = 103 where post_id = 1; -UPDATE sys_menu SET menu_name = 'SnailJob控制台', path = 'snailjob', component = 'monitor/snailjob/index', perms = 'monitor:snailjob:list', remark = 'SnailJob控制台菜单' WHERE menu_id = 120; diff --git a/template/script/sql/update/postgres/update_5.0-5.1.sql b/template/script/sql/update/postgres/update_5.0-5.1.sql deleted file mode 100644 index f5f0a5c..0000000 --- a/template/script/sql/update/postgres/update_5.0-5.1.sql +++ /dev/null @@ -1,150 +0,0 @@ -ALTER TABLE gen_table ADD data_name varchar(200) default ''::varchar; - -COMMENT ON COLUMN gen_table.data_name IS '数据源名称'; - -UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob控制台菜单' WHERE menu_id = 120; - --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -create table sys_social -( - id int8 not null, - user_id int8 not null, - tenant_id varchar(20) default null::varchar, - auth_id varchar(255) not null, - source varchar(255) not null, - open_id varchar(255) default null::varchar, - user_name varchar(30) not null, - nick_name varchar(30) default ''::varchar, - email varchar(255) default ''::varchar, - avatar varchar(500) default ''::varchar, - access_token varchar(255) not null, - expire_in int8 default null, - refresh_token varchar(255) default null::varchar, - access_code varchar(255) default null::varchar, - union_id varchar(255) default null::varchar, - scope varchar(255) default null::varchar, - token_type varchar(255) default null::varchar, - id_token varchar(255) default null::varchar, - mac_algorithm varchar(255) default null::varchar, - mac_key varchar(255) default null::varchar, - code varchar(255) default null::varchar, - oauth_token varchar(255) default null::varchar, - oauth_token_secret varchar(255) default null::varchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - del_flag char default '0'::bpchar, - constraint "pk_sys_social" primary key (id) -); - -comment on table sys_social is '社会化关系表'; -comment on column sys_social.id is '主键'; -comment on column sys_social.user_id is '用户ID'; -comment on column sys_social.tenant_id is '租户id'; -comment on column sys_social.auth_id is '平台+平台唯一id'; -comment on column sys_social.source is '用户来源'; -comment on column sys_social.open_id is '平台编号唯一id'; -comment on column sys_social.user_name is '登录账号'; -comment on column sys_social.nick_name is '用户昵称'; -comment on column sys_social.email is '用户邮箱'; -comment on column sys_social.avatar is '头像地址'; -comment on column sys_social.access_token is '用户的授权令牌'; -comment on column sys_social.expire_in is '用户的授权令牌的有效期，部分平台可能没有'; -comment on column sys_social.refresh_token is '刷新令牌，部分平台可能没有'; -comment on column sys_social.access_code is '平台的授权信息，部分平台可能没有'; -comment on column sys_social.union_id is '用户的 unionid'; -comment on column sys_social.scope is '授予的权限，部分平台可能没有'; -comment on column sys_social.token_type is '个别平台的授权信息，部分平台可能没有'; -comment on column sys_social.id_token is 'id token，部分平台可能没有'; -comment on column sys_social.mac_algorithm is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.mac_key is '小米平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.code is '用户的授权code，部分平台可能没有'; -comment on column sys_social.oauth_token is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有'; -comment on column sys_social.create_dept is '创建部门'; -comment on column sys_social.create_by is '创建者'; -comment on column sys_social.create_time is '创建时间'; -comment on column sys_social.update_by is '更新者'; -comment on column sys_social.update_time is '更新时间'; -comment on column sys_social.del_flag is '删除标志（0代表存在 2代表删除）'; - - --- ---------------------------- --- 系统授权表 --- ---------------------------- -drop table if exists sys_client; -create table sys_client ( - id int8, - client_id varchar(64) default ''::varchar, - client_key varchar(32) default ''::varchar, - client_secret varchar(255) default ''::varchar, - grant_type varchar(255) default ''::varchar, - device_type varchar(32) default ''::varchar, - active_timeout int4 default 1800, - timeout int4 default 604800, - status char(1) default '0'::bpchar, - del_flag char(1) default '0'::bpchar, - create_dept int8, - create_by int8, - create_time timestamp, - update_by int8, - update_time timestamp, - constraint sys_client_pk primary key (id) -); - -comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主键'; -comment on column sys_client.client_id is '客户端id'; -comment on column sys_client.client_key is '客户端key'; -comment on column sys_client.client_secret is '客户端秘钥'; -comment on column sys_client.grant_type is '授权类型'; -comment on column sys_client.device_type is '设备类型'; -comment on column sys_client.active_timeout is 'token活跃超时时间'; -comment on column sys_client.timeout is 'token固定超时'; -comment on column sys_client.status is '状态（0正常 1停用）'; -comment on column sys_client.del_flag is '删除标志（0代表存在 2代表删除）'; -comment on column sys_client.create_dept is '创建部门'; -comment on column sys_client.create_by is '创建者'; -comment on column sys_client.create_time is '创建时间'; -comment on column sys_client.update_by is '更新者'; -comment on column sys_client.update_time is '更新时间'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, now(), 1, now()); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, now(), 1, now()); - -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', '0', 103, 1, now(), null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', '0', 103, 1, now(), null, null, '客户端设备类型'); - -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', '0', 103, 1, now(), null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', '0', 103, 1, now(), null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', '0', 103, 1, now(), null, null, '小程序'); - --- 二级菜单 -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', '1', '0', 'C', '0', '0', 'system:client:list', 'international', 103, 1, now(), null, null, '客户端管理菜单'); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:query', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:remove', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:client:export', '#', 103, 1, now(), null, null, ''); - --- 角色菜单权限 -insert into sys_role_menu values ('2', '1061'); -insert into sys_role_menu values ('2', '1062'); -insert into sys_role_menu values ('2', '1063'); -insert into sys_role_menu values ('2', '1064'); -insert into sys_role_menu values ('2', '1065'); - - -update sys_dept set leader = null; -ALTER TABLE sys_dept ALTER COLUMN leader TYPE int8; diff --git a/template/script/sql/update/postgres/update_5.1.0-5.1.1.sql b/template/script/sql/update/postgres/update_5.1.0-5.1.1.sql deleted file mode 100644 index 29f5507..0000000 --- a/template/script/sql/update/postgres/update_5.1.0-5.1.1.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE sys_logininfor ADD client_key varchar(32) default ''::varchar; -COMMENT ON COLUMN sys_logininfor.client_key IS '客户端'; - -ALTER TABLE sys_logininfor ADD device_type varchar(32) default ''::varchar; -COMMENT ON COLUMN sys_logininfor.device_type IS '设备类型'; diff --git a/template/script/sql/update/postgres/update_5.1.1-5.1.2.sql b/template/script/sql/update/postgres/update_5.1.1-5.1.2.sql deleted file mode 100644 index 62eb836..0000000 --- a/template/script/sql/update/postgres/update_5.1.1-5.1.2.sql +++ /dev/null @@ -1,5 +0,0 @@ -delete from sys_menu where menu_id in (1604, 1605); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, now(), null, null, ''); diff --git a/template/script/sql/update/postgres/update_5.1.2-5.2.0.sql b/template/script/sql/update/postgres/update_5.1.2-5.2.0.sql deleted file mode 100644 index 5089a09..0000000 --- a/template/script/sql/update/postgres/update_5.1.2-5.2.0.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE sys_dept ADD COLUMN dept_category varchar(100) default null::varchar; -COMMENT ON COLUMN sys_dept.dept_category IS '客户端'; -ALTER TABLE sys_post ADD COLUMN dept_id int8 NOT NULL; -COMMENT ON COLUMN sys_post.dept_id IS '部门id'; -ALTER TABLE sys_post ADD COLUMN post_category varchar(100) default null::varchar; -COMMENT ON COLUMN sys_post.post_category IS '岗位类别编码'; -UPDATE sys_post SET dept_id = 100; -UPDATE sys_post SET dept_id = 103 where post_id = 1; -UPDATE sys_menu SET menu_name = 'SnailJob控制台', path = 'snailjob', component = 'monitor/snailjob/index', perms = 'monitor:snailjob:list', remark = 'SnailJob控制台菜单' WHERE menu_id = 120; diff --git a/template/script/sql/update/sqlserver/update_5.0-5.1.sql b/template/script/sql/update/sqlserver/update_5.0-5.1.sql deleted file mode 100644 index bde3813..0000000 --- a/template/script/sql/update/sqlserver/update_5.0-5.1.sql +++ /dev/null @@ -1,409 +0,0 @@ -ALTER TABLE gen_table ADD data_name nvarchar(200) DEFAULT '' NULL -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'数据源名称', - 'SCHEMA', N'dbo', - 'TABLE', N'gen_table', - 'COLUMN', N'data_name' -GO - -UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob控制台菜单' WHERE menu_id = 120 -GO - -create table sys_social -( - id bigint NOT NULL, - user_id bigint NOT NULL, - tenant_id nvarchar(20) NULL, - auth_id nvarchar(255) NOT NULL, - source nvarchar(255) NOT NULL, - open_id nvarchar(255) NULL, - user_name nvarchar(30) NOT NULL, - nick_name nvarchar(30) DEFAULT ('') NULL, - email nvarchar(255) DEFAULT ('') NULL, - avatar nvarchar(500) DEFAULT ('') NULL, - access_token nvarchar(255) NOT NULL, - expire_in bigint NULL, - refresh_token nvarchar(255) NULL, - access_code nvarchar(255) NULL, - union_id nvarchar(255) NULL, - scope nvarchar(255) NULL, - token_type nvarchar(255) NULL, - id_token nvarchar(255) NULL, - mac_algorithm nvarchar(255) NULL, - mac_key nvarchar(255) NULL, - code nvarchar(255) NULL, - oauth_token nvarchar(255) NULL, - oauth_token_secret nvarchar(255) NULL, - create_dept bigint, - create_by bigint, - create_time datetime2(7), - update_by bigint, - update_time datetime2(7), - del_flag nchar DEFAULT ('0') NULL, - CONSTRAINT PK__sys_social__B21E8F2427725F8A PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty - 'MS_Description', N'id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户ID' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'user_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'租户id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'tenant_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台+平台唯一id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'auth_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户来源' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'source' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台编号唯一id' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'open_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'登录账号' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'user_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户昵称' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'nick_name' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户邮箱' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'email' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'头像地址' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'avatar' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权令牌' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'access_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权令牌的有效期，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'expire_in' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'刷新令牌，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'refresh_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'平台的授权信息，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'access_code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的 unionid' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'union_id' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'授予的权限，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'scope' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'个别平台的授权信息，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'token_type' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'id token，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'id_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'mac_algorithm' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'mac_key' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'用户的授权code，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'code' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'oauth_token' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'oauth_token_secret' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'删除标志（0代表存在 2代表删除）' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建部门' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_dept' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'创建时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'create_time' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新者' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'update_by' -GO -EXEC sys.sp_addextendedproperty - 'MS_Description', N'更新时间' , - 'SCHEMA', N'dbo', - 'TABLE', N'sys_social', - 'COLUMN', N'update_time' -GO - - -CREATE TABLE sys_client -( - id bigint NOT NULL, - client_id nvarchar(64) DEFAULT '' NULL, - client_key nvarchar(32) DEFAULT '' NULL, - client_secret nvarchar(255) DEFAULT '' NULL, - grant_type nvarchar(255) DEFAULT '' NULL, - device_type nvarchar(32) DEFAULT '' NULL, - active_timeout int DEFAULT ((1800)) NULL, - timeout int DEFAULT ((604800)) NULL, - status nchar(1) DEFAULT ('0') NULL, - del_flag nchar(1) DEFAULT ('0') NULL, - create_dept bigint NULL, - create_by bigint NULL, - create_time datetime2(7) NULL, - update_by bigint NULL, - update_time datetime2(7) NULL - CONSTRAINT PK__sys_client___BFBDE87009ED2882 PRIMARY KEY CLUSTERED (id) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] -) -ON [PRIMARY] -GO - -EXEC sp_addextendedproperty -'MS_Description', N'主键', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'id' -GO -EXEC sys.sp_addextendedproperty -'MS_Description', N'客户端id' , -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'client_id' -GO -EXEC sp_addextendedproperty -'MS_Description', N'客户端key', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'client_key' -GO -EXEC sp_addextendedproperty -'MS_Description', N'客户端秘钥', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'client_secret' -GO -EXEC sp_addextendedproperty -'MS_Description', N'授权类型', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'grant_type' -GO -EXEC sp_addextendedproperty -'MS_Description', N'设备类型', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'device_type' -GO -EXEC sp_addextendedproperty -'MS_Description', N'token活跃超时时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'active_timeout' -GO -EXEC sp_addextendedproperty -'MS_Description', N'token固定超时', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'timeout' -GO -EXEC sp_addextendedproperty -'MS_Description', N'状态（0正常 1停用）', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'status' -GO -EXEC sp_addextendedproperty -'MS_Description', N'删除标志（0代表存在 2代表删除）', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'del_flag' -GO -EXEC sys.sp_addextendedproperty -'MS_Description', N'创建部门' , -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'create_dept' -GO -EXEC sp_addextendedproperty -'MS_Description', N'创建者', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'create_by' -GO -EXEC sp_addextendedproperty -'MS_Description', N'创建时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'create_time' -GO -EXEC sp_addextendedproperty -'MS_Description', N'更新者', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'update_by' -GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'sys_client', -'COLUMN', N'update_time' -GO -EXEC sp_addextendedproperty -'MS_Description', N'系统授权表', -'SCHEMA', N'dbo', -'TABLE', N'sys_client' -GO - -INSERT INTO sys_client VALUES (N'1', N'e5cd7e4891bf95d1d19206ce24a7b32e', N'pc', N'pc123', N'password,social', N'pc', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate()) -GO -INSERT INTO sys_client VALUES (N'2', N'428a8310cd442757ae699df5d894f051', N'app', N'app123', N'password,sms,social', N'android', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate()) -GO - -INSERT sys_dict_type VALUES (11, N'000000', N'授权类型', N'sys_grant_type', N'0', 103, 1, getdate(), NULL, NULL, N'认证授权类型') -GO -INSERT sys_dict_type VALUES (12, N'000000', N'设备类型', N'sys_device_type', N'0', 103, 1, getdate(), NULL, NULL, N'客户端设备类型') -GO - -INSERT sys_dict_data VALUES (30, N'000000', 0, N'密码认证', N'password', N'sys_grant_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'密码认证'); -GO -INSERT sys_dict_data VALUES (31, N'000000', 0, N'短信认证', N'sms', N'sys_grant_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'短信认证') -GO -INSERT sys_dict_data VALUES (32, N'000000', 0, N'邮件认证', N'email', N'sys_grant_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'邮件认证') -GO -INSERT sys_dict_data VALUES (33, N'000000', 0, N'小程序认证', N'xcx', N'sys_grant_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'小程序认证') -GO -INSERT sys_dict_data VALUES (34, N'000000', 0, N'三方登录认证', N'`social`', N'sys_grant_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'三方登录认证') -GO -INSERT sys_dict_data VALUES (35, N'000000', 0, N'PC', N'`pc`', N'sys_device_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'PC') -GO -INSERT sys_dict_data VALUES (36, N'000000', 0, N'安卓', N'`android`', N'sys_device_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'安卓') -GO -INSERT sys_dict_data VALUES (37, N'000000', 0, N'iOS', N'`ios`', N'sys_device_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'iOS') -GO -INSERT sys_dict_data VALUES (38, N'000000', 0, N'小程序', N'`xcx`', N'sys_device_type', N'', N'default', N'N', N'0', 103, 1, getdate(), NULL, NULL, N'小程序') -GO - --- 二级菜单 -INSERT sys_menu VALUES (123, N'客户端管理', 1, 11, N'client', N'system/client/index', N'', 1, 0, N'C', N'0', N'0', N'system:client:list', N'international', 103, 1, getdate(), NULL, NULL, N'客户端管理菜单') -GO --- 客户端管理按钮 -INSERT sys_menu VALUES (1061, N'客户端管理查询', 123, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:query', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1062, N'客户端管理新增', 123, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1063, N'客户端管理修改', 123, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1064, N'客户端管理删除', 123, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1065, N'客户端管理导出', 123, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:export', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO - - --- 角色菜单权限 -INSERT sys_role_menu VALUES (2, 1061) -GO -INSERT sys_role_menu VALUES (2, 1062) -GO -INSERT sys_role_menu VALUES (2, 1063) -GO -INSERT sys_role_menu VALUES (2, 1064) -GO -INSERT sys_role_menu VALUES (2, 1065) -GO - - -UPDATE sys_dept SET leader = null -GO -ALTER TABLE sys_dept ALTER COLUMN leader bigint NULL -GO diff --git a/template/script/sql/update/sqlserver/update_5.1.0-5.1.1.sql b/template/script/sql/update/sqlserver/update_5.1.0-5.1.1.sql deleted file mode 100644 index 2238536..0000000 --- a/template/script/sql/update/sqlserver/update_5.1.0-5.1.1.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE sys_logininfor ADD client_key nvarchar(32) DEFAULT '' NULL -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'客户端', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'client_key' -GO - -ALTER TABLE sys_logininfor ADD device_type nvarchar(32) DEFAULT '' NULL -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'设备类型', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_logininfor', - 'COLUMN', N'device_type' -GO diff --git a/template/script/sql/update/sqlserver/update_5.1.1-5.1.2.sql b/template/script/sql/update/sqlserver/update_5.1.1-5.1.2.sql deleted file mode 100644 index 9133772..0000000 --- a/template/script/sql/update/sqlserver/update_5.1.1-5.1.2.sql +++ /dev/null @@ -1,10 +0,0 @@ -DELETE FROM sys_menu WHERE menu_id IN (1604, 1605); -GO -INSERT sys_menu VALUES (1620, N'配置列表', 118, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:list', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1621, N'配置添加', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:add', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1622, N'配置编辑', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:edit', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO -INSERT sys_menu VALUES (1623, N'配置删除', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:remove', N'#', 103, 1, getdate(), NULL, NULL, N''); -GO diff --git a/template/script/sql/update/sqlserver/update_5.1.2-5.2.0.sql b/template/script/sql/update/sqlserver/update_5.1.2-5.2.0.sql deleted file mode 100644 index 18daca4..0000000 --- a/template/script/sql/update/sqlserver/update_5.1.2-5.2.0.sql +++ /dev/null @@ -1,29 +0,0 @@ -ALTER TABLE sys_dept ADD dept_category nvarchar(100) DEFAULT NULL -EXEC sp_addextendedproperty - 'MS_Description', N'部门类别编码', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_dept', - 'COLUMN', N'dept_category' -GO -ALTER TABLE sys_post ADD dept_id bigint NOT NULL -GO -ALTER TABLE sys_post ADD post_category nvarchar(100) DEFAULT NULL -GO -EXEC sp_addextendedproperty - 'MS_Description', N'部门id', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'dept_id' -GO -EXEC sp_addextendedproperty - 'MS_Description', N'岗位类别编码', - 'SCHEMA', N'dbo', - 'TABLE', N'sys_post', - 'COLUMN', N'post_category' -GO -UPDATE sys_post SET dept_id = 100 -GO -UPDATE sys_post SET dept_id = 103 where post_id = 1 -GO -UPDATE sys_menu SET menu_name = N'SnailJob控制台', path = N'snailjob', component = N'monitor/snailjob/index', perms = N'monitor:snailjob:list', remark = N'SnailJob控制台菜单' WHERE menu_id = 120 -GO diff --git a/template/script/sql/update/update_5.0-5.1.sql b/template/script/sql/update/update_5.0-5.1.sql deleted file mode 100644 index 871bda3..0000000 --- a/template/script/sql/update/update_5.0-5.1.sql +++ /dev/null @@ -1,101 +0,0 @@ -ALTER TABLE gen_table ADD COLUMN data_name varchar(200) NULL DEFAULT '' COMMENT '数据源名称' AFTER table_id; - -UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob控制台菜单' WHERE menu_id = 120; - --- ---------------------------- --- 第三方平台授权表 --- ---------------------------- -drop table if exists sys_social; -create table sys_social -( - id bigint not null comment '主键', - user_id bigint not null comment '用户ID', - tenant_id varchar(20) default null comment '租户id', - auth_id varchar(255) not null comment '平台+平台唯一id', - source varchar(255) not null comment '用户来源', - open_id varchar(255) default null comment '平台编号唯一id', - user_name varchar(30) not null comment '登录账号', - nick_name varchar(30) default '' comment '用户昵称', - email varchar(255) default '' comment '用户邮箱', - avatar varchar(500) default '' comment '头像地址', - access_token varchar(255) not null comment '用户的授权令牌', - expire_in int default null comment '用户的授权令牌的有效期，部分平台可能没有', - refresh_token varchar(255) default null comment '刷新令牌，部分平台可能没有', - access_code varchar(255) default null comment '平台的授权信息，部分平台可能没有', - union_id varchar(255) default null comment '用户的 unionid', - scope varchar(255) default null comment '授予的权限，部分平台可能没有', - token_type varchar(255) default null comment '个别平台的授权信息，部分平台可能没有', - id_token varchar(255) default null comment 'id token，部分平台可能没有', - mac_algorithm varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - mac_key varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - code varchar(255) default null comment '用户的授权code，部分平台可能没有', - oauth_token varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - oauth_token_secret varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - PRIMARY KEY (id) -) engine=innodb comment = '社会化关系表'; - - --- ---------------------------- --- 系统授权表 --- ---------------------------- -drop table if exists sys_client; -create table sys_client ( - id bigint(20) not null comment 'id', - client_id varchar(64) default null comment '客户端id', - client_key varchar(32) default null comment '客户端key', - client_secret varchar(255) default null comment '客户端秘钥', - grant_type varchar(255) default null comment '授权类型', - device_type varchar(32) default null comment '设备类型', - active_timeout int(11) default 1800 comment 'token活跃超时时间', - timeout int(11) default 604800 comment 'token固定超时', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - primary key (id) -) engine=innodb comment='系统授权表'; - -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); - -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); - -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); - --- 二级菜单 -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate(), null, null, '客户端管理菜单'); --- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate(), null, null, ''); - --- 角色菜单权限 -insert into sys_role_menu values ('2', '1061'); -insert into sys_role_menu values ('2', '1062'); -insert into sys_role_menu values ('2', '1063'); -insert into sys_role_menu values ('2', '1064'); -insert into sys_role_menu values ('2', '1065'); - - -update sys_dept set leader = null; -alter table sys_dept modify column leader bigint null default null comment '负责人' after order_num; diff --git a/template/script/sql/update/update_5.1.0-5.1.1.sql b/template/script/sql/update/update_5.1.0-5.1.1.sql deleted file mode 100644 index 1dea49b..0000000 --- a/template/script/sql/update/update_5.1.0-5.1.1.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sys_logininfor - ADD COLUMN client_key VARCHAR(32) NULL DEFAULT NULL COMMENT '客户端' AFTER `user_name`, - ADD COLUMN device_type VARCHAR(32) NULL DEFAULT NULL COMMENT '设备类型' AFTER `client_key`; diff --git a/template/script/sql/update/update_5.1.1-5.1.2.sql b/template/script/sql/update/update_5.1.1-5.1.2.sql deleted file mode 100644 index 314743f..0000000 --- a/template/script/sql/update/update_5.1.1-5.1.2.sql +++ /dev/null @@ -1,5 +0,0 @@ -delete from sys_menu where menu_id in (1604, 1605); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate(), null, null, ''); diff --git a/template/script/sql/update/update_5.1.2-5.2.0.sql b/template/script/sql/update/update_5.1.2-5.2.0.sql deleted file mode 100644 index 33384e7..0000000 --- a/template/script/sql/update/update_5.1.2-5.2.0.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE sys_dept ADD dept_category VARCHAR(100) DEFAULT NULL COMMENT '部门类别编码'; -ALTER TABLE sys_post ADD dept_id BIGINT(20) NOT NULL COMMENT '部门id', ADD post_category VARCHAR(100) DEFAULT NULL COMMENT '岗位类别编码'; -UPDATE sys_post SET dept_id = 100; -UPDATE sys_post SET dept_id = 103 where post_id = 1; -UPDATE sys_menu SET menu_name = 'SnailJob控制台', path = 'snailjob', component = 'monitor/snailjob/index', perms = 'monitor:snailjob:list', remark = 'SnailJob控制台菜单' WHERE menu_id = 120;