diff --git a/.flattened-pom.xml b/.flattened-pom.xml deleted file mode 100644 index 41bf0e495..000000000 --- a/.flattened-pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - org.springblade - jonhon-mes-svr - 4.6.0.RELEASE - pom - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/.gitignore b/.gitignore index e1f2e5721..da7141bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,11 @@ replay_pid* data .idea +**/target +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml +*editorconfig +*.iml -.flattened-pom.xml \ No newline at end of file +.gradle diff --git a/.gradle/6.1/executionHistory/executionHistory.lock b/.gradle/6.1/executionHistory/executionHistory.lock deleted file mode 100644 index 064b058c6..000000000 Binary files a/.gradle/6.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/6.1/fileChanges/last-build.bin b/.gradle/6.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd238a..000000000 Binary files a/.gradle/6.1/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/6.1/fileHashes/fileHashes.lock b/.gradle/6.1/fileHashes/fileHashes.lock deleted file mode 100644 index 89a1938dc..000000000 Binary files a/.gradle/6.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/6.1/gc.properties b/.gradle/6.1/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index d569562f5..000000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 0fca99558..000000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Fri Nov 07 14:55:42 CST 2025 -gradle.version=6.1 diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock deleted file mode 100644 index d407bd849..000000000 Binary files a/.gradle/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/blade-auth/.flattened-pom.xml b/blade-auth/.flattened-pom.xml deleted file mode 100644 index 8168430be..000000000 --- a/blade-auth/.flattened-pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - 4.0.0 - org.springblade - blade-auth - 4.6.0.RELEASE - blade-auth - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - blade-scope-api - org.springblade - - - - - org.springblade - blade-core-db - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-cloud - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-redis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-log - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-social - 4.6.0.RELEASE - compile - - - org.springblade - blade-user-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-system-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-resource-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-oauth2 - 4.6.0.RELEASE - compile - - - com.github.whvcse - easy-captcha - 1.6.2 - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-auth/.gitignore b/blade-auth/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-auth/.gitignore +++ b/blade-auth/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-auth/blade-auth.iml b/blade-auth/blade-auth.iml deleted file mode 100644 index 9039617ec..000000000 --- a/blade-auth/blade-auth.iml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-auth/target/antrun/build-main.xml b/blade-auth/target/antrun/build-main.xml deleted file mode 100644 index 570e34ae4..000000000 --- a/blade-auth/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-auth/target/blade-auth.jar.original b/blade-auth/target/blade-auth.jar.original deleted file mode 100644 index 27e09b78a..000000000 Binary files a/blade-auth/target/blade-auth.jar.original and /dev/null differ diff --git a/blade-auth/target/classes/application-dev.yml b/blade-auth/target/classes/application-dev.yml deleted file mode 100644 index 25bafbc10..000000000 --- a/blade-auth/target/classes/application-dev.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/target/classes/application-prod.yml b/blade-auth/target/classes/application-prod.yml deleted file mode 100644 index dc6f80c48..000000000 --- a/blade-auth/target/classes/application-prod.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/target/classes/application-test.yml b/blade-auth/target/classes/application-test.yml deleted file mode 100644 index c7c6c401d..000000000 --- a/blade-auth/target/classes/application-test.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/target/classes/application.yml b/blade-auth/target/classes/application.yml deleted file mode 100644 index 9e7573c63..000000000 --- a/blade-auth/target/classes/application.yml +++ /dev/null @@ -1,65 +0,0 @@ -# 在使用Spring默认数据源Hikari的情况下配置以下配置项 -spring: - datasource: - hikari: - # 自动提交从池中返回的连接 - auto-commit: true - # 连接池中维护的最小空闲连接数 - minimum-idle: 10 - # 连接池中允许的最大连接数。缺省值：10；推荐的公式：((core_count * 2) + effective_spindle_count) - maximum-pool-size: 60 - # 空闲连接超时时间，默认值600000（10分钟），大于等于max-lifetime且max-lifetime>0，会被重置为0；不等于0且小于10秒，会被重置为10秒。 - # 只有空闲连接数大于最大连接数且空闲时间超过该值，才会被释放 - idle-timeout: 30000 - # 连接最大存活时间.不等于0且小于30秒，会被重置为默认值30分钟.设置应该比mysql设置的超时时间短 - max-lifetime: 1800000 - # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 缺省:30秒 - connection-timeout: 30000 - # 连接测试查询 - connection-test-query: select 1 - #connection-test-query: select 1 from dual - freemarker: - # 模板后缀名 - suffix: .ftl - # 文档类型 - content-type: text/html - # 页面编码 - charset: UTF-8 - # 页面缓存 - cache: false - # 模板路径 - template-loader-path: classpath:/templates/ - web: - # 资源路径 - resources: - static-locations: classpath:/static/ - -#swagger文档 -swagger: - base-packages: - - org.springblade - - org.springframework.security.oauth2.provider.endpoint - -#第三方登陆 -social: - oauth: - GITHUB: - client-id: 233************ - client-secret: 233************************************ - redirect-uri: ${social.domain}/oauth/redirect/github - GITEE: - client-id: 233************ - client-secret: 233************************************ - redirect-uri: ${social.domain}/oauth/redirect/gitee - WECHAT_OPEN: - client-id: 233************ - client-secret: 233************************************ - redirect-uri: ${social.domain}/oauth/redirect/wechat - QQ: - client-id: 233************ - client-secret: 233************************************ - redirect-uri: ${social.domain}/oauth/redirect/qq - DINGTALK: - client-id: 233************ - client-secret: 233************************************ - redirect-uri: ${social.domain}/oauth/redirect/dingtalk diff --git a/blade-auth/target/maven-archiver/pom.properties b/blade-auth/target/maven-archiver/pom.properties deleted file mode 100644 index 092223228..000000000 --- a/blade-auth/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Nov 10 11:10:15 CST 2025 -groupId=org.springblade -artifactId=blade-auth -version=4.6.0.RELEASE diff --git a/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 41c8f2aef..000000000 --- a/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,15 +0,0 @@ -org\springblade\auth\granter\SmsTokenGranter.class -org\springblade\auth\service\BladeUserDetailService.class -org\springblade\auth\endpoint\Oauth2SmsEndpoint.class -org\springblade\auth\AuthApplication.class -org\springblade\auth\granter\CaptchaTokenGranter.class -org\springblade\auth\constant\BladeAuthConstant.class -org\springblade\auth\granter\RegisterTokenGranter.class -org\springblade\auth\handler\BladeLockHandler.class -org\springblade\auth\handler\BladeAuthorizationHandler.class -org\springblade\auth\handler\BladeTokenHandler.class -org\springblade\auth\config\BladeAuthConfiguration.class -org\springblade\auth\granter\SocialTokenGranter.class -org\springblade\auth\service\BladeClientDetailService.class -org\springblade\auth\utils\TokenUtil.class -org\springblade\auth\handler\BladePasswordHandler.class diff --git a/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 4c3246ed5..000000000 --- a/blade-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,15 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\granter\RegisterTokenGranter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\utils\TokenUtil.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\granter\SmsTokenGranter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\granter\SocialTokenGranter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\handler\BladeLockHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\handler\BladeTokenHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\service\BladeUserDetailService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\constant\BladeAuthConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\AuthApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\config\BladeAuthConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\service\BladeClientDetailService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\granter\CaptchaTokenGranter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\handler\BladeAuthorizationHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\endpoint\Oauth2SmsEndpoint.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\main\java\org\springblade\auth\handler\BladePasswordHandler.java diff --git a/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 7cb5a1bae..000000000 --- a/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1,3 +0,0 @@ -org\springblade\test\CryptoKeyGenerator.class -org\springblade\test\SignKeyGenerator.class -org\springblade\test\Sm2KeyGenerator.class diff --git a/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index ed5bca800..000000000 --- a/blade-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1,3 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\test\java\org\springblade\test\CryptoKeyGenerator.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\test\java\org\springblade\test\Sm2KeyGenerator.java -D:\ideaworkspeate\jonhon-mes-svr\blade-auth\src\test\java\org\springblade\test\SignKeyGenerator.java diff --git a/blade-common/.flattened-pom.xml b/blade-common/.flattened-pom.xml deleted file mode 100644 index 6f1933073..000000000 --- a/blade-common/.flattened-pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - org.springblade - blade-common - 4.6.0.RELEASE - blade-common - - - org.springblade - blade-core-launch - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-loadbalancer - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-common/.gitignore b/blade-common/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-common/.gitignore +++ b/blade-common/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-common/blade-common.iml b/blade-common/blade-common.iml deleted file mode 100644 index c3a0db655..000000000 --- a/blade-common/blade-common.iml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 4a9338b74..987e10119 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -38,6 +38,7 @@ public interface LauncherConstant { * nacos 命名空间 */ String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; /** * nacos 用户名 diff --git a/blade-common/target/classes/META-INF/services/org.springblade.core.launch.service.LauncherService b/blade-common/target/classes/META-INF/services/org.springblade.core.launch.service.LauncherService deleted file mode 100644 index 87512c9db..000000000 --- a/blade-common/target/classes/META-INF/services/org.springblade.core.launch.service.LauncherService +++ /dev/null @@ -1 +0,0 @@ -org.springblade.common.launch.LauncherServiceImpl diff --git a/blade-common/target/classes/META-INF/spring-devtools.properties b/blade-common/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 4aae8ab3e..000000000 --- a/blade-common/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-common=/blade-common[\\w-]+\.jar \ No newline at end of file diff --git a/blade-common/target/classes/META-INF/spring.factories b/blade-common/target/classes/META-INF/spring.factories deleted file mode 100644 index be9adc545..000000000 --- a/blade-common/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.common.config.BladeCommonConfiguration diff --git a/blade-common/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-common/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5a79d7d43..000000000 --- a/blade-common/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springblade.common.config.BladeCommonConfiguration \ No newline at end of file diff --git a/blade-common/target/classes/banner.txt b/blade-common/target/classes/banner.txt deleted file mode 100644 index c0f1066cc..000000000 --- a/blade-common/target/classes/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ -${AnsiColor.BLUE} ______ _ _ ___ ___ -${AnsiColor.BLUE} | ___ \| | | | \ \ / / -${AnsiColor.BLUE} | |_/ /| | __ _ __| | ___ \ V / -${AnsiColor.BLUE} | ___ \| | / _` | / _` | / _ \ > < -${AnsiColor.BLUE} | |_/ /| || (_| || (_| || __/ / . \ -${AnsiColor.BLUE} \____/ |_| \__,_| \__,_| \___|/__/ \__\ - -${AnsiColor.BLUE}:: BladeX ${blade.service.version} :: ${spring.application.name}:${AnsiColor.RED}${blade.env}${AnsiColor.BLUE} :: Running SpringBoot ${spring-boot.version} :: ${AnsiColor.BRIGHT_BLACK} diff --git a/blade-common/target/maven-archiver/pom.properties b/blade-common/target/maven-archiver/pom.properties deleted file mode 100644 index 879b9a2b5..000000000 --- a/blade-common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Nov 10 14:14:45 CST 2025 -groupId=org.springblade -artifactId=blade-common -version=4.6.0.RELEASE diff --git a/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index f6aff1638..000000000 --- a/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -org\springblade\common\config\BladeCommonConfiguration.class -META-INF\spring-devtools.properties -org\springblade\common\constant\TenantConstant.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\common\launch\LauncherServiceImpl.class -org\springblade\common\cache\CacheNames.class -org\springblade\common\constant\LauncherConstant.class -META-INF\spring.factories -META-INF\services\org.springblade.core.launch.service.LauncherService -org\springblade\common\constant\CommonConstant.class -org\springblade\common\utils\CommonUtil.class diff --git a/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 46c3731b8..000000000 --- a/blade-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,7 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\utils\CommonUtil.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\launch\LauncherServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\cache\CacheNames.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\constant\TenantConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\config\BladeCommonConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\constant\CommonConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-common\src\main\java\org\springblade\common\constant\LauncherConstant.java diff --git a/blade-gateway/.flattened-pom.xml b/blade-gateway/.flattened-pom.xml deleted file mode 100644 index 8332bca0f..000000000 --- a/blade-gateway/.flattened-pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - org.springblade - blade-gateway - 4.6.0.RELEASE - blade-gateway - - - org.springblade - blade-core-launch - 4.6.0.RELEASE - compile - - - spring-boot-starter-web - org.springframework.boot - - - spring-boot-starter-undertow - org.springframework.boot - - - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - blade-core-launch - org.springblade - - - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-jwt - 4.6.0.RELEASE - compile - - - com.alibaba - fastjson - 2.0.53 - compile - - - org.springframework.cloud - spring-cloud-starter-gateway - 4.1.6 - compile - - - org.springframework.cloud - spring-cloud-starter-bootstrap - 4.1.5 - compile - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - 2023.0.1.2 - compile - - - org.springframework.boot - spring-boot-starter-data-redis-reactive - 3.2.12 - compile - - - de.codecentric - spring-boot-admin-starter-client - 3.2.3 - compile - - - com.github.xiaoymin - knife4j-gateway-spring-boot-starter - 4.5.0 - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-gateway/.gitignore b/blade-gateway/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-gateway/.gitignore +++ b/blade-gateway/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-gateway/blade-gateway.iml b/blade-gateway/blade-gateway.iml deleted file mode 100644 index 92d2ed390..000000000 --- a/blade-gateway/blade-gateway.iml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-gateway/target/antrun/build-main.xml b/blade-gateway/target/antrun/build-main.xml deleted file mode 100644 index d21c0bed1..000000000 --- a/blade-gateway/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-gateway/target/blade-gateway.jar.original b/blade-gateway/target/blade-gateway.jar.original deleted file mode 100644 index deaa5d141..000000000 Binary files a/blade-gateway/target/blade-gateway.jar.original and /dev/null differ diff --git a/blade-gateway/target/classes/application-dev.yml b/blade-gateway/target/classes/application-dev.yml deleted file mode 100644 index b8eaf546c..000000000 --- a/blade-gateway/target/classes/application-dev.yml +++ /dev/null @@ -1,11 +0,0 @@ -blade: - #多团队协作服务配置 - loadbalancer: - #开启配置 - enabled: true - #灰度版本 - #version: 3.0.0 - #负载均衡优先调用的ip段 - prior-ip-pattern: - - 192.168.0.* - - 127.0.0.1 diff --git a/blade-gateway/target/classes/application.yml b/blade-gateway/target/classes/application.yml deleted file mode 100644 index d0c33710f..000000000 --- a/blade-gateway/target/classes/application.yml +++ /dev/null @@ -1,16 +0,0 @@ -knife4j: - gateway: - enabled: true - tags-sorter: order - operations-sorter: order - # 指定服务发现的模式聚合微服务文档，并且是默认`default`分组 - strategy: discover - discover: - enabled: true - # 指定版本号(Swagger2|OpenAPI3) - version : openapi3 - # 需要排除的微服务(eg:网关服务) - excluded-services: - - blade-admin - - blade-gateway - - blade-log diff --git a/blade-gateway/target/classes/bootstrap.yml b/blade-gateway/target/classes/bootstrap.yml deleted file mode 100644 index 5c9f4fd54..000000000 --- a/blade-gateway/target/classes/bootstrap.yml +++ /dev/null @@ -1,12 +0,0 @@ -server: - port: 80 - -spring: - cloud: - gateway: - discovery: - locator: - enabled: true - loadbalancer: - retry: - enabled: true diff --git a/blade-gateway/target/maven-archiver/pom.properties b/blade-gateway/target/maven-archiver/pom.properties deleted file mode 100644 index e5be1156f..000000000 --- a/blade-gateway/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Nov 10 14:15:05 CST 2025 -groupId=org.springblade -artifactId=blade-gateway -version=4.6.0.RELEASE diff --git a/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index d3397b5dc..000000000 --- a/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,23 +0,0 @@ -org\springblade\gateway\provider\SignSecure.class -org\springblade\gateway\handler\ErrorExceptionHandler.class -org\springblade\gateway\dynamic\DynamicRouteService.class -org\springblade\gateway\provider\AuthProvider.class -org\springblade\gateway\props\RequestProperties.class -org\springblade\gateway\dynamic\DynamicRouteServiceListener$1.class -org\springblade\gateway\filter\GatewayFilter.class -org\springblade\gateway\dynamic\DynamicRouteServiceListener.class -org\springblade\gateway\GateWayApplication.class -org\springblade\gateway\props\AuthProperties.class -org\springblade\gateway\config\ErrorHandlerConfiguration.class -org\springblade\gateway\provider\BasicSecure.class -org\springblade\gateway\filter\RequestFilter.class -org\springblade\gateway\filter\ResponseLogFilter.class -org\springblade\gateway\provider\RequestProvider.class -org\springblade\gateway\filter\RequestLogFilter.class -org\springblade\gateway\config\RouterFunctionConfiguration.class -org\springblade\gateway\provider\AuthSecure.class -org\springblade\gateway\dynamic\GatewayPredicate.class -org\springblade\gateway\filter\AuthFilter.class -org\springblade\gateway\provider\ResponseProvider.class -org\springblade\gateway\dynamic\GatewayRoute.class -org\springblade\gateway\dynamic\GatewayFilter.class diff --git a/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index bf121a81c..000000000 --- a/blade-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,22 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\dynamic\DynamicRouteService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\config\RouterFunctionConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\dynamic\GatewayFilter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\RequestProvider.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\dynamic\GatewayRoute.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\filter\RequestFilter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\props\AuthProperties.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\props\RequestProperties.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\SignSecure.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\filter\RequestLogFilter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\filter\ResponseLogFilter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\GateWayApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\AuthProvider.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\ResponseProvider.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\BasicSecure.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\filter\AuthFilter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\dynamic\DynamicRouteServiceListener.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\config\ErrorHandlerConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\provider\AuthSecure.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\handler\ErrorExceptionHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\dynamic\GatewayPredicate.java -D:\ideaworkspeate\jonhon-mes-svr\blade-gateway\src\main\java\org\springblade\gateway\filter\GatewayFilter.java diff --git a/blade-ops-api/.flattened-pom.xml b/blade-ops-api/.flattened-pom.xml deleted file mode 100644 index ea77e0350..000000000 --- a/blade-ops-api/.flattened-pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - org.springblade - blade-ops-api - 4.6.0.RELEASE - pom - blade-ops-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops-api/blade-develop-api/.flattened-pom.xml b/blade-ops-api/blade-develop-api/.flattened-pom.xml deleted file mode 100644 index 4e59af7bd..000000000 --- a/blade-ops-api/blade-develop-api/.flattened-pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - org.springblade - blade-develop-api - 4.6.0.RELEASE - blade-develop-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops-api/blade-develop-api/.gitignore b/blade-ops-api/blade-develop-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops-api/blade-develop-api/.gitignore +++ b/blade-ops-api/blade-develop-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops-api/blade-develop-api/blade-develop-api.iml b/blade-ops-api/blade-develop-api/blade-develop-api.iml deleted file mode 100644 index 26cc2e900..000000000 --- a/blade-ops-api/blade-develop-api/blade-develop-api.iml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring-devtools.properties b/blade-ops-api/blade-develop-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 8a76778c9..000000000 --- a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-develop-api=/blade-develop-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring.factories b/blade-ops-api/blade-develop-api/target/classes/META-INF/spring.factories deleted file mode 100644 index dfc308ae3..000000000 --- a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.develop.feign.IDatasourceClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.develop.feign.IDatasourceClient diff --git a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-ops-api/blade-develop-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8ffa10946..000000000 --- a/blade-ops-api/blade-develop-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springblade.develop.feign.IDatasourceClientFallback \ No newline at end of file diff --git a/blade-ops-api/blade-develop-api/target/maven-archiver/pom.properties b/blade-ops-api/blade-develop-api/target/maven-archiver/pom.properties deleted file mode 100644 index 2d72c7fde..000000000 --- a/blade-ops-api/blade-develop-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:17 CST 2025 -groupId=org.springblade -artifactId=blade-develop-api -version=4.6.0.RELEASE diff --git a/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e5db62027..000000000 --- a/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,12 +0,0 @@ -org\springblade\develop\feign\IDatasourceClient.class -org\springblade\develop\pojo\entity\Code.class -META-INF\spring-devtools.properties -org\springblade\develop\pojo\entity\Datasource.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\develop\pojo\entity\ModelPrototype.class -org\springblade\develop\feign\IDatasourceClientFallback.class -org\springblade\develop\pojo\entity\Model.class -org\springblade\develop\pojo\dto\GeneratorDTO.class -org\springblade\develop\pojo\entity\CodeSetting.class -org\springblade\develop\pojo\dto\ModelDTO.class -META-INF\spring.factories diff --git a/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 265810e82..000000000 --- a/blade-ops-api/blade-develop-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,9 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\entity\CodeSetting.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\entity\Model.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\dto\GeneratorDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\dto\ModelDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\entity\Code.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\feign\IDatasourceClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\feign\IDatasourceClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\entity\Datasource.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-develop-api\src\main\java\org\springblade\develop\pojo\entity\ModelPrototype.java diff --git a/blade-ops-api/blade-flow-api/.flattened-pom.xml b/blade-ops-api/blade-flow-api/.flattened-pom.xml deleted file mode 100644 index e30ea0a68..000000000 --- a/blade-ops-api/blade-flow-api/.flattened-pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - org.springblade - blade-flow-api - 4.6.0.RELEASE - blade-flow-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops-api/blade-flow-api/.gitignore b/blade-ops-api/blade-flow-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops-api/blade-flow-api/.gitignore +++ b/blade-ops-api/blade-flow-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops-api/blade-flow-api/blade-flow-api.iml b/blade-ops-api/blade-flow-api/blade-flow-api.iml deleted file mode 100644 index 26cc2e900..000000000 --- a/blade-ops-api/blade-flow-api/blade-flow-api.iml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring-devtools.properties b/blade-ops-api/blade-flow-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index ad58b8db8..000000000 --- a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-flow-api=/blade-flow-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring.factories b/blade-ops-api/blade-flow-api/target/classes/META-INF/spring.factories deleted file mode 100644 index 7f48ed200..000000000 --- a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.flow.core.feign.IFlowClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.flow.core.feign.IFlowClient diff --git a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-ops-api/blade-flow-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 7ae31614a..000000000 --- a/blade-ops-api/blade-flow-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springblade.flow.core.feign.IFlowClientFallback \ No newline at end of file diff --git a/blade-ops-api/blade-flow-api/target/maven-archiver/pom.properties b/blade-ops-api/blade-flow-api/target/maven-archiver/pom.properties deleted file mode 100644 index 617f60b88..000000000 --- a/blade-ops-api/blade-flow-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:15 CST 2025 -groupId=org.springblade -artifactId=blade-flow-api -version=4.6.0.RELEASE diff --git a/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 5763631b2..000000000 --- a/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -org\springblade\flow\core\utils\TaskUtil.class -META-INF\spring-devtools.properties -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\flow\core\feign\IFlowClientFallback.class -org\springblade\flow\core\pojo\entity\BladeFlow.class -org\springblade\flow\core\pojo\enums\FlowModeEnum.class -org\springblade\flow\core\feign\IFlowClient.class -org\springblade\flow\core\constant\ProcessConstant.class -org\springblade\flow\core\utils\FlowUtil.class -org\springblade\flow\core\pojo\entity\FlowEntity.class -META-INF\spring.factories diff --git a/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 5fda0baae..000000000 --- a/blade-ops-api/blade-flow-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,8 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\pojo\entity\BladeFlow.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\utils\TaskUtil.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\constant\ProcessConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\utils\FlowUtil.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\feign\IFlowClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\feign\IFlowClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\pojo\entity\FlowEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-flow-api\src\main\java\org\springblade\flow\core\pojo\enums\FlowModeEnum.java diff --git a/blade-ops-api/blade-job-api/.gitattributes b/blade-ops-api/blade-job-api/.gitattributes new file mode 100644 index 000000000..3b41682ac --- /dev/null +++ b/blade-ops-api/blade-job-api/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/blade-ops-api/blade-job-api/.gitignore b/blade-ops-api/blade-job-api/.gitignore new file mode 100644 index 000000000..667aaef0c --- /dev/null +++ b/blade-ops-api/blade-job-api/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/blade-ops-api/blade-job-api/.mvn/wrapper/maven-wrapper.properties b/blade-ops-api/blade-job-api/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..c0bcafe98 --- /dev/null +++ b/blade-ops-api/blade-job-api/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/blade-ops-api/blade-job-api/mvnw b/blade-ops-api/blade-job-api/mvnw new file mode 100644 index 000000000..bd8896bf2 --- /dev/null +++ b/blade-ops-api/blade-job-api/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/blade-ops-api/blade-job-api/mvnw.cmd b/blade-ops-api/blade-job-api/mvnw.cmd new file mode 100644 index 000000000..92450f932 --- /dev/null +++ b/blade-ops-api/blade-job-api/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/blade-plugin/pom.xml b/blade-ops-api/blade-job-api/pom.xml similarity index 71% rename from blade-plugin/pom.xml rename to blade-ops-api/blade-job-api/pom.xml index 6f1447d26..b85a8b980 100644 --- a/blade-plugin/pom.xml +++ b/blade-ops-api/blade-job-api/pom.xml @@ -1,16 +1,16 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - jonhon-mes-svr + blade-ops-api org.springblade ${revision} 4.0.0 - blade-plugin + blade-job-api ${project.artifactId} - pom + jar diff --git a/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/feign/IJobExtClient.java b/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/feign/IJobExtClient.java new file mode 100644 index 000000000..6d0f6ff23 --- /dev/null +++ b/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/feign/IJobExtClient.java @@ -0,0 +1,59 @@ +package org.springblade.job.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springblade.job.pojo.entity.JobInfo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient( + value = AppConstant.APPLICATION_JOB_NAME +) +public interface IJobExtClient { + + String API_PREFIX = "/feign/client/qa/job-ext"; + + String SUBMIT_AND_SYNC = API_PREFIX + "/submit-and-sync"; + + String REMOVE_AND_SYNC = API_PREFIX + "/remove-and-sync"; + + String RUN_SERVER_JOB_JOB = API_PREFIX + "/run-server-job"; + + String CHANGE_SERVER_JOB = API_PREFIX + "/change-server-job"; + + String SYNC = API_PREFIX + "/sync"; + + String GET_JOB_INFO_BY_ID = API_PREFIX + "/get-job-info-by-id"; + + @PostMapping(SUBMIT_AND_SYNC) + public Boolean submitAndSync(@RequestParam JobInfo jobInfo); + + @PostMapping(REMOVE_AND_SYNC) + public Boolean removeAndSync(@RequestParam List jobInfoIds); + + @PostMapping(RUN_SERVER_JOB_JOB) + public Boolean runServerJob(@RequestParam Long jobInfoId); + + /** + * + * @param jobInfoId + * @param enable PowerJobConstant.JOB_ENABLED + * @return + */ + @PostMapping(CHANGE_SERVER_JOB) + Boolean changeServerJob(@RequestParam Long jobInfoId, @RequestParam Integer enable); + + @PostMapping(SYNC) + public Boolean sync(); + + /** + * + * @param jobInfoId blade_job_info 表id + * @return + */ + @PostMapping(GET_JOB_INFO_BY_ID) + public JobInfo getJobInfoById(@RequestParam Long jobInfoId); +} diff --git a/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/pojo/entity/JobInfo.java b/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/pojo/entity/JobInfo.java new file mode 100644 index 000000000..d0df290ed --- /dev/null +++ b/blade-ops-api/blade-job-api/src/main/java/org/springblade/job/pojo/entity/JobInfo.java @@ -0,0 +1,174 @@ +package org.springblade.job.pojo.entity; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 任务信息表 实体类 + * copy from module blade-job + * @author BladeX + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "任务信息表") +public class JobInfo extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务服务ID + */ + @Schema(description = "任务服务ID") + private Long jobServerId; + /** + * 任务 ID，可选，null 代表创建任务，否则填写需要修改的任务 ID + */ + @Schema(description = "任务 ID，可选，null 代表创建任务，否则填写需要修改的任务 ID") + private Long jobId; + /** + * 任务名称 + */ + @Schema(description = "任务名称") + private String jobName; + /** + * 任务描述 + */ + @Schema(description = "任务描述") + private String jobDescription; + /** + * 任务参数，Processor#process 方法入参 TaskContext 对象的 jobParams 字段 + */ + @Schema(description = "任务参数，Processor#process 方法入参 TaskContext 对象的 jobParams 字段") + private String jobParams; + /** + * 时间表达式类型，枚举值 + */ + @Schema(description = "时间表达式类型，枚举值") + private Integer timeExpressionType; + /** + * 时间表达式，填写类型由 timeExpressionType 决定，比如 CRON 需要填写 CRON 表达式 + */ + @Schema(description = "时间表达式，填写类型由 timeExpressionType 决定，比如 CRON 需要填写 CRON 表达式") + private String timeExpression; + /** + * 执行类型，枚举值 + */ + @Schema(description = "执行类型，枚举值") + private Integer executeType; + /** + * 处理器类型，枚举值 + */ + @Schema(description = "处理器类型，枚举值") + private Integer processorType; + /** + * 处理器参数，填写类型由 processorType 决定，如Java 处理器需要填写全限定类名，如：com.github.kfcfans.oms.processors.demo.MapReduceProcessorDemo + */ + @Schema(description = "处理器参数，填写类型由 processorType 决定，如Java 处理器需要填写全限定类名，如：com.github.kfcfans.oms.processors.demo.MapReduceProcessorDemo") + private String processorInfo; + /** + * 最大实例数，该任务同时执行的数量（任务和实例就像是类和对象的关系，任务被调度执行后被称为实例） + */ + @Schema(description = "最大实例数，该任务同时执行的数量（任务和实例就像是类和对象的关系，任务被调度执行后被称为实例）") + private Integer maxInstanceNum; + /** + * 单机线程并发数，表示该实例执行过程中每个Worker 使用的线程数量 + */ + @Schema(description = "单机线程并发数，表示该实例执行过程中每个Worker 使用的线程数量") + private Integer concurrency; + /** + * 任务实例运行时间限制，0 代表无任何限制，超时会被打断并判定为执行失败 + */ + @Schema(description = "任务实例运行时间限制，0 代表无任何限制，超时会被打断并判定为执行失败") + private Long instanceTimeLimit; + /** + * instanceRetryNum 任务实例重试次数，整个任务失败时重试，代价大，不推荐使用 + */ + @Schema(description = "instanceRetryNum 任务实例重试次数，整个任务失败时重试，代价大，不推荐使用") + private Integer instanceRetryNum; + /** + * taskRetryNum Task 重试次数，每个子 Task 失败后单独重试，代价小，推荐使用 + */ + @Schema(description = "taskRetryNum Task 重试次数，每个子 Task 失败后单独重试，代价小，推荐使用") + private Integer taskRetryNum; + /** + * minCpuCores 最小可用 CPU 核心数，CPU 可用核心数小于该值的 Worker 将不会执行该任务，0 代表无任何限制 + */ + @Schema(description = "minCpuCores 最小可用 CPU 核心数，CPU 可用核心数小于该值的 Worker 将不会执行该任务，0 代表无任何限制") + private BigDecimal minCpuCores; + /** + * 最小内存大小（GB），可用内存小于该值的Worker 将不会执行该任务，0 代表无任何限制 + */ + @Schema(description = "最小内存大小（GB），可用内存小于该值的Worker 将不会执行该任务，0 代表无任何限制") + private BigDecimal minMemorySpace; + /** + * 最小磁盘大小（GB），可用磁盘空间小于该值的Worker 将不会执行该任务，0 代表无任何限制 + */ + @Schema(description = "最小磁盘大小（GB），可用磁盘空间小于该值的Worker 将不会执行该任务，0 代表无任何限制") + private BigDecimal minDiskSpace; + /** + * 指定机器执行，设置该参数后只有列表中的机器允许执行该任务，空代表不指定机器 + */ + @Schema(description = "指定机器执行，设置该参数后只有列表中的机器允许执行该任务，空代表不指定机器") + private String designatedWorkers; + /** + * 最大执行机器数量，限定调动执行的机器数量，0代表无限制 + */ + @Schema(description = "最大执行机器数量，限定调动执行的机器数量，0代表无限制") + private Integer maxWorkerCount; + /** + * 接收报警的用户 ID 列表 + */ + @Schema(description = "接收报警的用户 ID 列表") + private String notifyUserIds; + /** + * 是否启用该任务，未启用的任务不会被调度 + */ + @Schema(description = "是否启用该任务，未启用的任务不会被调度") + private Integer enable; + /** + * 调度策略，枚举，目前支持随机（RANDOM）和 健康度优先（HEALTH_FIRST） + */ + @Schema(description = "调度策略，枚举，目前支持随机（RANDOM）和 健康度优先（HEALTH_FIRST）") + private Integer dispatchStrategy; + /** + * lifecycle 生命周期（预留，用于指定定时调度任务的生效时间范围） + */ + @Schema(description = "lifecycle 生命周期（预留，用于指定定时调度任务的生效时间范围）") + private String lifecycle; + /** + * 错误阈值，0代表不限制 + */ + @Schema(description = "错误阈值，0代表不限制") + private Integer alertThreshold; + /** + * 统计的窗口长度(s)，0代表不限制 + */ + @Schema(description = "统计的窗口长度(s)，0代表不限制") + private Integer statisticWindowLen; + /** + * 沉默时间窗口(s)，0代表不限制 + */ + @Schema(description = "沉默时间窗口(s)，0代表不限制") + private Integer silenceWindowLen; + /** + * 日志配置 + */ + @Schema(description = "日志配置") + private Integer logType; + /** + * 日志配置 + */ + @Schema(description = "日志级别") + private Integer logLevel; + /** + * 扩展字段（供开发者使用，用于功能扩展，powerjob 自身不会使用该字段） + */ + @Schema(description = "扩展字段（供开发者使用，用于功能扩展，powerjob 自身不会使用该字段）") + private String extra; +} diff --git a/blade-ops-api/blade-job-api/src/main/resources/application.properties b/blade-ops-api/blade-job-api/src/main/resources/application.properties new file mode 100644 index 000000000..e83987534 --- /dev/null +++ b/blade-ops-api/blade-job-api/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=blade-job-api diff --git a/blade-ops-api/blade-ops-api.iml b/blade-ops-api/blade-ops-api.iml deleted file mode 100644 index 3bba1887f..000000000 --- a/blade-ops-api/blade-ops-api.iml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops-api/blade-resource-api/.flattened-pom.xml b/blade-ops-api/blade-resource-api/.flattened-pom.xml deleted file mode 100644 index a71fc3419..000000000 --- a/blade-ops-api/blade-resource-api/.flattened-pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - org.springblade - blade-resource-api - 4.6.0.RELEASE - blade-resource-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-sms - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops-api/blade-resource-api/.gitignore b/blade-ops-api/blade-resource-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops-api/blade-resource-api/.gitignore +++ b/blade-ops-api/blade-resource-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops-api/blade-resource-api/blade-resource-api.iml b/blade-ops-api/blade-resource-api/blade-resource-api.iml deleted file mode 100644 index 82b65c07d..000000000 --- a/blade-ops-api/blade-resource-api/blade-resource-api.iml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring-devtools.properties b/blade-ops-api/blade-resource-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index ca337168e..000000000 --- a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-resource-api=/blade-resource-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring.factories b/blade-ops-api/blade-resource-api/target/classes/META-INF/spring.factories deleted file mode 100644 index f28e53f97..000000000 --- a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.resource.feign.ISmsClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.resource.feign.ISmsClient diff --git a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-ops-api/blade-resource-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 104728d88..000000000 --- a/blade-ops-api/blade-resource-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springblade.resource.feign.ISmsClientFallback \ No newline at end of file diff --git a/blade-ops-api/blade-resource-api/target/maven-archiver/pom.properties b/blade-ops-api/blade-resource-api/target/maven-archiver/pom.properties deleted file mode 100644 index 0b804bca5..000000000 --- a/blade-ops-api/blade-resource-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:03:46 CST 2025 -groupId=org.springblade -artifactId=blade-resource-api -version=4.6.0.RELEASE diff --git a/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 3e3b2e9c8..000000000 --- a/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -org\springblade\resource\pojo\vo\AttachVO.class -META-INF\spring-devtools.properties -org\springblade\resource\feign\ISmsClient.class -org\springblade\resource\pojo\vo\SmsVO.class -org\springblade\resource\pojo\entity\Oss.class -org\springblade\resource\pojo\vo\OssVO.class -META-INF\spring.factories -org\springblade\resource\pojo\entity\Attach.class -org\springblade\resource\feign\ISmsClientFallback.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\resource\utils\SmsUtil.class -org\springblade\resource\pojo\enums\SmsCodeEnum.class -org\springblade\resource\pojo\entity\Sms.class diff --git a/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 2d684e23f..000000000 --- a/blade-ops-api/blade-resource-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\feign\ISmsClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\feign\ISmsClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\enums\SmsCodeEnum.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\utils\SmsUtil.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\entity\Sms.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\vo\AttachVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\entity\Attach.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\entity\Oss.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\vo\OssVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops-api\blade-resource-api\src\main\java\org\springblade\resource\pojo\vo\SmsVO.java diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index 6ac2feeee..cf6310a31 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -18,6 +18,7 @@ blade-flow-api blade-resource-api blade-develop-api + blade-job-api diff --git a/blade-ops/.flattened-pom.xml b/blade-ops/.flattened-pom.xml deleted file mode 100644 index 0288ebb48..000000000 --- a/blade-ops/.flattened-pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - org.springblade - blade-ops - 4.6.0.RELEASE - pom - blade-ops - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-admin/.flattened-pom.xml b/blade-ops/blade-admin/.flattened-pom.xml deleted file mode 100644 index 5500a6d53..000000000 --- a/blade-ops/blade-admin/.flattened-pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - 4.0.0 - org.springblade - blade-admin - 4.6.0.RELEASE - blade-admin - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - blade-core-launch - org.springblade - - - - - org.springblade - blade-core-launch - 4.6.0.RELEASE - compile - - - spring-boot-starter-web - org.springframework.boot - - - spring-boot-starter-undertow - org.springframework.boot - - - - - org.springblade - blade-starter-prometheus - 4.6.0.RELEASE - compile - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - 2023.0.1.2 - compile - - - nacos-client - com.alibaba.nacos - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - 2023.0.1.2 - compile - - - nacos-client - com.alibaba.nacos - - - - - com.alibaba.nacos - nacos-client - 2.5.1 - compile - - - de.codecentric - spring-boot-admin-starter-server - 3.2.3 - compile - - - org.springframework.boot - spring-boot-starter-security - 3.2.12 - compile - - - com.taobao - taobao-sdk - 20201116 - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-admin/.gitignore b/blade-ops/blade-admin/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-admin/.gitignore +++ b/blade-ops/blade-admin/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-admin/blade-admin.iml b/blade-ops/blade-admin/blade-admin.iml deleted file mode 100644 index bce5d49df..000000000 --- a/blade-ops/blade-admin/blade-admin.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-admin/target/antrun/build-main.xml b/blade-ops/blade-admin/target/antrun/build-main.xml deleted file mode 100644 index 42bdf4ea5..000000000 --- a/blade-ops/blade-admin/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-admin/target/blade-admin.jar.original b/blade-ops/blade-admin/target/blade-admin.jar.original deleted file mode 100644 index 1838f9454..000000000 Binary files a/blade-ops/blade-admin/target/blade-admin.jar.original and /dev/null differ diff --git a/blade-ops/blade-admin/target/classes/bootstrap.yml b/blade-ops/blade-admin/target/classes/bootstrap.yml deleted file mode 100644 index 9e4c3fcdb..000000000 --- a/blade-ops/blade-admin/target/classes/bootstrap.yml +++ /dev/null @@ -1,48 +0,0 @@ -server: - port: 7002 - undertow: - threads: - # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 - io: 16 - # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 - worker: 400 - # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 - buffer-size: 1024 - # 是否分配的直接内存 - direct-buffers: true - -spring: - boot: - admin: - # 忽略服务名 - discovery: - ignored-services: - - consul - - serverAddr - # 自定义UI界面 - ui: - title: BladeX Monitor - external-views: - - label: 架构官网 - url: https://bladex.cn/ - order: 1 - iframe: true - # 用于内网安全，判断 admin proxy - instance-proxy: - ignored-headers: "X-Forwarded-For" - # 自定义登录用户名密码 - security: - user: - name: blade - password: blade - -# 监控的相关配置 -monitor: - ding-talk: - enabled: false - # 用于自定义域名，默认会自动填充为 http://ip:port - link: http://localhost:${server.port} - # 钉钉配置的令牌 - access-token: xxx - # 如果采用密钥形式，需要添加，否则需要去掉该参数 - secret: diff --git a/blade-ops/blade-admin/target/maven-archiver/pom.properties b/blade-ops/blade-admin/target/maven-archiver/pom.properties deleted file mode 100644 index 3f268ae0f..000000000 --- a/blade-ops/blade-admin/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:09 CST 2025 -groupId=org.springblade -artifactId=blade-admin -version=4.6.0.RELEASE diff --git a/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 5089b2e89..000000000 --- a/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -org\springblade\admin\dingtalk\DingTalkService.class -org\springblade\admin\config\DingTalkConfiguration.class -org\springblade\admin\dingtalk\MonitorProperties$Service.class -org\springblade\admin\config\AdminConfiguration.class -org\springblade\admin\security\InternalAuthorizationManager.class -org\springblade\admin\dingtalk\MonitorProperties.class -org\springblade\admin\dingtalk\DingTalkNotifier.class -org\springblade\admin\AdminApplication.class -org\springblade\admin\config\SecurityConfiguration.class -org\springblade\admin\dingtalk\MonitorProperties$DingTalk.class diff --git a/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 9096ba7e1..000000000 --- a/blade-ops/blade-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,8 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\config\DingTalkConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\dingtalk\DingTalkService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\AdminApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\dingtalk\DingTalkNotifier.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\config\SecurityConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\config\AdminConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\dingtalk\MonitorProperties.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-admin\src\main\java\org\springblade\admin\security\InternalAuthorizationManager.java diff --git a/blade-ops/blade-develop/.flattened-pom.xml b/blade-ops/blade-develop/.flattened-pom.xml deleted file mode 100644 index efca17590..000000000 --- a/blade-ops/blade-develop/.flattened-pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - org.springblade - blade-develop - 4.6.0.RELEASE - blade-develop - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-develop - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-excel - 4.6.0.RELEASE - compile - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-develop-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-develop/.gitignore b/blade-ops/blade-develop/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-develop/.gitignore +++ b/blade-ops/blade-develop/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-develop/blade-develop.iml b/blade-ops/blade-develop/blade-develop.iml deleted file mode 100644 index 4e060fd8d..000000000 --- a/blade-ops/blade-develop/blade-develop.iml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/zzzz/package-info.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/zzzz/package-info.java new file mode 100644 index 000000000..897941529 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/zzzz/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.zzzz; \ No newline at end of file diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java new file mode 100644 index 000000000..f5fa22c9b --- /dev/null +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java @@ -0,0 +1,105 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.test; + + +import org.springblade.develop.constant.DevelopConstant; +import org.springblade.develop.support.BladeFastCodeGenerator; + +/** + * .ver2 + */ +public class CodeGeneratorVer2 { + + /** + * 代码生成的系统类型(Boot/Cloud) + */ + public static String SYSTEM_NAME = DevelopConstant.CLOUD_NAME; + /** + * 代码生成的模块名 + */ + public static String CODE_NAME = ""; + /** + * 代码所在服务名 + */ + public static String SERVICE_NAME = "blade-desk"; + /** + * 代码生成的包名 + *

+ * basic + * quality + */ + public static String PACKAGE_NAME = "org.springblade.desk.basic"; + /** + * 需要去掉的表前缀 + * BA + * QA + */ + public static String[] TABLE_PREFIX = {"BLADE_", "BA_", "QA_"}; + /** + * 需要生成的表名(两者只能取其一) + */ + public static String[] INCLUDE_TABLES = {"BA_FORMULA", "BA_SHIFT", "BA_TEAM", "BA_WORK_TANK", "BA_WORKSTATION"}; + /** + * 需要排除的表名(两者只能取其一) + */ + public static String[] EXCLUDE_TABLES = {}; + /** + * 是否包含基础业务字段 + */ + public static Boolean HAS_SUPER_ENTITY = Boolean.TRUE; + /** + * 基础业务字段 + */ + public static String[] SUPER_ENTITY_COLUMNS = + { + "id", + "create_time", + "create_user", + "create_dept", + "update_time", + "update_user", + "status", + "is_deleted" + }; + + /** + * RUN THIS + */ + public static void main(String[] args) { + BladeFastCodeGenerator generator = new BladeFastCodeGenerator(); + generator.setSystemName(SYSTEM_NAME); + generator.setCodeName(CODE_NAME); + generator.setServiceName(SERVICE_NAME); + generator.setPackageName(PACKAGE_NAME); + generator.setTablePrefix(TABLE_PREFIX); + generator.setIncludeTables(INCLUDE_TABLES); + generator.setExcludeTables(EXCLUDE_TABLES); + generator.setHasSuperEntity(HAS_SUPER_ENTITY); + generator.setSuperEntityColumns(SUPER_ENTITY_COLUMNS); + generator.run(); + } +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl index f7b1595ce..e2fbec357 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl @@ -1,27 +1,5 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ package ${package.Controller}; @@ -41,13 +19,13 @@ import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; +import ${packageName!}.pojo.entity.${entityKey!}; +import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO; +import ${packageName!}.excel.gen.${entityKey!}GenExcel; #if(hasWrapper) { -import ${packageName!}.wrapper.${entityKey!}Wrapper; +import ${packageName!}.wrapper.gen.${entityKey!}GenWrapper; #} -import ${packageName!}.service.${table.serviceName!}; +import ${packageName!}.service.gen.${table.serviceName!}; #if(isNotEmpty(superControllerClassPackage)){ import ${superControllerClassPackage!}; #} @@ -69,7 +47,7 @@ import jakarta.servlet.http.HttpServletResponse; #if(hasServiceName) { @RequestMapping("${serviceName!}/${entityKeyPath!}") #}else{ -@RequestMapping("/${entityKeyPath!}") +@RequestMapping("/${entityKey!}") #} @Tag(name = "${table.comment!}", description = "${table.comment!}接口") #if(isNotEmpty(superControllerClass)){ @@ -79,7 +57,7 @@ public class ${table.controllerName!} extends ${superControllerClass!} { public class ${table.controllerName!} { #} - private final ${table.serviceName!} ${entityKeyPath!}Service; + private final ${table.serviceName!} ${entityKeyPath!}GenService; #if(hasWrapper){ /** @@ -87,10 +65,10 @@ public class ${table.controllerName!} { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入${entityKeyPath!}") - public R<${entityKey!}VO> detail(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}Entity detail = ${entityKeyPath!}Service.getOne(Condition.getQueryWrapper(${entityKeyPath!})); - return R.data(${entityKey!}Wrapper.build().entityVO(detail)); + @Operation(summary = "详情", description = "传入${entityKey!}") + public R<${entityKey!}GenVO> detail(${entityKey!} ${entityKeyPath!}) { + ${entityKey!} detail = ${entityKeyPath!}GenService.getOne(Condition.getQueryWrapper(${entityKeyPath!})); + return R.data(${entityKey!}GenWrapper.build().entityVO(detail)); } /** @@ -98,10 +76,10 @@ public class ${table.controllerName!} { */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") - public R> list(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, Query query) { - IPage<${entityKey!}Entity> pages = ${entityKeyPath!}Service.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class)); - return R.data(${entityKey!}Wrapper.build().pageVO(pages)); + @Operation(summary = "分页", description = "传入${entityKey!}") + public R> list(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, Query query) { + IPage<${entityKey!}> pages = ${entityKeyPath!}GenService.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class)); + return R.data(${entityKey!}GenWrapper.build().pageVO(pages)); } #}else{ @@ -110,9 +88,9 @@ public class ${table.controllerName!} { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入${entityKeyPath!}") - public R<${entityKey!}Entity> detail(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}Entity detail = ${entityKeyPath!}Service.getOne(Condition.getQueryWrapper(${entityKeyPath!})); + @Operation(summary = "详情", description = "传入${entityKey!}") + public R<${entityKey!}> detail(${entityKey!} ${entityKeyPath!}) { + ${entityKey!} detail = ${entityKeyPath!}GenService.getOne(Condition.getQueryWrapper(${entityKeyPath!})); return R.data(detail); } @@ -121,9 +99,9 @@ public class ${table.controllerName!} { */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") + @Operation(summary = "分页", description = "传入${entityKey!}") public R> list(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, Query query) { - IPage<${entityKey!}Entity> pages = ${entityKeyPath!}Service.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class)); + IPage<${entityKey!}Entity> pages = ${entityKeyPath!}GenService.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class)); return R.data(pages); } @@ -134,9 +112,9 @@ public class ${table.controllerName!} { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") - public R> page(${entityKey!}VO ${entityKeyPath!}, Query query) { - IPage<${entityKey!}VO> pages = ${entityKeyPath!}Service.select${entityKey!}Page(Condition.getPage(query), ${entityKeyPath!}); + @Operation(summary = "分页", description = "传入${entityKey!}") + public R> page(${entityKey!}GenVO ${entityKeyPath!}, Query query) { + IPage<${entityKey!}GenVO> pages = ${entityKeyPath!}GenService.select${entityKey!}Page(Condition.getPage(query), ${entityKeyPath!}); return R.data(pages); } @@ -145,9 +123,9 @@ public class ${table.controllerName!} { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入${entityKeyPath!}") - public R save(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.save(${entityKeyPath!})); + @Operation(summary = "新增", description = "传入${entityKey!}") + public R save(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) { + return R.status(${entityKeyPath!}GenService.save(${entityKeyPath!})); } /** @@ -155,9 +133,9 @@ public class ${table.controllerName!} { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入${entityKeyPath!}") - public R update(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.updateById(${entityKeyPath!})); + @Operation(summary = "修改", description = "传入${entityKey!}") + public R update(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) { + return R.status(${entityKeyPath!}GenService.updateById(${entityKeyPath!})); } /** @@ -165,9 +143,9 @@ public class ${table.controllerName!} { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入${entityKeyPath!}") - public R submit(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.saveOrUpdate(${entityKeyPath!})); + @Operation(summary = "新增或修改", description = "传入${entityKey!}") + public R submit(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) { + return R.status(${entityKeyPath!}GenService.saveOrUpdate(${entityKeyPath!})); } #if(hasSuperEntity){ @@ -178,7 +156,7 @@ public class ${table.controllerName!} { @ApiOperationSupport(order = 7) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(${entityKeyPath!}Service.deleteLogic(Func.toLongList(ids))); + return R.status(${entityKeyPath!}GenService.deleteLogic(Func.toLongList(ids))); } #}else{ /** @@ -196,17 +174,16 @@ public class ${table.controllerName!} { * 导出数据 */ @IsAdmin - @GetMapping("/export-${entityKeyPath!}") + @GetMapping("/export-excel") @ApiOperationSupport(order = 8) - @Operation(summary = "导出数据", description = "传入${entityKeyPath!}") + @Operation(summary = "导出数据", description = "传入${entityKey!}") public void export${entityKey!}(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper<${entityKey!}Entity> queryWrapper = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class); + QueryWrapper<${entityKey!}> queryWrapper = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(${entity!}::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(${entityKey!}Entity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List<${entityKey!}Excel> list = ${entityKeyPath!}Service.export${entityKey!}(queryWrapper); - ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(), "${table.comment!}数据表", list, ${entityKey!}Excel.class); + List<${entityKey!}GenExcel> list = ${entityKeyPath!}GenService.export${entityKey!}(queryWrapper); + ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(), "${table.comment!}数据表", list, ${entityKey!}GenExcel.class); } - } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entity.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entity.java.btl index 893dc7df9..ca356feab 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entity.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entity.java.btl @@ -1,27 +1,5 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ package ${package.Entity!}; @@ -55,15 +33,15 @@ import java.io.Serial; */ @Data @TableName("${table.name!}") -@Schema(description = "${entity!}对象") +@Schema(description = "${entityKey!} Entity对象") #if(hasSuperEntity){ @EqualsAndHashCode(callSuper = true) -public class ${entityKey!}Entity extends TenantEntity { +public class ${entityKey!} extends BaseEntity { @Serial private static final long serialVersionUID = 1L; #}else{ -public class ${entityKey!}Entity implements Serializable { +public class ${entityKey!} implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -77,6 +55,13 @@ public class ${entityKey!}Entity implements Serializable { private Long id; #} +#for(x in table.fields) { + /** + * ${x.comment!} + */ + public static final String COL_${x.columnName!} = "${x.columnName!}"; +#} + #for(x in table.fields) { #if(hasSuperEntity){ #if(x.propertyName!="id"&&x.propertyName!="createUser"&&x.propertyName!="createDept"&&x.propertyName!="createTime"&&x.propertyName!="updateUser"&&x.propertyName!="updateTime"&&x.propertyName!="status"&&x.propertyName!="isDeleted"&&x.propertyName!="tenantId"){ @@ -96,5 +81,4 @@ public class ${entityKey!}Entity implements Serializable { #} #} #} - } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityDTO.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityDTO.java.btl index 5a56c0dc8..3a6c69f1d 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityDTO.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityDTO.java.btl @@ -1,31 +1,9 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ -package ${strutil.replace(package.Entity,"entity","dto")}; +package ${strutil.replace(package.Entity,"entity","dto.gen")}; -import ${packageName!}.pojo.entity.${entityKey!}Entity; +import ${packageName!}.pojo.entity.${entityKey!}; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; @@ -38,7 +16,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) -public class ${entityKey!}DTO extends ${entityKey!}Entity { +public class ${entityKey!}GenDTO extends ${entityKey!} { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityExcel.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityExcel.java.btl index db8f1ccfa..b05539b39 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityExcel.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityExcel.java.btl @@ -1,29 +1,7 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ -package ${strutil.replace(package.Entity,"pojo.entity","excel")}; +package ${strutil.replace(package.Entity,"pojo.entity","excel.gen")}; import lombok.Data; @@ -50,7 +28,7 @@ import java.io.Serial; @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) -public class ${entityKey!}Excel implements Serializable { +public class ${entityKey!}GenExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -65,5 +43,4 @@ public class ${entityKey!}Excel implements Serializable { private ${x.propertyType!} ${x.propertyName!}; #} #} - } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityVO.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityVO.java.btl index b9b598166..3082536e4 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityVO.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/entityVO.java.btl @@ -1,31 +1,9 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ -package ${strutil.replace(package.Entity,"entity","vo")}; +package ${strutil.replace(package.Entity,"entity","vo.gen")}; -import ${packageName!}.pojo.entity.${entityKey!}Entity; +import ${packageName!}.pojo.entity.${entityKey!}; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; @@ -38,7 +16,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) -public class ${entityKey!}VO extends ${entityKey!}Entity { +public class ${entityKey!}GenVO extends ${entityKey!} { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.java.btl index d49c3d4a7..d7050ddc5 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.java.btl @@ -1,33 +1,11 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ package ${package.Mapper!}; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; +import ${packageName!}.pojo.entity.${entityKey!}; +import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO; +import ${packageName!}.excel.gen.${entityKey!}GenExcel; import ${superMapperClassPackage!}; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -40,7 +18,7 @@ import java.util.List; * @author ${author!} * @since ${date!} */ -public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!}Entity> { +public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!}> { /** * 自定义分页 @@ -49,7 +27,7 @@ public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!} * @param ${entityKeyPath!} 查询参数 * @return List<${entityKey!}VO> */ - List<${entityKey!}VO> select${entityKey!}Page(IPage page, ${entityKey!}VO ${entityKeyPath!}); + List<${entityKey!}GenVO> select${entityKey!}Page(IPage page, ${entityKey!}GenVO ${entityKeyPath!}); /** * 获取导出数据 @@ -57,6 +35,5 @@ public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!} * @param queryWrapper 查询条件 * @return List<${entityKey!}Excel> */ - List<${entityKey!}Excel> export${entityKey!}(@Param("ew") Wrapper<${entityKey!}Entity> queryWrapper); - + List<${entityKey!}GenExcel> export${entityKey!}(@Param("ew") Wrapper<${entityKey!}> queryWrapper); } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.xml.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.xml.btl index ea15f4971..fbbfc442b 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.xml.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.xml.btl @@ -7,17 +7,17 @@ #} - + #for(x in table.fields) { #} - SELECT * FROM ${table.name!} \${ew.customSqlSegment} diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl index 738d086f0..8b740fd23 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl @@ -1,34 +1,12 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ package ${package.Service!}; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; +import ${packageName!}.pojo.entity.${entityKey!}; +import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO; +import ${packageName!}.excel.gen.${entityKey!}GenExcel; import com.baomidou.mybatisplus.core.metadata.IPage; #if(hasSuperEntity){ import ${superServiceClassPackage!}; @@ -55,7 +33,7 @@ public interface ${table.serviceName!} extends IService<${entity!}> { * @param ${entityKeyPath!} 查询参数 * @return IPage<${entityKey!}VO> */ - IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}); + IPage<${entityKey!}GenVO> select${entityKey!}Page(IPage<${entityKey!}GenVO> page, ${entityKey!}GenVO ${entityKeyPath!}); /** * 导出数据 @@ -63,6 +41,5 @@ public interface ${table.serviceName!} extends IService<${entity!}> { * @param queryWrapper 查询条件 * @return List<${entityKey!}Excel> */ - List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}Entity> queryWrapper); - + List<${entityKey!}GenExcel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper); } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl index a5636091a..0ec02812b 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl @@ -1,35 +1,13 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ package ${package.ServiceImpl!}; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; -import ${packageName!}.mapper.${table.mapperName!}; -import ${packageName!}.service.${table.serviceName!}; +import ${packageName!}.pojo.entity.${entityKey!}; +import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO; +import ${packageName!}.excel.gen.${entityKey!}GenExcel; +import ${packageName!}.mapper.gen.${table.mapperName!}; +import ${packageName!}.service.gen.${table.serviceName!}; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -54,17 +32,16 @@ public class ${table.serviceImplName!} extends ServiceImpl<${table.mapperName!}, #} @Override - public IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}) { + public IPage<${entityKey!}GenVO> select${entityKey!}Page(IPage<${entityKey!}GenVO> page, ${entityKey!}GenVO ${entityKeyPath!}) { return page.setRecords(baseMapper.select${entityKey!}Page(page, ${entityKeyPath!})); } @Override - public List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}Entity> queryWrapper) { - List<${entityKey!}Excel> ${entityKeyPath!}List = baseMapper.export${entityKey!}(queryWrapper); + public List<${entityKey!}GenExcel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper) { + List<${entityKey!}GenExcel> ${entityKeyPath!}List = baseMapper.export${entityKey!}(queryWrapper); //${entityKeyPath!}List.forEach(${entityKeyPath!} -> { // ${entityKeyPath!}.setTypeName(DictCache.getValue(DictEnum.YES_NO, ${entity!}.getType())); //}); return ${entityKeyPath!}List; } - } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/wrapper.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/wrapper.java.btl index 83d3171c2..6364f4c08 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/wrapper.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/wrapper.java.btl @@ -1,34 +1,12 @@ /** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) + * Author: Tom Shuo */ -package ${strutil.replace(package.Entity,"pojo.entity","wrapper")}; +package ${strutil.replace(package.Entity,"pojo.entity","wrapper.gen")}; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; +import ${packageName!}.pojo.entity.${entityKey!}; +import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO; import java.util.Objects; /** @@ -37,15 +15,15 @@ import java.util.Objects; * @author ${author!} * @since ${date!} */ -public class ${entityKey!}Wrapper extends BaseEntityWrapper<${entityKey!}Entity, ${entityKey!}VO> { +public class ${entityKey!}GenWrapper extends BaseEntityWrapper<${entityKey!}, ${entityKey!}GenVO> { - public static ${entityKey!}Wrapper build() { - return new ${entityKey!}Wrapper(); + public static ${entityKey!}GenWrapper build() { + return new ${entityKey!}GenWrapper(); } @Override - public ${entityKey!}VO entityVO(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}VO ${entityKeyPath!}VO = Objects.requireNonNull(BeanUtil.copyProperties(${entityKeyPath!}, ${entityKey!}VO.class)); + public ${entityKey!}GenVO entityVO(${entityKey!} ${entityKeyPath!}) { + ${entityKey!}GenVO ${entityKeyPath!}VO = Objects.requireNonNull(BeanUtil.copyProperties(${entityKeyPath!}, ${entityKey!}GenVO.class)); //User createUser = UserCache.getUser(${entityKeyPath!}.getCreateUser()); //User updateUser = UserCache.getUser(${entityKeyPath!}.getUpdateUser()); @@ -54,5 +32,4 @@ public class ${entityKey!}Wrapper extends BaseEntityWrapper<${entityKey!}Entity, return ${entityKeyPath!}VO; } - } diff --git a/blade-ops/blade-develop/src/test/resources/templates/code.properties b/blade-ops/blade-develop/src/test/resources/templates/code.properties index 50420cb68..32cf23a53 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/code.properties +++ b/blade-ops/blade-develop/src/test/resources/templates/code.properties @@ -1,5 +1,12 @@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root -author=BladeX +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true +#spring.datasource.username=root +#spring.datasource.password=root +#author=BladeX + +# QA +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl +spring.datasource.username=JONHON_MES +spring.datasource.password=oracle123456 +author=Tom Shuo \ No newline at end of file diff --git a/blade-ops/blade-develop/target/antrun/build-main.xml b/blade-ops/blade-develop/target/antrun/build-main.xml deleted file mode 100644 index 9cf5e8245..000000000 --- a/blade-ops/blade-develop/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-develop/target/blade-develop.jar.original b/blade-ops/blade-develop/target/blade-develop.jar.original deleted file mode 100644 index 3c32e3fba..000000000 Binary files a/blade-ops/blade-develop/target/blade-develop.jar.original and /dev/null differ diff --git a/blade-ops/blade-develop/target/classes/application-dev.yml b/blade-ops/blade-develop/target/classes/application-dev.yml deleted file mode 100644 index e81d9877d..000000000 --- a/blade-ops/blade-develop/target/classes/application-dev.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 7007 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} diff --git a/blade-ops/blade-develop/target/classes/application-prod.yml b/blade-ops/blade-develop/target/classes/application-prod.yml deleted file mode 100644 index ff20d1017..000000000 --- a/blade-ops/blade-develop/target/classes/application-prod.yml +++ /dev/null @@ -1,11 +0,0 @@ -#服务器端口 -server: - port: 7007 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - diff --git a/blade-ops/blade-develop/target/classes/application-test.yml b/blade-ops/blade-develop/target/classes/application-test.yml deleted file mode 100644 index e8a77d135..000000000 --- a/blade-ops/blade-develop/target/classes/application-test.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 7007 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeMapper.xml b/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeMapper.xml deleted file mode 100644 index febe6b433..000000000 --- a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeSettingMapper.xml b/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeSettingMapper.xml deleted file mode 100644 index b0fe4f864..000000000 --- a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/CodeSettingMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/DatasourceMapper.xml b/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/DatasourceMapper.xml deleted file mode 100644 index bb8400c05..000000000 --- a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/DatasourceMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelMapper.xml b/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelMapper.xml deleted file mode 100644 index a8c89339c..000000000 --- a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelPrototypeMapper.xml b/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelPrototypeMapper.xml deleted file mode 100644 index fe8d216f8..000000000 --- a/blade-ops/blade-develop/target/classes/org/springblade/develop/mapper/ModelPrototypeMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/target/classes/templates/code.properties b/blade-ops/blade-develop/target/classes/templates/code.properties deleted file mode 100644 index 50420cb68..000000000 --- a/blade-ops/blade-develop/target/classes/templates/code.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root -author=BladeX diff --git a/blade-ops/blade-develop/target/maven-archiver/pom.properties b/blade-ops/blade-develop/target/maven-archiver/pom.properties deleted file mode 100644 index 3b78db514..000000000 --- a/blade-ops/blade-develop/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:28 CST 2025 -groupId=org.springblade -artifactId=blade-develop -version=4.6.0.RELEASE diff --git a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 3aa2e2124..000000000 --- a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,24 +0,0 @@ -org\springblade\develop\DevelopApplication.class -org\springblade\develop\service\impl\DatasourceServiceImpl.class -org\springblade\develop\service\IGenerateService.class -org\springblade\develop\service\IModelPrototypeService.class -org\springblade\develop\controller\DatasourceController.class -org\springblade\develop\controller\CodeSettingController.class -org\springblade\develop\service\impl\CodeSettingServiceImpl.class -org\springblade\develop\controller\ModelController.class -org\springblade\develop\feign\DatasourceClient.class -org\springblade\develop\service\ICodeSettingService.class -org\springblade\develop\service\impl\GenerateServiceImpl.class -org\springblade\develop\controller\CodeController.class -org\springblade\develop\mapper\CodeSettingMapper.class -org\springblade\develop\controller\ModelPrototypeController.class -org\springblade\develop\service\IDatasourceService.class -org\springblade\develop\service\impl\CodeServiceImpl.class -org\springblade\develop\mapper\ModelMapper.class -org\springblade\develop\mapper\DatasourceMapper.class -org\springblade\develop\service\impl\ModelPrototypeServiceImpl.class -org\springblade\develop\service\impl\ModelServiceImpl.class -org\springblade\develop\mapper\ModelPrototypeMapper.class -org\springblade\develop\service\ICodeService.class -org\springblade\develop\service\IModelService.class -org\springblade\develop\mapper\CodeMapper.class diff --git a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index ff499203f..000000000 --- a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,24 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\GenerateServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\IModelService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\ICodeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\mapper\DatasourceMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\controller\DatasourceController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\IGenerateService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\mapper\CodeSettingMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\ModelServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\controller\CodeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\feign\DatasourceClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\IDatasourceService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\CodeSettingServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\CodeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\IModelPrototypeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\mapper\CodeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\controller\ModelPrototypeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\mapper\ModelMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\ICodeSettingService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\ModelPrototypeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\controller\CodeSettingController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\controller\ModelController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\DevelopApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\mapper\ModelPrototypeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\main\java\org\springblade\develop\service\impl\DatasourceServiceImpl.java diff --git a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 085f4699c..000000000 --- a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -org\springblade\test\CodeGenerator.class diff --git a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index abf5b412a..000000000 --- a/blade-ops/blade-develop/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-develop\src\test\java\org\springblade\test\CodeGenerator.java diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/controller.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/controller.java.btl deleted file mode 100644 index f7b1595ce..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/controller.java.btl +++ /dev/null @@ -1,212 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${package.Controller}; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; -import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; -#if(hasWrapper) { -import ${packageName!}.wrapper.${entityKey!}Wrapper; -#} -import ${packageName!}.service.${table.serviceName!}; -#if(isNotEmpty(superControllerClassPackage)){ -import ${superControllerClassPackage!}; -#} -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; - -/** - * ${table.comment!} 控制器 - * - * @author ${author!} - * @since ${date!} - */ -@RestController -@AllArgsConstructor -#if(hasServiceName) { -@RequestMapping("${serviceName!}/${entityKeyPath!}") -#}else{ -@RequestMapping("/${entityKeyPath!}") -#} -@Tag(name = "${table.comment!}", description = "${table.comment!}接口") -#if(isNotEmpty(superControllerClass)){ -public class ${table.controllerName!} extends ${superControllerClass!} { -#} -#else{ -public class ${table.controllerName!} { -#} - - private final ${table.serviceName!} ${entityKeyPath!}Service; - -#if(hasWrapper){ - /** - * ${table.comment!} 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入${entityKeyPath!}") - public R<${entityKey!}VO> detail(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}Entity detail = ${entityKeyPath!}Service.getOne(Condition.getQueryWrapper(${entityKeyPath!})); - return R.data(${entityKey!}Wrapper.build().entityVO(detail)); - } - - /** - * ${table.comment!} 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") - public R> list(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, Query query) { - IPage<${entityKey!}Entity> pages = ${entityKeyPath!}Service.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class)); - return R.data(${entityKey!}Wrapper.build().pageVO(pages)); - } - -#}else{ - /** - * ${table.comment!} 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入${entityKeyPath!}") - public R<${entityKey!}Entity> detail(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}Entity detail = ${entityKeyPath!}Service.getOne(Condition.getQueryWrapper(${entityKeyPath!})); - return R.data(detail); - } - - /** - * ${table.comment!} 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") - public R> list(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, Query query) { - IPage<${entityKey!}Entity> pages = ${entityKeyPath!}Service.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class)); - return R.data(pages); - } - -#} - - /** - * ${table.comment!} 自定义分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入${entityKeyPath!}") - public R> page(${entityKey!}VO ${entityKeyPath!}, Query query) { - IPage<${entityKey!}VO> pages = ${entityKeyPath!}Service.select${entityKey!}Page(Condition.getPage(query), ${entityKeyPath!}); - return R.data(pages); - } - - /** - * ${table.comment!} 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入${entityKeyPath!}") - public R save(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.save(${entityKeyPath!})); - } - - /** - * ${table.comment!} 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入${entityKeyPath!}") - public R update(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.updateById(${entityKeyPath!})); - } - - /** - * ${table.comment!} 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入${entityKeyPath!}") - public R submit(@Valid @RequestBody ${entityKey!}Entity ${entityKeyPath!}) { - return R.status(${entityKeyPath!}Service.saveOrUpdate(${entityKeyPath!})); - } - -#if(hasSuperEntity){ - /** - * ${table.comment!} 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(${entityKeyPath!}Service.deleteLogic(Func.toLongList(ids))); - } -#}else{ - /** - * ${table.comment!} 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(${entityKeyPath!}Service.removeByIds(Func.toLongList(ids))); - } -#} - - /** - * 导出数据 - */ - @IsAdmin - @GetMapping("/export-${entityKeyPath!}") - @ApiOperationSupport(order = 8) - @Operation(summary = "导出数据", description = "传入${entityKeyPath!}") - public void export${entityKey!}(@Parameter(hidden = true) @RequestParam Map ${entityKeyPath!}, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper<${entityKey!}Entity> queryWrapper = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(${entity!}::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(${entityKey!}Entity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List<${entityKey!}Excel> list = ${entityKeyPath!}Service.export${entityKey!}(queryWrapper); - ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(), "${table.comment!}数据表", list, ${entityKey!}Excel.class); - } - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entity.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/entity.java.btl deleted file mode 100644 index 893dc7df9..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entity.java.btl +++ /dev/null @@ -1,100 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${package.Entity!}; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; -#for(x in table.importPackages){ -#if(isNotEmpty(x)){ -#if(hasSuperEntity&&!strutil.contain(x,"Serializable")){ -import ${x!}; -#} -#if(!hasSuperEntity&&!strutil.contain(x,"TenantEntity")){ -import ${x!}; -#} -#} -#} -#if(hasSuperEntity){ -import lombok.EqualsAndHashCode; -#}else{ -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -#} -import java.io.Serial; - -/** - * ${table.comment!} 实体类 - * - * @author ${author!} - * @since ${date!} - */ -@Data -@TableName("${table.name!}") -@Schema(description = "${entity!}对象") -#if(hasSuperEntity){ -@EqualsAndHashCode(callSuper = true) -public class ${entityKey!}Entity extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; -#}else{ -public class ${entityKey!}Entity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - @Schema(description = "主键") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; -#} - -#for(x in table.fields) { - #if(hasSuperEntity){ - #if(x.propertyName!="id"&&x.propertyName!="createUser"&&x.propertyName!="createDept"&&x.propertyName!="createTime"&&x.propertyName!="updateUser"&&x.propertyName!="updateTime"&&x.propertyName!="status"&&x.propertyName!="isDeleted"&&x.propertyName!="tenantId"){ - /** - * ${x.comment!} - */ - @Schema(description = "${x.comment!}") - private ${x.propertyType!} ${x.propertyName!}; - #} - #}else{ - #if(x.propertyName!="id"){ - /** - * ${x.comment!} - */ - @Schema(description = "${x.comment!}") - private ${x.propertyType!} ${x.propertyName!}; - #} - #} -#} - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityDTO.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityDTO.java.btl deleted file mode 100644 index 5a56c0dc8..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityDTO.java.btl +++ /dev/null @@ -1,45 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${strutil.replace(package.Entity,"entity","dto")}; - -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * ${table.comment!} 数据传输对象实体类 - * - * @author ${author!} - * @since ${date!} - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ${entityKey!}DTO extends ${entityKey!}Entity { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityExcel.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityExcel.java.btl deleted file mode 100644 index db8f1ccfa..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityExcel.java.btl +++ /dev/null @@ -1,69 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${strutil.replace(package.Entity,"pojo.entity","excel")}; - - -import lombok.Data; - -#for(x in table.importPackages){ -#if(isNotEmpty(x)&&!strutil.contain(x,"TableName")&&!strutil.contain(x,"TenantEntity")){ -import ${x!}; -#} -#} -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import java.io.Serial; - - -/** - * ${table.comment!} Excel实体类 - * - * @author ${author!} - * @since ${date!} - */ -@Data -@ColumnWidth(25) -@HeadRowHeight(20) -@ContentRowHeight(18) -public class ${entityKey!}Excel implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - -#for(x in table.fields) { - #if(x.propertyName!="createUser"&&x.propertyName!="createDept"&&x.propertyName!="createTime"&&x.propertyName!="updateUser"&&x.propertyName!="updateTime"){ - /** - * ${x.comment!} - */ - @ColumnWidth(20) - @ExcelProperty("${x.comment!}") - private ${x.propertyType!} ${x.propertyName!}; - #} -#} - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityVO.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityVO.java.btl deleted file mode 100644 index b9b598166..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/entityVO.java.btl +++ /dev/null @@ -1,45 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${strutil.replace(package.Entity,"entity","vo")}; - -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * ${table.comment!} 视图实体类 - * - * @author ${author!} - * @since ${date!} - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ${entityKey!}VO extends ${entityKey!}Entity { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.java.btl deleted file mode 100644 index d49c3d4a7..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.java.btl +++ /dev/null @@ -1,62 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${package.Mapper!}; - -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; -import ${superMapperClassPackage!}; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - * ${table.comment!} Mapper 接口 - * - * @author ${author!} - * @since ${date!} - */ -public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!}Entity> { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ${entityKeyPath!} 查询参数 - * @return List<${entityKey!}VO> - */ - List<${entityKey!}VO> select${entityKey!}Page(IPage page, ${entityKey!}VO ${entityKeyPath!}); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List<${entityKey!}Excel> - */ - List<${entityKey!}Excel> export${entityKey!}(@Param("ew") Wrapper<${entityKey!}Entity> queryWrapper); - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.xml.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.xml.btl deleted file mode 100644 index ea15f4971..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/mapper.xml.btl +++ /dev/null @@ -1,24 +0,0 @@ - - - - -#if(enableCache){ - - -#} - - - #for(x in table.fields) { - - #} - - - - - - - diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/service.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/service.java.btl deleted file mode 100644 index 738d086f0..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/service.java.btl +++ /dev/null @@ -1,68 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${package.Service!}; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; -import com.baomidou.mybatisplus.core.metadata.IPage; -#if(hasSuperEntity){ -import ${superServiceClassPackage!}; -#}else{ -import com.baomidou.mybatisplus.extension.service.IService; -#} -import java.util.List; - -/** - * ${table.comment!} 服务类 - * - * @author ${author!} - * @since ${date!} - */ -#if(hasSuperEntity){ -public interface ${table.serviceName!} extends ${superServiceClass!}<${entity!}> { -#}else{ -public interface ${table.serviceName!} extends IService<${entity!}> { -#} - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ${entityKeyPath!} 查询参数 - * @return IPage<${entityKey!}VO> - */ - IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List<${entityKey!}Excel> - */ - List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}Entity> queryWrapper); - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/serviceImpl.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/serviceImpl.java.btl deleted file mode 100644 index a5636091a..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/serviceImpl.java.btl +++ /dev/null @@ -1,70 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${package.ServiceImpl!}; - -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import ${packageName!}.excel.${entityKey!}Excel; -import ${packageName!}.mapper.${table.mapperName!}; -import ${packageName!}.service.${table.serviceName!}; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -#if(hasSuperEntity){ -import ${superServiceImplClassPackage!}; -#}else{ -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -#} -import java.util.List; - -/** - * ${table.comment!} 服务实现类 - * - * @author ${author!} - * @since ${date!} - */ -@Service -#if(hasSuperEntity){ -public class ${table.serviceImplName!} extends ${superServiceImplClass!}<${table.mapperName!}, ${entity!}> implements ${table.serviceName!} { -#}else{ -public class ${table.serviceImplName!} extends ServiceImpl<${table.mapperName!}, ${entity!}> implements ${table.serviceName!} { -#} - - @Override - public IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}) { - return page.setRecords(baseMapper.select${entityKey!}Page(page, ${entityKeyPath!})); - } - - @Override - public List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}Entity> queryWrapper) { - List<${entityKey!}Excel> ${entityKeyPath!}List = baseMapper.export${entityKey!}(queryWrapper); - //${entityKeyPath!}List.forEach(${entityKeyPath!} -> { - // ${entityKeyPath!}.setTypeName(DictCache.getValue(DictEnum.YES_NO, ${entity!}.getType())); - //}); - return ${entityKeyPath!}List; - } - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/api-fast/wrapper.java.btl b/blade-ops/blade-develop/target/test-classes/templates/api-fast/wrapper.java.btl deleted file mode 100644 index 83d3171c2..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/api-fast/wrapper.java.btl +++ /dev/null @@ -1,58 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package ${strutil.replace(package.Entity,"pojo.entity","wrapper")}; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import ${packageName!}.pojo.entity.${entityKey!}Entity; -import ${packageName!}.pojo.vo.${entityKey!}VO; -import java.util.Objects; - -/** - * ${table.comment!} 包装类,返回视图层所需的字段 - * - * @author ${author!} - * @since ${date!} - */ -public class ${entityKey!}Wrapper extends BaseEntityWrapper<${entityKey!}Entity, ${entityKey!}VO> { - - public static ${entityKey!}Wrapper build() { - return new ${entityKey!}Wrapper(); - } - - @Override - public ${entityKey!}VO entityVO(${entityKey!}Entity ${entityKeyPath!}) { - ${entityKey!}VO ${entityKeyPath!}VO = Objects.requireNonNull(BeanUtil.copyProperties(${entityKeyPath!}, ${entityKey!}VO.class)); - - //User createUser = UserCache.getUser(${entityKeyPath!}.getCreateUser()); - //User updateUser = UserCache.getUser(${entityKeyPath!}.getUpdateUser()); - //${entityKeyPath!}VO.setCreateUserName(createUser.getName()); - //${entityKeyPath!}VO.setUpdateUserName(updateUser.getName()); - - return ${entityKeyPath!}VO; - } - -} diff --git a/blade-ops/blade-develop/target/test-classes/templates/code.properties b/blade-ops/blade-develop/target/test-classes/templates/code.properties deleted file mode 100644 index 50420cb68..000000000 --- a/blade-ops/blade-develop/target/test-classes/templates/code.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root -author=BladeX diff --git a/blade-ops/blade-job/.flattened-pom.xml b/blade-ops/blade-job/.flattened-pom.xml deleted file mode 100644 index b241fb673..000000000 --- a/blade-ops/blade-job/.flattened-pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - org.springblade - blade-job - 4.6.0.RELEASE - blade-job - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-http - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-powerjob - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-job/.gitignore b/blade-ops/blade-job/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-job/.gitignore +++ b/blade-ops/blade-job/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-job/blade-job.iml b/blade-ops/blade-job/blade-job.iml deleted file mode 100644 index a65602a23..000000000 --- a/blade-ops/blade-job/blade-job.iml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-job/pom.xml b/blade-ops/blade-job/pom.xml index bfae16cf4..444800ac0 100644 --- a/blade-ops/blade-job/pom.xml +++ b/blade-ops/blade-job/pom.xml @@ -7,6 +7,7 @@ org.springblade ${revision} + 4.0.0 blade-job @@ -35,6 +36,16 @@ org.springblade blade-starter-powerjob + + org.springblade + blade-desk-api + + + org.springblade + blade-job-api + 4.6.0.RELEASE + compile + diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/feign/JobExtClient.java b/blade-ops/blade-job/src/main/java/org/springblade/job/feign/JobExtClient.java new file mode 100644 index 000000000..bbc4f6bd5 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/feign/JobExtClient.java @@ -0,0 +1,52 @@ +package org.springblade.job.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springblade.job.pojo.entity.JobInfo; +import org.springblade.job.service.JobExtService; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * IJobExtClient + */ +@Slf4j +@RestController +@Hidden +public class JobExtClient implements IJobExtClient { + + @Resource + private JobExtService jobExtService; + + @Override + public Boolean submitAndSync(JobInfo jobInfo) { + return jobExtService.submitAndSync(jobInfo); + } + + @Override + public Boolean removeAndSync(List jobInfoIds) { + return jobExtService.removeAndSync(jobInfoIds); + } + + @Override + public Boolean runServerJob(Long jobInfoId) { + return jobExtService.runServerJob(jobInfoId); + } + + @Override + public Boolean changeServerJob(Long jobInfoId, Integer enable) { + return jobExtService.changeServerJob(jobInfoId, enable); + } + + @Override + public Boolean sync() { + return jobExtService.sync(); + } + + @Override + public JobInfo getJobInfoById(Long jobInfoId) { + return jobExtService.getJobInfoById(jobInfoId); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java new file mode 100644 index 000000000..750d007ab --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java @@ -0,0 +1,19 @@ +package org.springblade.job.processor.quality; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +@Component +@Data +@Slf4j +public class CycleTestTaskTimeoutProcessor implements BasicProcessor { + + @Override + public ProcessResult process(TaskContext context) throws Exception { + return null; + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java new file mode 100644 index 000000000..cb13a756b --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.quality; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.feign.IInspectionTaskClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import tech.powerjob.worker.log.OmsLogger; + +@Component +@Data +@Slf4j +public class InspectionTaskTimeoutProcessor implements BasicProcessor { + + private IInspectionTaskClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + OmsLogger log = context.getOmsLogger(); + String idString = context.getJobParams(); + Long id = Long.parseLong(idString); + client.timeout(id); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotHardnessDeleteProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotHardnessDeleteProcessor.java new file mode 100644 index 000000000..1d322e138 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotHardnessDeleteProcessor.java @@ -0,0 +1,32 @@ +package org.springblade.job.processor.quality; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.feign.IIotHardnessClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import tech.powerjob.worker.log.OmsLogger; + +/** + * 定时:每天03:00执行 + * cron:0 0 3 * * ? + */ +@Component +@Data +@Slf4j +public class IotHardnessDeleteProcessor implements BasicProcessor { + + @Resource + private IIotHardnessClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + OmsLogger log = context.getOmsLogger(); + Integer deleted = client.deleteHistory(); + log.info("deleted = {}", deleted); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotThicknessDeleteProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotThicknessDeleteProcessor.java new file mode 100644 index 000000000..7fe94bb63 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/IotThicknessDeleteProcessor.java @@ -0,0 +1,32 @@ +package org.springblade.job.processor.quality; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.feign.IIotThicknessClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import tech.powerjob.worker.log.OmsLogger; + +/** + * 定时:每天00:00执行 + * cron:0 0 0 * * ? + */ +@Component +@Data +@Slf4j +public class IotThicknessDeleteProcessor implements BasicProcessor { + + @Resource + private IIotThicknessClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + OmsLogger log = context.getOmsLogger(); + Integer deleted = client.deleteHistory(); + log.info("deleted = {}", deleted); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskGenerateProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskGenerateProcessor.java new file mode 100644 index 000000000..ea82dd454 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskGenerateProcessor.java @@ -0,0 +1,28 @@ +package org.springblade.job.processor.quality; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.feign.ILquidTankTaskClient; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import tech.powerjob.worker.log.OmsLogger; + +import java.util.List; + +@Component +@Slf4j +public class LquidTankTaskGenerateProcessor implements BasicProcessor { + + @Resource + private ILquidTankTaskClient lquidTankTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + OmsLogger log = context.getOmsLogger(); + List list = lquidTankTaskClient.generate(); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskTimeoutProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskTimeoutProcessor.java new file mode 100644 index 000000000..ec5838b3a --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskTimeoutProcessor.java @@ -0,0 +1,30 @@ +package org.springblade.job.processor.quality; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.feign.ILquidTankTaskClient; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +import tech.powerjob.worker.log.OmsLogger; + +import java.util.List; + +@Component +@Data +@Slf4j +public class LquidTankTaskTimeoutProcessor implements BasicProcessor { + + @Resource + private ILquidTankTaskClient lquidTankTaskClient; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + OmsLogger log = context.getOmsLogger(); + List list = lquidTankTaskClient.timeout(); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/package-info.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/package-info.java new file mode 100644 index 000000000..021d2b53f --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/package-info.java @@ -0,0 +1,4 @@ +/** + * 质检模块相关定时任务。 + */ +package org.springblade.job.processor.quality; \ No newline at end of file diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/service/JobExtService.java b/blade-ops/blade-job/src/main/java/org/springblade/job/service/JobExtService.java new file mode 100644 index 000000000..07685565c --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/service/JobExtService.java @@ -0,0 +1,50 @@ +package org.springblade.job.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.job.mapper.JobInfoMapper; +import org.springblade.job.pojo.entity.JobInfo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * PowerJob扩展支持服务。用来外部调用。 + */ +@Service +@Data +@Slf4j +public class JobExtService { + + @Resource + private JobInfoMapper jobInfoMapper; + @Resource + private IJobInfoService jobInfoService; + @Resource + private IJobServerService jobServerService; + + public Boolean submitAndSync(JobInfo jobInfo) { + return jobInfoService.submitAndSync(jobInfo); + } + + public Boolean removeAndSync(List jobInfoIds) { + return jobInfoService.removeAndSync(jobInfoIds); + } + + public Boolean runServerJob(Long jobInfoId) { + return jobInfoService.runServerJob(jobInfoId); + } + + public Boolean changeServerJob(Long jobInfoId, Integer enable){ + return jobInfoService.changeServerJob(jobInfoId, enable); + } + + public Boolean sync() { + return jobInfoService.sync(); + } + + public JobInfo getJobInfoById(Long jobInfoId) { + return jobInfoMapper.selectById(jobInfoId); + } +} diff --git a/blade-ops/blade-job/src/main/resources/application-dev.yml b/blade-ops/blade-job/src/main/resources/application-dev.yml index bed5d7cc7..adb342008 100644 --- a/blade-ops/blade-job/src/main/resources/application-dev.yml +++ b/blade-ops/blade-job/src/main/resources/application-dev.yml @@ -9,6 +9,7 @@ powerjob: port: 27777 server-address: 127.0.0.1:7700 + #数据源配置 spring: datasource: diff --git a/blade-ops/blade-job/target/antrun/build-main.xml b/blade-ops/blade-job/target/antrun/build-main.xml deleted file mode 100644 index 81cf5cbb3..000000000 --- a/blade-ops/blade-job/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-job/target/blade-job.jar.original b/blade-ops/blade-job/target/blade-job.jar.original deleted file mode 100644 index 868d6e46b..000000000 Binary files a/blade-ops/blade-job/target/blade-job.jar.original and /dev/null differ diff --git a/blade-ops/blade-job/target/classes/application-dev.yml b/blade-ops/blade-job/target/classes/application-dev.yml deleted file mode 100644 index bed5d7cc7..000000000 --- a/blade-ops/blade-job/target/classes/application-dev.yml +++ /dev/null @@ -1,17 +0,0 @@ -#服务器端口 -server: - port: 7770 - -#job服务配置 -powerjob: - worker: - app-name: ${spring.application.name} - port: 27777 - server-address: 127.0.0.1:7700 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} diff --git a/blade-ops/blade-job/target/classes/application-prod.yml b/blade-ops/blade-job/target/classes/application-prod.yml deleted file mode 100644 index eeea8c006..000000000 --- a/blade-ops/blade-job/target/classes/application-prod.yml +++ /dev/null @@ -1,18 +0,0 @@ -#服务器端口 -server: - port: 7770 - -#job服务配置 -powerjob: - worker: - app-name: ${spring.application.name} - port: 27777 - server-address: 127.0.0.1:7700 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - diff --git a/blade-ops/blade-job/target/classes/application-test.yml b/blade-ops/blade-job/target/classes/application-test.yml deleted file mode 100644 index efc81be27..000000000 --- a/blade-ops/blade-job/target/classes/application-test.yml +++ /dev/null @@ -1,17 +0,0 @@ -#服务器端口 -server: - port: 7770 - -#job服务配置 -powerjob: - worker: - app-name: ${spring.application.name} - port: 27777 - server-address: 127.0.0.1:7700 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobInfoMapper.xml b/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobInfoMapper.xml deleted file mode 100644 index 0c29c51cf..000000000 --- a/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobInfoMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobServerMapper.xml b/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobServerMapper.xml deleted file mode 100644 index fd8715f0c..000000000 --- a/blade-ops/blade-job/target/classes/org/springblade/job/mapper/JobServerMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-job/target/maven-archiver/pom.properties b/blade-ops/blade-job/target/maven-archiver/pom.properties deleted file mode 100644 index 4e0b6d7a4..000000000 --- a/blade-ops/blade-job/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:35 CST 2025 -groupId=org.springblade -artifactId=blade-job -version=4.6.0.RELEASE diff --git a/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 1efdd2dfc..000000000 --- a/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,16 +0,0 @@ -org\springblade\job\pojo\entity\JobInfo.class -org\springblade\job\pojo\dto\JobDTO.class -org\springblade\job\service\IJobInfoService.class -org\springblade\job\service\IJobServerService.class -org\springblade\job\mapper\JobInfoMapper.class -org\springblade\job\pojo\entity\JobServer.class -org\springblade\job\pojo\vo\JobServerVO.class -org\springblade\job\JobApplication.class -org\springblade\job\service\impl\JobServerServiceImpl$1.class -org\springblade\job\service\impl\JobServerServiceImpl.class -org\springblade\job\pojo\vo\JobInfoVO.class -org\springblade\job\processor\ProcessorDemo.class -org\springblade\job\controller\JobInfoController.class -org\springblade\job\service\impl\JobInfoServiceImpl.class -org\springblade\job\controller\JobServerController.class -org\springblade\job\mapper\JobServerMapper.class diff --git a/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f2ce20472..000000000 --- a/blade-ops/blade-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,15 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\mapper\JobServerMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\pojo\dto\JobDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\service\impl\JobInfoServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\controller\JobInfoController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\JobApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\processor\ProcessorDemo.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\service\IJobServerService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\pojo\entity\JobServer.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\controller\JobServerController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\pojo\entity\JobInfo.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\service\impl\JobServerServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\pojo\vo\JobInfoVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\pojo\vo\JobServerVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\mapper\JobInfoMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-job\src\main\java\org\springblade\job\service\IJobInfoService.java diff --git a/blade-ops/blade-log/.flattened-pom.xml b/blade-ops/blade-log/.flattened-pom.xml deleted file mode 100644 index faee12a8e..000000000 --- a/blade-ops/blade-log/.flattened-pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - org.springblade - blade-log - 4.6.0.RELEASE - blade-log - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-log/.gitignore b/blade-ops/blade-log/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-log/.gitignore +++ b/blade-ops/blade-log/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-log/blade-log.iml b/blade-ops/blade-log/blade-log.iml deleted file mode 100644 index e1e5d3649..000000000 --- a/blade-ops/blade-log/blade-log.iml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-log/target/antrun/build-main.xml b/blade-ops/blade-log/target/antrun/build-main.xml deleted file mode 100644 index 0ec876ca4..000000000 --- a/blade-ops/blade-log/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-log/target/blade-log.jar.original b/blade-ops/blade-log/target/blade-log.jar.original deleted file mode 100644 index e73eb6c64..000000000 Binary files a/blade-ops/blade-log/target/blade-log.jar.original and /dev/null differ diff --git a/blade-ops/blade-log/target/classes/application-dev.yml b/blade-ops/blade-log/target/classes/application-dev.yml deleted file mode 100644 index 8c1f22c8e..000000000 --- a/blade-ops/blade-log/target/classes/application-dev.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8103 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} diff --git a/blade-ops/blade-log/target/classes/application-prod.yml b/blade-ops/blade-log/target/classes/application-prod.yml deleted file mode 100644 index 736e57a43..000000000 --- a/blade-ops/blade-log/target/classes/application-prod.yml +++ /dev/null @@ -1,10 +0,0 @@ -#数据源配置 -server: - port: 8103 - -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - diff --git a/blade-ops/blade-log/target/classes/application-test.yml b/blade-ops/blade-log/target/classes/application-test.yml deleted file mode 100644 index a7850c2d1..000000000 --- a/blade-ops/blade-log/target/classes/application-test.yml +++ /dev/null @@ -1,9 +0,0 @@ -#数据源配置 -server: - port: 8103 - -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogApiMapper.xml b/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogApiMapper.xml deleted file mode 100644 index 6c2aca592..000000000 --- a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogApiMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogErrorMapper.xml b/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogErrorMapper.xml deleted file mode 100644 index c3fa1d66a..000000000 --- a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogErrorMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogUsualMapper.xml b/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogUsualMapper.xml deleted file mode 100644 index a08570d78..000000000 --- a/blade-ops/blade-log/target/classes/org/springblade/core/log/mapper/LogUsualMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-log/target/maven-archiver/pom.properties b/blade-ops/blade-log/target/maven-archiver/pom.properties deleted file mode 100644 index 4f1dccfb9..000000000 --- a/blade-ops/blade-log/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:42 CST 2025 -groupId=org.springblade -artifactId=blade-log -version=4.6.0.RELEASE diff --git a/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 2ae5f83b4..000000000 --- a/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,21 +0,0 @@ -org\springblade\core\log\LogApplication.class -org\springblade\core\log\service\ILogApiService.class -org\springblade\core\log\service\ILogErrorService.class -org\springblade\core\log\controller\LogErrorController.class -org\springblade\core\log\mapper\LogApiMapper.class -org\springblade\core\log\pojo\vo\LogApiVO.class -org\springblade\core\log\controller\LogUsualController.class -org\springblade\core\log\service\impl\LogApiServiceImpl.class -org\springblade\core\log\wrapper\LogUsualWrapper.class -org\springblade\core\log\service\ILogUsualService.class -org\springblade\core\log\service\impl\LogUsualServiceImpl.class -org\springblade\core\log\mapper\LogUsualMapper.class -org\springblade\core\log\controller\LogApiController.class -org\springblade\core\log\feign\LogClient.class -org\springblade\core\log\mapper\LogErrorMapper.class -org\springblade\core\log\pojo\vo\LogErrorVO.class -org\springblade\core\log\pojo\package-info.class -org\springblade\core\log\pojo\vo\LogUsualVO.class -org\springblade\core\log\wrapper\LogApiWrapper.class -org\springblade\core\log\wrapper\LogErrorWrapper.class -org\springblade\core\log\service\impl\LogErrorServiceImpl.class diff --git a/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 5a066d268..000000000 --- a/blade-ops/blade-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,21 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\pojo\vo\LogUsualVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\impl\LogErrorServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\mapper\LogApiMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\mapper\LogUsualMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\wrapper\LogApiWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\feign\LogClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\wrapper\LogErrorWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\mapper\LogErrorMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\controller\LogApiController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\ILogErrorService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\impl\LogApiServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\pojo\vo\LogErrorVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\wrapper\LogUsualWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\impl\LogUsualServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\controller\LogErrorController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\ILogApiService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\LogApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\service\ILogUsualService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\pojo\package-info.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\controller\LogUsualController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-log\src\main\java\org\springblade\core\log\pojo\vo\LogApiVO.java diff --git a/blade-ops/blade-ops.iml b/blade-ops/blade-ops.iml deleted file mode 100644 index 6ac990b5a..000000000 --- a/blade-ops/blade-ops.iml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-report/.flattened-pom.xml b/blade-ops/blade-report/.flattened-pom.xml deleted file mode 100644 index e77773d5b..000000000 --- a/blade-ops/blade-report/.flattened-pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - org.springblade - blade-report - 4.6.0.RELEASE - blade-report - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-report - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-report/.gitignore b/blade-ops/blade-report/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-report/.gitignore +++ b/blade-ops/blade-report/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-report/blade-report.iml b/blade-ops/blade-report/blade-report.iml deleted file mode 100644 index afb5a8a10..000000000 --- a/blade-ops/blade-report/blade-report.iml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-report/target/antrun/build-main.xml b/blade-ops/blade-report/target/antrun/build-main.xml deleted file mode 100644 index 3e1b92c38..000000000 --- a/blade-ops/blade-report/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-report/target/blade-report.jar.original b/blade-ops/blade-report/target/blade-report.jar.original deleted file mode 100644 index c690f2a00..000000000 Binary files a/blade-ops/blade-report/target/blade-report.jar.original and /dev/null differ diff --git a/blade-ops/blade-report/target/classes/application-dev.yml b/blade-ops/blade-report/target/classes/application-dev.yml deleted file mode 100644 index 97f23c86c..000000000 --- a/blade-ops/blade-report/target/classes/application-dev.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} diff --git a/blade-ops/blade-report/target/classes/application-prod.yml b/blade-ops/blade-report/target/classes/application-prod.yml deleted file mode 100644 index c238494f6..000000000 --- a/blade-ops/blade-report/target/classes/application-prod.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} diff --git a/blade-ops/blade-report/target/classes/application-test.yml b/blade-ops/blade-report/target/classes/application-test.yml deleted file mode 100644 index 5738832a5..000000000 --- a/blade-ops/blade-report/target/classes/application-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-ops/blade-report/target/classes/application.yml b/blade-ops/blade-report/target/classes/application.yml deleted file mode 100644 index 7b233049c..000000000 --- a/blade-ops/blade-report/target/classes/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -#服务器端口 -server: - port: 8108 - -#报表配置 -report: - enabled: true - auth: true - database: - provider: - prefix: blade- diff --git a/blade-ops/blade-report/target/maven-archiver/pom.properties b/blade-ops/blade-report/target/maven-archiver/pom.properties deleted file mode 100644 index a0f132cb1..000000000 --- a/blade-ops/blade-report/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:48 CST 2025 -groupId=org.springblade -artifactId=blade-report -version=4.6.0.RELEASE diff --git a/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 6fd248f1d..000000000 --- a/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -org\springblade\report\config\BladeReportConfiguration.class -org\springblade\report\ReportApplication.class diff --git a/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 59eb38c03..000000000 --- a/blade-ops/blade-report/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-report\src\main\java\org\springblade\report\config\BladeReportConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-report\src\main\java\org\springblade\report\ReportApplication.java diff --git a/blade-ops/blade-resource/.flattened-pom.xml b/blade-ops/blade-resource/.flattened-pom.xml deleted file mode 100644 index 91784225a..000000000 --- a/blade-ops/blade-resource/.flattened-pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - 4.0.0 - org.springblade - blade-resource - 4.6.0.RELEASE - blade-resource - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-oss - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-sms - 4.6.0.RELEASE - compile - - - com.amazonaws - aws-java-sdk-s3 - 1.12.253 - compile - - - io.minio - minio - 8.5.7 - compile - - - com.aliyun.oss - aliyun-sdk-oss - 3.16.1 - compile - - - com.aliyun - aliyun-java-sdk-core - 4.5.30 - compile - - - com.huaweicloud - esdk-obs-java - 3.22.12 - compile - - - com.qcloud - cos_api - 5.6.147 - compile - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - 3.1.1179 - compile - - - com.qiniu - qiniu-java-sdk - 7.12.1 - compile - - - com.yunpian.sdk - yunpian-java-sdk - 1.2.7 - compile - - - org.springblade - blade-starter-literule - 4.6.0.RELEASE - compile - - - org.springblade - blade-resource-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-ops/blade-resource/.gitignore b/blade-ops/blade-resource/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-ops/blade-resource/.gitignore +++ b/blade-ops/blade-resource/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-ops/blade-resource/blade-resource.iml b/blade-ops/blade-resource/blade-resource.iml deleted file mode 100644 index 648f7dcb8..000000000 --- a/blade-ops/blade-resource/blade-resource.iml +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-ops/blade-resource/target/antrun/build-main.xml b/blade-ops/blade-resource/target/antrun/build-main.xml deleted file mode 100644 index 2d66782b1..000000000 --- a/blade-ops/blade-resource/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-ops/blade-resource/target/blade-resource.jar.original b/blade-ops/blade-resource/target/blade-resource.jar.original deleted file mode 100644 index c94691ab0..000000000 Binary files a/blade-ops/blade-resource/target/blade-resource.jar.original and /dev/null differ diff --git a/blade-ops/blade-resource/target/classes/application-dev.yml b/blade-ops/blade-resource/target/classes/application-dev.yml deleted file mode 100644 index 2ef603213..000000000 --- a/blade-ops/blade-resource/target/classes/application-dev.yml +++ /dev/null @@ -1,7 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} - diff --git a/blade-ops/blade-resource/target/classes/application-prod.yml b/blade-ops/blade-resource/target/classes/application-prod.yml deleted file mode 100644 index 70e928bac..000000000 --- a/blade-ops/blade-resource/target/classes/application-prod.yml +++ /dev/null @@ -1,7 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - diff --git a/blade-ops/blade-resource/target/classes/application-test.yml b/blade-ops/blade-resource/target/classes/application-test.yml deleted file mode 100644 index 5738832a5..000000000 --- a/blade-ops/blade-resource/target/classes/application-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-ops/blade-resource/target/classes/application.yml b/blade-ops/blade-resource/target/classes/application.yml deleted file mode 100644 index 0eb39769f..000000000 --- a/blade-ops/blade-resource/target/classes/application.yml +++ /dev/null @@ -1,23 +0,0 @@ -#服务器端口 -server: - port: 8010 - -#oss默认配置 -oss: - #开启oss配置 - enabled: true - #开启oss类型 - #minio、s3、qiniu、alioss、huaweiobs、tencentcos - name: qiniu - #租户模式 - tenant-mode: true - #oss服务地址 - endpoint: http://prt1thnw3.bkt.clouddn.com - #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址 - transform-endpoint: http://localhost:9000 - #访问key - access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h - #密钥key - secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS - #存储桶 - bucket-name: bladex diff --git a/blade-ops/blade-resource/target/classes/liteflow/oss.el.png b/blade-ops/blade-resource/target/classes/liteflow/oss.el.png deleted file mode 100644 index 277968ed7..000000000 Binary files a/blade-ops/blade-resource/target/classes/liteflow/oss.el.png and /dev/null differ diff --git a/blade-ops/blade-resource/target/classes/liteflow/oss.el.xml b/blade-ops/blade-resource/target/classes/liteflow/oss.el.xml deleted file mode 100644 index 930f54e02..000000000 --- a/blade-ops/blade-resource/target/classes/liteflow/oss.el.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - THEN( - preOssRule, - SWITCH(ossCacheRule).TO( - ossReadRule, - THEN( - ossDataRule, - SWITCH(ossBuildRule).TO( - aliOssRule, - amazonS3Rule, - huaweiObsRule, - minioRule, - qiniuOssRule, - tencentCosRule, - localFileRule - ), - ossTemplateRule - ).id("ossNewRule") - ), - finallyOssRule - ); - - diff --git a/blade-ops/blade-resource/target/classes/liteflow/sms.el.png b/blade-ops/blade-resource/target/classes/liteflow/sms.el.png deleted file mode 100644 index a6feedc03..000000000 Binary files a/blade-ops/blade-resource/target/classes/liteflow/sms.el.png and /dev/null differ diff --git a/blade-ops/blade-resource/target/classes/liteflow/sms.el.xml b/blade-ops/blade-resource/target/classes/liteflow/sms.el.xml deleted file mode 100644 index 585e7f7bd..000000000 --- a/blade-ops/blade-resource/target/classes/liteflow/sms.el.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - THEN( - preSmsRule, - SWITCH(smsBuildRule).TO( - aliSmsRule, - qiniuSmsRule, - tencentSmsRule, - yunpianSmsRule, - cacheSmsRule - ), - finallySmsRule - ); - - diff --git a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/AttachMapper.xml b/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/AttachMapper.xml deleted file mode 100644 index 100fe46d6..000000000 --- a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/AttachMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/OssMapper.xml b/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/OssMapper.xml deleted file mode 100644 index 96fdb573b..000000000 --- a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/OssMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/SmsMapper.xml b/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/SmsMapper.xml deleted file mode 100644 index 1f60a595f..000000000 --- a/blade-ops/blade-resource/target/classes/org/springblade/resource/mapper/SmsMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-resource/target/maven-archiver/pom.properties b/blade-ops/blade-resource/target/maven-archiver/pom.properties deleted file mode 100644 index 1295ee12b..000000000 --- a/blade-ops/blade-resource/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:56 CST 2025 -groupId=org.springblade -artifactId=blade-resource -version=4.6.0.RELEASE diff --git a/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index c69ce1f44..000000000 --- a/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,52 +0,0 @@ -org\springblade\resource\builder\OssBuilder.class -org\springblade\resource\rule\sms\TencentSmsRule.class -org\springblade\resource\rule\oss\OssTemplateRule.class -org\springblade\resource\service\impl\SmsServiceImpl.class -org\springblade\resource\rule\oss\OssReadRule.class -org\springblade\resource\rule\constant\OssRuleConstant.class -org\springblade\resource\service\IOssService.class -org\springblade\resource\controller\SmsController.class -org\springblade\resource\mapper\AttachMapper.class -org\springblade\resource\rule\oss\QiniuOssRule.class -org\springblade\resource\config\BladeSmsConfiguration.class -org\springblade\resource\endpoint\OssEndpoint.class -org\springblade\resource\rule\oss\TencentCosRule.class -org\springblade\resource\wrapper\SmsWrapper.class -org\springblade\resource\rule\sms\FinallySmsRule.class -org\springblade\resource\rule\oss\FinallyOssRule.class -org\springblade\resource\rule\context\OssContext$OssContextBuilder.class -org\springblade\resource\endpoint\SmsEndpoint.class -org\springblade\resource\rule\oss\AmazonS3Rule.class -org\springblade\resource\rule\oss\OssBuildRule.class -org\springblade\resource\rule\oss\AliOssRule.class -org\springblade\resource\rule\sms\PreSmsRule.class -org\springblade\resource\config\BladeOssConfiguration.class -org\springblade\resource\rule\context\SmsContext.class -org\springblade\resource\rule\oss\LocalFileRule.class -org\springblade\resource\service\impl\AttachServiceImpl.class -org\springblade\resource\rule\sms\CacheSmsRule.class -org\springblade\resource\controller\AttachController.class -org\springblade\resource\rule\builder\SmsRuleBuilder.class -org\springblade\resource\rule\context\OssContext.class -org\springblade\resource\rule\constant\SmsRuleConstant.class -org\springblade\resource\mapper\SmsMapper.class -org\springblade\resource\rule\sms\AliSmsRule.class -org\springblade\resource\wrapper\OssWrapper.class -org\springblade\resource\mapper\OssMapper.class -org\springblade\resource\rule\builder\OssRuleBuilder.class -org\springblade\resource\rule\oss\HuaweiObsRule.class -org\springblade\resource\builder\SmsBuilder.class -org\springblade\resource\rule\oss\MinioRule.class -org\springblade\resource\rule\oss\PreOssRule.class -org\springblade\resource\controller\OssController.class -org\springblade\resource\ResourceApplication.class -org\springblade\resource\service\impl\OssServiceImpl.class -org\springblade\resource\service\IAttachService.class -org\springblade\resource\rule\sms\QiniuSmsRule.class -org\springblade\resource\rule\sms\SmsBuildRule.class -org\springblade\resource\rule\oss\OssCacheRule.class -org\springblade\resource\feign\SmsClient.class -org\springblade\resource\rule\context\SmsContext$SmsContextBuilder.class -org\springblade\resource\rule\sms\YunpianSmsRule.class -org\springblade\resource\rule\oss\OssDataRule.class -org\springblade\resource\service\ISmsService.class diff --git a/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index ff3897128..000000000 --- a/blade-ops/blade-resource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,50 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\MinioRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\SmsBuildRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\ISmsService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\TencentCosRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\IOssService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\LocalFileRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\impl\SmsServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\controller\SmsController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\impl\OssServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\feign\SmsClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\config\BladeSmsConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\builder\SmsRuleBuilder.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\constant\SmsRuleConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\constant\OssRuleConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\builder\OssRuleBuilder.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\ResourceApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\AliOssRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\impl\AttachServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\builder\OssBuilder.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\PreSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\wrapper\OssWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\OssCacheRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\QiniuSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\wrapper\SmsWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\builder\SmsBuilder.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\AliSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\endpoint\SmsEndpoint.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\PreOssRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\AmazonS3Rule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\FinallyOssRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\controller\AttachController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\OssTemplateRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\OssDataRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\config\BladeOssConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\YunpianSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\OssBuildRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\FinallySmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\CacheSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\context\OssContext.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\endpoint\OssEndpoint.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\mapper\SmsMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\mapper\OssMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\HuaweiObsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\service\IAttachService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\controller\OssController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\mapper\AttachMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\context\SmsContext.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\sms\TencentSmsRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\QiniuOssRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-ops\blade-resource\src\main\java\org\springblade\resource\rule\oss\OssReadRule.java diff --git a/blade-ops/blade-workflow/.flattened-pom.xml b/blade-ops/blade-workflow/.flattened-pom.xml deleted file mode 100644 index 7e7cb8ff7..000000000 --- a/blade-ops/blade-workflow/.flattened-pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - org.springblade - blade-workflow - 1.14.0.RELEASE - blade-workflow - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - org.springblade - blade-user-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-system-api - 4.6.0.RELEASE - compile - - - org.flowable - flowable-spring-boot-starter - 7.1.0 - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-plugin-api/.flattened-pom.xml b/blade-plugin-api/.flattened-pom.xml deleted file mode 100644 index 5ce574bdd..000000000 --- a/blade-plugin-api/.flattened-pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - org.springblade - blade-plugin-api - 4.6.0.RELEASE - pom - blade-plugin-api - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-plugin-api/README.md b/blade-plugin-api/README.md deleted file mode 100644 index 8daaac47e..000000000 --- a/blade-plugin-api/README.md +++ /dev/null @@ -1,15 +0,0 @@ -## 目录说明 -- 此目录为插件系统专用 -- 插件为商业用户独立开发维护并上架至应用市场 -- 获得插件后请根据提供的文档复制到对应目录并刷新工程构建便可生效 - -## 市场简介 -- 随着商业用户的增加，需求也在不断增加，我们相信任何一个框架的功能都无法做到满足所有人的需求 -- 为了满足商业用户的大量需求，需要一个平台来综合处理，经过一年的努力调研，我们的平台终于来了 -- BladeX 应用市场是官方架设的一个平台，邀请独立开发的商业用户与官方共同构建生态合作共赢 -- 独立开发的商业用户将自己基于BladeX拓展的插件应用提交给官方审核上架获得额外收入 -- 有需求的商业用户就能在应用市场更方便更省钱更省时地拿到所需要的功能模块 -- 在应用市场您可以找到各种拓展增强后的插件与应用，也可以很方便地集成到BladeX架构内 -- 我们的愿景是打造一个庞大的生态圈，相信在用户与官方的默契配合下，BladeX可以走得更远 -- 市场地址：https://bladex.cn/#/market -- 入驻须知：https://bladex.cn/#/market/notice \ No newline at end of file diff --git a/blade-plugin-api/blade-plugin-api.iml b/blade-plugin-api/blade-plugin-api.iml deleted file mode 100644 index e6b616b9f..000000000 --- a/blade-plugin-api/blade-plugin-api.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-plugin-api/pom.xml b/blade-plugin-api/pom.xml deleted file mode 100644 index 319c90cb4..000000000 --- a/blade-plugin-api/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - jonhon-mes-svr - org.springblade - ${revision} - - 4.0.0 - - blade-plugin-api - ${project.artifactId} - pom - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - ${project.name} - - - - - - diff --git a/blade-plugin/.flattened-pom.xml b/blade-plugin/.flattened-pom.xml deleted file mode 100644 index fd8c3c638..000000000 --- a/blade-plugin/.flattened-pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - org.springblade - blade-plugin - 4.6.0.RELEASE - pom - blade-plugin - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-plugin/README.md b/blade-plugin/README.md deleted file mode 100644 index 8daaac47e..000000000 --- a/blade-plugin/README.md +++ /dev/null @@ -1,15 +0,0 @@ -## 目录说明 -- 此目录为插件系统专用 -- 插件为商业用户独立开发维护并上架至应用市场 -- 获得插件后请根据提供的文档复制到对应目录并刷新工程构建便可生效 - -## 市场简介 -- 随着商业用户的增加，需求也在不断增加，我们相信任何一个框架的功能都无法做到满足所有人的需求 -- 为了满足商业用户的大量需求，需要一个平台来综合处理，经过一年的努力调研，我们的平台终于来了 -- BladeX 应用市场是官方架设的一个平台，邀请独立开发的商业用户与官方共同构建生态合作共赢 -- 独立开发的商业用户将自己基于BladeX拓展的插件应用提交给官方审核上架获得额外收入 -- 有需求的商业用户就能在应用市场更方便更省钱更省时地拿到所需要的功能模块 -- 在应用市场您可以找到各种拓展增强后的插件与应用，也可以很方便地集成到BladeX架构内 -- 我们的愿景是打造一个庞大的生态圈，相信在用户与官方的默契配合下，BladeX可以走得更远 -- 市场地址：https://bladex.cn/#/market -- 入驻须知：https://bladex.cn/#/market/notice \ No newline at end of file diff --git a/blade-plugin/blade-plugin.iml b/blade-plugin/blade-plugin.iml deleted file mode 100644 index e6b616b9f..000000000 --- a/blade-plugin/blade-plugin.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/.flattened-pom.xml b/blade-service-api/.flattened-pom.xml deleted file mode 100644 index 967a77f83..000000000 --- a/blade-service-api/.flattened-pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - org.springblade - blade-service-api - 4.6.0.RELEASE - pom - blade-service-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-desk-api/.flattened-pom.xml b/blade-service-api/blade-desk-api/.flattened-pom.xml deleted file mode 100644 index c680eae24..000000000 --- a/blade-service-api/blade-desk-api/.flattened-pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - org.springblade - blade-desk-api - 4.6.0.RELEASE - blade-desk-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-data-record - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-desk-api/.gitignore b/blade-service-api/blade-desk-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-desk-api/.gitignore +++ b/blade-service-api/blade-desk-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-desk-api/blade-desk-api.iml b/blade-service-api/blade-desk-api/blade-desk-api.iml deleted file mode 100644 index 6d1e677ce..000000000 --- a/blade-service-api/blade-desk-api/blade-desk-api.iml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java new file mode 100644 index 000000000..1d4b1fa05 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java @@ -0,0 +1,62 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 化验含量 + * + * @TableName MES_ASSAY_CONTENT + */ +@TableName(value = "MES_ASSAY_CONTENT") +@Data +public class AssayContent extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + /** + * 作业中心 + */ + @TableField(value = "WC_ID") + private Long WC_ID; + + /** + * 化验人 + */ + @TableField(value = "ASSAY_MAN") + private Long ASSAY_MAN; + + /** + * 化验时间 + */ + @TableField(value = "ASSAY_TIME") + private Date ASSAY_TIME; + + /** + * 申报状态 + */ + @TableField(value = "APPLY_STATUS") + private Long APPLY_STATUS; + + /** + * 金钾申报量 + */ + @TableField(value = "GOLD_POTASSIUM") + private BigDecimal GOLD_POTASSIUM; + + /** + * 银钾申报量 + */ + @TableField(value = "SILVER_POTASSIUM") + private BigDecimal SILVER_POTASSIUM; + + /** + * 银板申报量 + */ + @TableField(value = "SILVER_PLATE") + private BigDecimal SILVER_PLATE; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContentDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContentDetail.java new file mode 100644 index 000000000..47b42807b --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContentDetail.java @@ -0,0 +1,62 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; + +/** + * 化验含量明细 + * + * @TableName MES_ASSAY_CONTENT_DETAIL + */ +@TableName(value = "MES_ASSAY_CONTENT_DETAIL") +@Data +public class AssayContentDetail extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + /** + * 化验记录 + */ + @TableField(value = "AC_ID") + private Long AC_ID; + + /** + * 槽号 + */ + @TableField(value = "SLOT") + private String SLOT; + + /** + * 化验值 + */ + @TableField(value = "TEST_VAL") + private BigDecimal TEST_VAL; + + /** + * 申报添加金钾 + */ + @TableField(value = "SAVE_GOLD_VAL") + private BigDecimal SAVE_GOLD_VAL; + + /** + * 申报添加银钾 + */ + @TableField(value = "SAVE_SILVER_VAL") + private BigDecimal SAVE_SILVER_VAL; + + /** + * 申报添加银板 + */ + @TableField(value = "SAVE_BOARD_VAL") + private BigDecimal SAVE_BOARD_VAL; + + /** + * 实际值 + */ + @TableField(value = "ACTUAL_VAL") + private BigDecimal ACTUAL_VAL; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlan.java new file mode 100644 index 000000000..14bf3a524 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlan.java @@ -0,0 +1,128 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +/** + * 烧结模具计划 + * + * @TableName MES_MOLD_PLAN + */ +@TableName(value = "MES_MOLD_PLAN") +@Data +public class MoldPlan extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 模具编码 + */ + @TableField(value = "MO_CODE") + private String MO_CODE; + + /** + * 模具名称 + */ + @TableField(value = "MO_NAME") + private String MO_NAME; + + /** + * 数量 + */ + @TableField(value = "QUANTITY") + private Long QUANTITY; + + /** + * erpId + */ + @TableField(value = "ERP_ID") + private Long ERP_ID; + + /** + * 生产计划id + */ + @TableField(value = "YP_ID") + private Long YP_ID; + + /** + * + */ + @TableField(value = "ERP_WO_CODE") + private String ERP_WO_CODE; + + /** + * 状态;1、新建，2、已下发，3、已完成 + */ + @TableField(value = "MAF_STATUS") + private Long MAF_STATUS; + + /** + * 计划类型名称 + */ + @TableField(value = "PLAN_TYPE") + private String PLAN_TYPE; + + /** + * 需求日期 + */ + @TableField(value = "NEED_DATE") + private Date NEED_DATE; + + /** + * 保管员 + */ + @TableField(value = "KEEPER") + private Long KEEPER; + + /** + * 下达人 + */ + @TableField(value = "RELEASER") + private Long RELEASER; + + /** + * 生产标识 + */ + @TableField(value = "QUA_LEVEL") + private String QUA_LEVEL; + + /** + * + */ + @TableField(value = "PLAN_TYPE_NAME") + private String PLAN_TYPE_NAME; + + /** + * 零件编码 + */ + @TableField(value = "PART_CODE") + private String PART_CODE; + + /** + * 零件名称 + */ + @TableField(value = "PART_NAME") + private String PART_NAME; + + /** + * 备注 + */ + @TableField(value = "MEMO") + private String MEMO; + + /** + * 类型;1、热表，烧结，2、仓库 + */ + @TableField(value = "MAF_TYPE") + private Long MAF_TYPE; + + /** + * 紧急状态 + */ + @TableField(value = "URGENT_TYPE") + private String URGENT_TYPE; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java new file mode 100644 index 000000000..e4e8928b9 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java @@ -0,0 +1,24 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 烧结模具计划-订单关联表 + * + * @TableName MES_MOLD_PLAN_ORDER + */ +@TableName(value = "MES_MOLD_PLAN_ORDER") +@Data +public class MoldPlanOrder extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 烧结模具计划ID + */ + @TableField(value = "MP_ID") + private Long MP_ID; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanTool.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanTool.java new file mode 100644 index 000000000..773ea1dd2 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanTool.java @@ -0,0 +1,31 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 烧结模具计划-工装关联表 + * + * @TableName MES_MOLD_PLAN_TOOL + */ +@TableName(value = "MES_MOLD_PLAN_TOOL") +@Data +public class MoldPlanTool extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 烧结模具计划ID + */ + @TableField(value = "MP_ID") + private Long MP_ID; + + /** + * 生产订单id + */ + @TableField(value = "TOOL_ID") + private Long TOOL_ID; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java new file mode 100644 index 000000000..2bc039011 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java @@ -0,0 +1,81 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; + +/** + * 镀层物料申报添加量 + * + * @TableName MES_PLATE_GOODS_APPLY + */ +@TableName(value = "MES_PLATE_GOODS_APPLY") +@Data +public class PlateGoodsApply extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 镀层物料号 + */ + @TableField(value = "GOODS_CODE") + private String GOODS_CODE; + + /** + * 申报镀层 + */ + @TableField(value = "GOODS_DEMAND") + private BigDecimal GOODS_DEMAND; + + /** + * 审批状态 + */ + @TableField(value = "APPROVAL_STATUS") + private Long APPROVAL_STATUS; + + /** + * 采购Id + */ + @TableField(value = "BO_ID") + private Long BO_ID; + + /** + * 领料单Id + */ + @TableField(value = "BR_ID") + private Long BR_ID; + + /** + * + */ + @TableField(value = "AC_ID") + private Long AC_ID; + + /** + * + */ + @TableField(value = "PGR_ID") + private Long PGR_ID; + + /** + * + */ + @TableField(value = "WC_ID") + private Long WC_ID; + + /** + * 涉及单号 + */ + @TableField(value = "INVOLVE_CODE") + private String INVOLVE_CODE; + + /** + * 涉及单号及数量 + */ + @TableField(value = "CODE_NUM") + private String CODE_NUM; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApplyDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApplyDetail.java new file mode 100644 index 000000000..df1c701d8 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApplyDetail.java @@ -0,0 +1,51 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; + +/** + * 镀层物料添加量申报明细 + * + * @TableName MES_PLATE_GOODS_APPLY_DETAIL + */ +@TableName(value = "MES_PLATE_GOODS_APPLY_DETAIL") +@Data +public class PlateGoodsApplyDetail extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value = "GOODS_CODE") + private String GOODS_CODE; + + /** + * + */ + @TableField(value = "GOODS_DEMAND") + private BigDecimal GOODS_DEMAND; + + /** + * + */ + @TableField(value = "APPROVAL_STATUS") + private Long APPROVAL_STATUS; + + /** + * 添加量申报ID + */ + @TableField(value = "PGAD_ID") + private Long PGAD_ID; + + /** + * 涉及单号 + */ + @TableField(value = "INVOLVE_CODE") + private String INVOLVE_CODE; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java new file mode 100644 index 000000000..716a21fcf --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java @@ -0,0 +1,124 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 镀层物料额外需求上报 + * + * @TableName MES_PLATE_GOODS_RECORD + */ +@TableName(value = "MES_PLATE_GOODS_RECORD") +@Data +public class PlateGoodsRecord extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 作业中心 + */ + @TableField(value = "WC_ID") + private Long WC_ID; + + /** + * 镀层物料 + */ + @TableField(value = "PLATE_GOODS_CODE") + private String PLATE_GOODS_CODE; + + /** + * 物料需求定额 + */ + @TableField(value = "GOODS_DEMAND") + private BigDecimal GOODS_DEMAND; + + /** + * 上报银钾 + */ + @TableField(value = "SILVER_POTASSIUM") + private BigDecimal SILVER_POTASSIUM; + + /** + * 银钾系数 + */ + @TableField(value = "COEFFICIENT") + private BigDecimal COEFFICIENT; + + /** + * 审批人 + */ + @TableField(value = "APPROVAL_MAN") + private Long APPROVAL_MAN; + + /** + * 审批时间 + */ + @TableField(value = "APPROVAL_TIME") + private Date APPROVAL_TIME; + + /** + * 审批状态 + */ + @TableField(value = "APPROVAL_STATUS") + private Long APPROVAL_STATUS; + + /** + * 审批结果 + */ + @TableField(value = "APPROVAL_MEMO") + private String APPROVAL_MEMO; + + /** + * 已申报定额 + */ + @TableField(value = "DECLARED_QUOTA") + private BigDecimal DECLARED_QUOTA; + + /** + * 已申报银钾 + */ + @TableField(value = "DECLARED_SILVER") + private BigDecimal DECLARED_SILVER; + + /** + * 申报状态 + */ + @TableField(value = "DECLARED_STATUS") + private Long DECLARED_STATUS; + + /** + * 物料采购id + */ + @TableField(value = "GOODS_BO_ID") + private Long GOODS_BO_ID; + + /** + * 银钾采购id + */ + @TableField(value = "COEFFICIENT_BO_ID") + private Long COEFFICIENT_BO_ID; + + /** + * + */ + @TableField(value = "PGR_CODE") + private String PGR_CODE; + + /** + * 剩余量 + */ + @TableField(value = "SURPLUS") + private BigDecimal SURPLUS; + + /** + * 上报银钾剩余量 + */ + @TableField(value = "SILVER_POTASSIUM_RESIDUE") + private BigDecimal SILVER_POTASSIUM_RESIDUE; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java new file mode 100644 index 000000000..7be6750e1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java @@ -0,0 +1,31 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 镀层物料需求申报明细 + * + * @TableName MES_PLATE_GOODS_RECORD_DETAIL + */ +@TableName(value = "MES_PLATE_GOODS_RECORD_DETAIL") +@Data +public class PlateGoodsRecordDetail extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 申报ID + */ + @TableField(value = "PGRD_ID") + private Long PGRD_ID; + + /** + * 生产订单ID + */ + @TableField(value = "YO_ID") + private String YO_ID; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldError.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldError.java new file mode 100644 index 000000000..8d4e4a2ac --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldError.java @@ -0,0 +1,43 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 异常订单 + * + * @TableName MES_YIELD_ERROR + */ +@TableName(value = "MES_YIELD_ERROR") +@Data +public class YieldError extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 生产计划ID + */ + @TableField(value = "YP_ID") + private Long YP_ID; + + /** + * 生产订单ID + */ + @TableField(value = "YO_ID") + private Long YO_ID; + + /** + * 异常类型，1：数据缺失，2：工艺缺失，3：资源缺失，2：交期冲突 + */ + @TableField(value = "EX_TYPE") + private Long EX_TYPE; + + /** + * 异常原因 + */ + @TableField(value = "EX_MEMO") + private String EX_MEMO; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java new file mode 100644 index 000000000..d6f98818c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java @@ -0,0 +1,316 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单 + * + * @TableName MES_YIELD_ORDER + */ +@TableName(value = "MES_YIELD_ORDER") +@Data +public class YieldOrder extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 生产单号 + */ + @TableField(value = "YO_CODE") + private String YO_CODE; + + /** + * 计划单号 + */ + @TableField(value = "YP_CODE") + private String YP_CODE; + + /** + * 零件号 + */ + @TableField(value = "PART_CODE") + private String PART_CODE; + + /** + * 产品型号 + */ + @TableField(value = "PRODUCT_TYPE") + private String PRODUCT_TYPE; + + /** + * 名称 + */ + @TableField(value = "PART_NAME") + private String PART_NAME; + + /** + * 镀种 + */ + @TableField(value = "PLATE") + private String PLATE; + + /** + * 生产标识 + */ + @TableField(value = "PRODUCT_IDENT") + private String PRODUCT_IDENT; + + /** + * 使用部门 + */ + @TableField(value = "USE_DEPT") + private String USE_DEPT; + + /** + * 面积（㎡） + */ + @TableField(value = "YP_AREA") + private BigDecimal YP_AREA; + + /** + * 需求交期 + */ + @TableField(value = "DEMAND_DATE") + private Date DEMAND_DATE; + + /** + * 计划员 + */ + @TableField(value = "PLAN_USER") + private String PLAN_USER; + + /** + * 计划下达时间 + */ + @TableField(value = "RELEASE_DATE") + private Date RELEASE_DATE; + + /** + * 备注 + */ + @TableField(value = "MEMO") + private String MEMO; + + /** + * 路线卡号 + */ + @TableField(value = "CARD_NO") + private String CARD_NO; + + /** + * 批次号 + */ + @TableField(value = "BATCH_NO") + private String BATCH_NO; + + /** + * 场内生产 + */ + @TableField(value = "SITE_WORK") + private String SITE_WORK; + + /** + * 生产数量 + */ + @TableField(value = "YP_QTY") + private Long YP_QTY; + + /** + * 同步日期 + */ + @TableField(value = "SYNC_TIME") + private Date SYNC_TIME; + + /** + * 状态 + */ + @TableField(value = "CUR_STATUS") + private Long CUR_STATUS; + + /** + * B号 + */ + @TableField(value = "ROAM_NO") + private String ROAM_NO; + + /** + * 一级路线 + */ + @TableField(value = "PRIMARY_CRAFT") + private String PRIMARY_CRAFT; + + /** + * 下级B号 + */ + @TableField(value = "NEXT_ROAM") + private String NEXT_ROAM; + + /** + * + */ + @TableField(value = "PDM_URL") + private String PDM_URL; + + /** + * + */ + @TableField(value = "PRIORITY") + private Long PRIORITY; + + /** + * 保管员 + */ + @TableField(value = "CUSTODIAN") + private String CUSTODIAN; + + /** + * 返工单号 + */ + @TableField(value = "REWORK_CODE") + private String REWORK_CODE; + + /** + * 返工顺序 + */ + @TableField(value = "REWORK_NO") + private Long REWORK_NO; + + /** + * + */ + @TableField(value = "ENTRUST_DEPT") + private String ENTRUST_DEPT; + + /** + * 返工意见 + */ + @TableField(value = "REWORK_MEMO") + private String REWORK_MEMO; + + /** + * 失败原因 + */ + @TableField(value = "FAILURE_MEMO") + private String FAILURE_MEMO; + + /** + * 业务类型 + */ + @TableField(value = "BUSINESS_TYPE") + private Long BUSINESS_TYPE; + + /** + * 分派失败人员 + */ + @TableField(value = "FAILURE_MAN") + private Long FAILURE_MAN; + + /** + * 接收时间 + */ + @TableField(value = "FAILURE_TIME") + private Date FAILURE_TIME; + + /** + * + */ + @TableField(value = "RECSEQ_NO") + private String RECSEQ_NO; + + /** + * + */ + @TableField(value = "CART_ID") + private Long CART_ID; + + /** + * 手动增加 + */ + @TableField(value = "MANUAL_INCREASE") + private String MANUAL_INCREASE; + + /** + * + */ + @TableField(value = "YIELD_TYPE") + private Long YIELD_TYPE; + + /** + * 父级订单Id + */ + @TableField(value = "FATHER_YO_ID") + private Long FATHER_YO_ID; + + /** + * + */ + @TableField(value = "NEWLEV_FLAG") + private String NEWLEV_FLAG; + + /** + * 是否可生产;0:否 1：是 + */ + @TableField(value = "PRODUCE_BOOL") + private String PRODUCE_BOOL; + + /** + * 使用部门代码 + */ + @TableField(value = "USE_DEPT_CODE") + private String USE_DEPT_CODE; + + /** + * 产品系列（mes_yield_plan.PRODUCT_line） + */ + @TableField(value = "YP_PRODUCT_LINE") + private String YP_PRODUCT_LINE; + + /** + * 工作订单备注（mes_yield_plan.memo） + */ + @TableField(value = "YP_MEMO") + private String YP_MEMO; + + /** + * 烧结石墨模准备状态 + */ + @TableField(value = "SJ_MOLD_PREPARATION") + private Long SJ_MOLD_PREPARATION; + + /** + * 烧结齐套流转状态 + */ + @TableField(value = "SJ_KIT_PREPARATION") + private Long SJ_KIT_PREPARATION; + + /** + * 配套人 + */ + @TableField(value = "PK_USERNAME") + private String PK_USERNAME; + + /** + * 配套时间 + */ + @TableField(value = "PK_DATE") + private Date PK_DATE; + + /** + * 流转人 + */ + @TableField(value = "KIT_PREPARATION_MAN") + private String KIT_PREPARATION_MAN; + + /** + * 流转时间 + */ + @TableField(value = "KIT_PREPARATION_TIME") + private Date KIT_PREPARATION_TIME; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java new file mode 100644 index 000000000..5b6c4bf49 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java @@ -0,0 +1,99 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单工艺 + * + * @TableName MES_YIELD_ORDER_CRAFT + */ +@TableName(value = "MES_YIELD_ORDER_CRAFT") +@Data +public class YieldOrderCraft extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 生产订单 + */ + @TableField(value = "YO_ID") + private String YO_ID; + + /** + * C号 + */ + @TableField(value = "CRAFT_NO") + private String CRAFT_NO; + + /** + * 序号 + */ + @TableField(value = "PROCESS_NO") + private String PROCESS_NO; + + /** + * 工序 + */ + @TableField(value = "PPS_ID") + private Long PPS_ID; + + /** + * 工艺描述 + */ + @TableField(value = "MAKE_MEMO") + private String MAKE_MEMO; + + /** + * + */ + @TableField(value = "HOUR_QUOTA") + private BigDecimal HOUR_QUOTA; + + /** + * + */ + @TableField(value = "PID") + private Long PID; + + /** + * + */ + @TableField(value = "START_TIME") + private Date START_TIME; + + /** + * + */ + @TableField(value = "END_TIME") + private Date END_TIME; + + /** + * 加工班组 + */ + @TableField(value = "MAKE_TEAM") + private Long MAKE_TEAM; + + /** + * 外协商 + */ + @TableField(value = "OC_ID") + private Long OC_ID; + + /** + * 工艺能力;外键（工艺能力） + */ + @TableField(value = "CA_ID") + private Long CA_ID; + + /** + * 返工工序id + */ + @TableField(value = "RP_ID") + private Long RP_ID; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldPlan.java new file mode 100644 index 000000000..08ed4bdee --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldPlan.java @@ -0,0 +1,196 @@ +package org.springblade.desk.order.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产计划 + * + * @TableName MES_YIELD_PLAN + */ +@TableName(value = "MES_YIELD_PLAN") +@Data +public class YieldPlan extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 订单单号 + */ + @TableField(value = "YP_CODE") + private String YP_CODE; + + /** + * 零件号 + */ + @TableField(value = "PART_CODE") + private String PART_CODE; + + /** + * 产品型号 + */ + @TableField(value = "PRODUCT_TYPE") + private String PRODUCT_TYPE; + + /** + * 名称 + */ + @TableField(value = "PART_NAME") + private String PART_NAME; + + /** + * 镀种 + */ + @TableField(value = "PLATE") + private String PLATE; + + /** + * 生产标识 + */ + @TableField(value = "PRODUCT_IDENT") + private String PRODUCT_IDENT; + + /** + * 使用部门 + */ + @TableField(value = "USE_DEPT") + private String USE_DEPT; + + /** + * 数量 + */ + @TableField(value = "YP_QTY") + private Long YP_QTY; + + /** + * 面积（㎡） + */ + @TableField(value = "YP_AREA") + private BigDecimal YP_AREA; + + /** + * 需求交期 + */ + @TableField(value = "DEMAND_DATE") + private Date DEMAND_DATE; + + /** + * 计划员 + */ + @TableField(value = "PLAN_USER") + private String PLAN_USER; + + /** + * 计划下达时间 + */ + @TableField(value = "RELEASE_DATE") + private Date RELEASE_DATE; + + /** + * 当前B号 + */ + @TableField(value = "ROAM_NO") + private String ROAM_NO; + + /** + * 已交件数量 + */ + @TableField(value = "DELIVERY_QTY") + private Long DELIVERY_QTY; + + /** + * 已分批数量 + */ + @TableField(value = "ALREADY_BRANCH_QTY") + private Long ALREADY_BRANCH_QTY; + + /** + * 状态;1.正常，2.已退回，3.已派工，4，加工中，20已完工，21已作废 + */ + @TableField(value = "CUR_STATUS") + private Long CUR_STATUS; + + /** + * 一级工艺线路 + */ + @TableField(value = "PRIMARY_CRAFT") + private String PRIMARY_CRAFT; + + /** + * 同步日期 + */ + @TableField(value = "SYNC_TIME") + private Date SYNC_TIME; + + /** + * 主制部门 + */ + @TableField(value = "DOMINANT_DEPT") + private String DOMINANT_DEPT; + + /** + * 备注 + */ + @TableField(value = "MEMO") + private String MEMO; + + /** + * + */ + @TableField(value = "ROUTE_NO") + private String ROUTE_NO; + + /** + * + */ + @TableField(value = "CUSTODIAN") + private String CUSTODIAN; + + /** + * 镀种小类 + */ + @TableField(value = "BPS_ID") + private Long BPS_ID; + + /** + * 优先级;1.正常，2.项目要求日期急件，3.合同急件，4.绩效零件，5.调度标注急件 + */ + @TableField(value = "PRIORITY") + private Long PRIORITY; + + /** + * + */ + @TableField(value = "PLAN_TYPE") + private Long PLAN_TYPE; + + /** + * 是否确认;是否确认(烧结计划专用，默认为空，1是代表确认，烧结计划不显示) + */ + @TableField(value = "SURE_TYPE") + private Long SURE_TYPE; + + /** + * 关闭人 + */ + @TableField(value = "CLOSE_MAN") + private Long CLOSE_MAN; + + /** + * 关闭时间 + */ + @TableField(value = "CLOSE_TIME") + private Date CLOSE_TIME; + + /** + * 产品系列 + */ + @TableField(value = "PRODUCT_LINE") + private String PRODUCT_LINE; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java new file mode 100644 index 000000000..84f0cb3db --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface ICycleTestTaskClient { + + String API_PREFIX = "/feign/client/qa/cycle-test-task"; + + String TIMEOUT = API_PREFIX + "/timeout"; + + @GetMapping(TIMEOUT) + public Boolean timeout(Long id); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IInspectionTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IInspectionTaskClient.java new file mode 100644 index 000000000..b5c2a1b22 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IInspectionTaskClient.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IInspectionTaskClient { + + String API_PREFIX = "/feign/client/qa/inspection-task"; + + String TIMEOUT = API_PREFIX + "/timeout"; + + @GetMapping(TIMEOUT) + public Boolean timeout(Long id); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotHardnessClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotHardnessClient.java new file mode 100644 index 000000000..644b460b1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotHardnessClient.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IIotHardnessClient { + + String API_PREFIX = "/feign/client/qa/iot-hardness"; + + String DELETE_HISTORY = API_PREFIX + "/delete-history"; + + @GetMapping(DELETE_HISTORY) + public Integer deleteHistory(); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotThicknessClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotThicknessClient.java new file mode 100644 index 000000000..818c05b76 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IIotThicknessClient.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IIotThicknessClient { + + String API_PREFIX = "/feign/client/qa/iot-thickness"; + + String DELETE_HISTORY = API_PREFIX + "/delete-history"; + + @GetMapping(DELETE_HISTORY) + public Integer deleteHistory(); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java new file mode 100644 index 000000000..162b8a438 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java @@ -0,0 +1,26 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface ILquidTankTaskClient { + + String API_PREFIX = "/feign/client/qa/lquid-tank-task"; + + String GENERATE = API_PREFIX + "/generate"; + + String TIMEOUT = API_PREFIX + "/timeout"; + + @GetMapping(GENERATE) + public List generate(); + + @GetMapping(TIMEOUT) + public List timeout(); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IQAIotTraceClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IQAIotTraceClient.java new file mode 100644 index 000000000..8c033c3aa --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IQAIotTraceClient.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IQAIotTraceClient { + + String API_PREFIX = "/feign/client/qa/qa-iot-trace"; + + String GET_TRACE_DATA = API_PREFIX + "/get-trace-data"; + + @GetMapping(GET_TRACE_DATA) + public Boolean getTraceData(); +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java new file mode 100644 index 000000000..fdbeb9096 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -0,0 +1,246 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [槽液检测任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@Schema(description = "LiquidTankTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [槽液检测任务]编码 + */ + @Schema(description = "[槽液检测任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long liquidTankTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [槽液]id + */ + @Schema(description = "[槽液]id") + private Long liquidTankId; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long workCenterId; + /** + * 药品[物料]id + */ + @Schema(description = "药品[物料]id") + private Long drugMaterialId; + /** + * [槽液]编号 + */ + @Schema(description = "[槽液]编号") + private String liquidTankCode; + /** + * 待测成分 + */ + @Schema(description = "待测成分") + private String testElement; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品[物料]编码 + */ + @Schema(description = "药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @Schema(description = "药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @Schema(description = "工艺含量") + private String processContent; + /** + * 目标值 + */ + @Schema(description = "目标值") + private Long targetValue; + /** + * 目标上下限 + */ + @Schema(description = "目标上下限") + private String bound; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 添加点 + */ + @Schema(description = "添加点") + private BigDecimal fillingLocation; + /** + * 电导率测量值 + */ + @Schema(description = "电导率测量值") + private BigDecimal conductivityTestValue; + /** + * 体积 + */ + @Schema(description = "体积") + private BigDecimal volume; + /** + * 单位 + */ + @Schema(description = "单位") + private BigDecimal unit; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private BigDecimal unitId; + /** + * 加药量单位 + */ + @Schema(description = "加药量单位") + private String addUnit; + /** + * 加药量[计量单位]id + */ + @Schema(description = "加药量[计量单位]id") + private BigDecimal addUnitId; + /** + * 分析周期 + */ + @Schema(description = "分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @Schema(description = "有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @Schema(description = "上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @Schema(description = "槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @Schema(description = "化验人[用户]id") + private BigDecimal testUserId; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 测量值 + */ + @Schema(description = "测量值") + private BigDecimal testValue; + /** + * 需添加量 + */ + @Schema(description = "需添加量") + private BigDecimal needAddValue; + /** + * 实际添加量 + */ + @Schema(description = "实际添加量") + private BigDecimal actualAddValue; + /** + * 加药后含量 + */ + @Schema(description = "加药后含量") + private BigDecimal afterAddValue; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamId; + /** + * 参数录入时间 + */ + @Schema(description = "参数录入时间") + private LocalDateTime entryDate; + /** + * 确认时间 + */ + @Schema(description = "确认时间") + private LocalDateTime confirmDate; + /** + * 送出[用户]id + */ + @Schema(description = "送出[用户]id") + private Long sendUserId; + /** + * 送出时间 + */ + @Schema(description = "送出时间") + private LocalDateTime sendDate; + /** + * 接收[用户]id + */ + @Schema(description = "接收[用户]id") + private Long receiveUserId; + /** + * 接收时间 + */ + @Schema(description = "接收时间") + private LocalDateTime receiveDate; + /** + * 处理[用户]id + */ + @Schema(description = "处理[用户]id") + private BigDecimal handleUserId; + /** + * 处理时间 + */ + @Schema(description = "处理时间") + private LocalDateTime handleDate; + /** + * 来源类型 + */ + @Schema(description = "来源类型") + private Long fromType; + +} diff --git a/blade-service-api/blade-desk-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-desk-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 4d1d805d3..000000000 --- a/blade-service-api/blade-desk-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-desk-api=/blade-desk-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-desk-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-desk-api/target/classes/META-INF/spring.factories deleted file mode 100644 index 61d75c553..000000000 --- a/blade-service-api/blade-desk-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.desk.feign.INoticeClient diff --git a/blade-service-api/blade-desk-api/target/maven-archiver/pom.properties b/blade-service-api/blade-desk-api/target/maven-archiver/pom.properties deleted file mode 100644 index fae0319fb..000000000 --- a/blade-service-api/blade-desk-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:18 CST 2025 -groupId=org.springblade -artifactId=blade-desk-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 0f83e7832..000000000 --- a/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -META-INF\spring-devtools.properties -org\springblade\desk\feign\INoticeClient.class -org\springblade\desk\pojo\vo\NoticeVO.class -META-INF\spring.factories -org\springblade\desk\pojo\entity\Notice.class diff --git a/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index d42b866e3..000000000 --- a/blade-service-api/blade-desk-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,3 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-desk-api\src\main\java\org\springblade\desk\pojo\vo\NoticeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-desk-api\src\main\java\org\springblade\desk\feign\INoticeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-desk-api\src\main\java\org\springblade\desk\pojo\entity\Notice.java diff --git a/blade-service-api/blade-dict-api/.flattened-pom.xml b/blade-service-api/blade-dict-api/.flattened-pom.xml deleted file mode 100644 index df80d693e..000000000 --- a/blade-service-api/blade-dict-api/.flattened-pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - org.springblade - blade-dict-api - 4.6.0.RELEASE - blade-dict-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-dict-api/.gitignore b/blade-service-api/blade-dict-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-dict-api/.gitignore +++ b/blade-service-api/blade-dict-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-dict-api/blade-dict-api.iml b/blade-service-api/blade-dict-api/blade-dict-api.iml deleted file mode 100644 index b184e36f5..000000000 --- a/blade-service-api/blade-dict-api/blade-dict-api.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-dict-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-dict-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 5ad0e2151..000000000 --- a/blade-service-api/blade-dict-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-dict-api=/blade-dict-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-dict-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-dict-api/target/classes/META-INF/spring.factories deleted file mode 100644 index 15f54eeb3..000000000 --- a/blade-service-api/blade-dict-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,6 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.system.feign.IDictClientFallback,\ - org.springblade.system.feign.IDictBizClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.system.feign.IDictBizClient,\ - org.springblade.system.feign.IDictClient diff --git a/blade-service-api/blade-dict-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-service-api/blade-dict-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 7e89c7ad0..000000000 --- a/blade-service-api/blade-dict-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.springblade.system.feign.IDictBizClientFallback -org.springblade.system.feign.IDictClientFallback \ No newline at end of file diff --git a/blade-service-api/blade-dict-api/target/maven-archiver/pom.properties b/blade-service-api/blade-dict-api/target/maven-archiver/pom.properties deleted file mode 100644 index cf57a266c..000000000 --- a/blade-service-api/blade-dict-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:04:13 CST 2025 -groupId=org.springblade -artifactId=blade-dict-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 9dc42dad9..000000000 --- a/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,17 +0,0 @@ -META-INF\spring-devtools.properties -org\springblade\system\pojo\dto\DictDTO.class -org\springblade\system\pojo\entity\DictBiz.class -org\springblade\system\cache\DictCache.class -org\springblade\system\feign\IDictBizClientFallback.class -META-INF\spring.factories -org\springblade\system\cache\DictBizCache.class -org\springblade\system\feign\IDictClientFallback.class -org\springblade\system\pojo\vo\DictBizVO.class -org\springblade\system\feign\IDictBizClient.class -org\springblade\system\feign\IDictClient.class -org\springblade\system\pojo\enums\DictBizEnum.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\system\pojo\entity\Dict.class -org\springblade\system\constant\DictConstant.class -org\springblade\system\pojo\enums\DictEnum.class -org\springblade\system\pojo\vo\DictVO.class diff --git a/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index eb154e7e6..000000000 --- a/blade-service-api/blade-dict-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,14 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\entity\Dict.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\feign\IDictClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\cache\DictCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\enums\DictBizEnum.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\vo\DictBizVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\feign\IDictBizClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\dto\DictDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\constant\DictConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\feign\IDictBizClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\cache\DictBizCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\feign\IDictClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\entity\DictBiz.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\enums\DictEnum.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-dict-api\src\main\java\org\springblade\system\pojo\vo\DictVO.java diff --git a/blade-service-api/blade-monitor-api/blade-monitor-api.iml b/blade-service-api/blade-monitor-api/blade-monitor-api.iml deleted file mode 100644 index 656948c68..000000000 --- a/blade-service-api/blade-monitor-api/blade-monitor-api.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-record-api/.flattened-pom.xml b/blade-service-api/blade-record-api/.flattened-pom.xml deleted file mode 100644 index 57fb878d8..000000000 --- a/blade-service-api/blade-record-api/.flattened-pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - org.springblade - blade-record-api - 4.6.0.RELEASE - blade-record-api - BladeX 微服务API集合 - - - org.springblade - blade-core-secure - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-data-record - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-record-api/.gitignore b/blade-service-api/blade-record-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-record-api/.gitignore +++ b/blade-service-api/blade-record-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-record-api/blade-record-api.iml b/blade-service-api/blade-record-api/blade-record-api.iml deleted file mode 100644 index b6518d8f3..000000000 --- a/blade-service-api/blade-record-api/blade-record-api.iml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-record-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-record-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 2e4812ef6..000000000 --- a/blade-service-api/blade-record-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-record-api=/blade-record-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-record-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-record-api/target/classes/META-INF/spring.factories deleted file mode 100644 index ca9ff7fbe..000000000 --- a/blade-service-api/blade-record-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.system.config.RecordConfiguration,\ - org.springblade.system.feign.IDataRecordClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.system.feign.IDataRecordClient diff --git a/blade-service-api/blade-record-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-service-api/blade-record-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index d02ae5c2d..000000000 --- a/blade-service-api/blade-record-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.springblade.system.feign.IDataRecordClientFallback -org.springblade.system.config.RecordConfiguration \ No newline at end of file diff --git a/blade-service-api/blade-record-api/target/maven-archiver/pom.properties b/blade-service-api/blade-record-api/target/maven-archiver/pom.properties deleted file mode 100644 index b679b1a9f..000000000 --- a/blade-service-api/blade-record-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:21 CST 2025 -groupId=org.springblade -artifactId=blade-record-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index d7999bad4..000000000 --- a/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,8 +0,0 @@ -META-INF\spring-devtools.properties -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\system\handler\BladeRecordHandler$1.class -org\springblade\system\config\RecordConfiguration.class -org\springblade\system\handler\BladeRecordHandler.class -META-INF\spring.factories -org\springblade\system\feign\IDataRecordClientFallback.class -org\springblade\system\feign\IDataRecordClient.class diff --git a/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index c6fd6b164..000000000 --- a/blade-service-api/blade-record-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-record-api\src\main\java\org\springblade\system\handler\BladeRecordHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-record-api\src\main\java\org\springblade\system\config\RecordConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-record-api\src\main\java\org\springblade\system\feign\IDataRecordClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-record-api\src\main\java\org\springblade\system\feign\IDataRecordClient.java diff --git a/blade-service-api/blade-scheduling-api/.flattened-pom.xml b/blade-service-api/blade-scheduling-api/.flattened-pom.xml deleted file mode 100644 index 1706b5255..000000000 --- a/blade-service-api/blade-scheduling-api/.flattened-pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - org.springblade - blade-scheduling-api - 4.6.0.RELEASE - blade-scheduling-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-scheduling-api/blade-scheduling-api.iml b/blade-service-api/blade-scheduling-api/blade-scheduling-api.iml deleted file mode 100644 index e5ff32994..000000000 --- a/blade-service-api/blade-scheduling-api/blade-scheduling-api.iml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-scheduling-api/target/maven-archiver/pom.properties b/blade-service-api/blade-scheduling-api/target/maven-archiver/pom.properties deleted file mode 100644 index d63e4184d..000000000 --- a/blade-service-api/blade-scheduling-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:41 CST 2025 -groupId=org.springblade -artifactId=blade-scheduling-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-scope-api/.flattened-pom.xml b/blade-service-api/blade-scope-api/.flattened-pom.xml deleted file mode 100644 index 7e2618374..000000000 --- a/blade-service-api/blade-scope-api/.flattened-pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - org.springblade - blade-scope-api - 4.6.0.RELEASE - blade-scope-api - BladeX 微服务API集合 - - - org.springblade - blade-core-secure - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-data-scope - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-scope-api/.gitignore b/blade-service-api/blade-scope-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-scope-api/.gitignore +++ b/blade-service-api/blade-scope-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-scope-api/blade-scope-api.iml b/blade-service-api/blade-scope-api/blade-scope-api.iml deleted file mode 100644 index a5c798e90..000000000 --- a/blade-service-api/blade-scope-api/blade-scope-api.iml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-scope-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-scope-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 2313eaf40..000000000 --- a/blade-service-api/blade-scope-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-scope-api=/blade-scope-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-scope-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-scope-api/target/classes/META-INF/spring.factories deleted file mode 100644 index 4a726deed..000000000 --- a/blade-service-api/blade-scope-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,7 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.system.config.ScopeConfiguration,\ - org.springblade.system.feign.IDataScopeClientFallback,\ - org.springblade.system.feign.IApiScopeClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.system.feign.IDataScopeClient,\ - org.springblade.system.feign.IApiScopeClient diff --git a/blade-service-api/blade-scope-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-service-api/blade-scope-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fd259edbf..000000000 --- a/blade-service-api/blade-scope-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -org.springblade.system.config.ScopeConfiguration -org.springblade.system.feign.IDataScopeClientFallback -org.springblade.system.feign.IApiScopeClientFallback \ No newline at end of file diff --git a/blade-service-api/blade-scope-api/target/maven-archiver/pom.properties b/blade-service-api/blade-scope-api/target/maven-archiver/pom.properties deleted file mode 100644 index a58f8ea69..000000000 --- a/blade-service-api/blade-scope-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:24 CST 2025 -groupId=org.springblade -artifactId=blade-scope-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 605ef1664..000000000 --- a/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,12 +0,0 @@ -org\springblade\system\config\ScopeConfiguration.class -org\springblade\system\feign\IApiScopeClient.class -org\springblade\system\feign\IApiScopeClientFallback.class -META-INF\spring-devtools.properties -org\springblade\system\handler\DataScopeModelHandler.class -org\springblade\system\cache\ApiScopeCache.class -org\springblade\system\cache\DataScopeCache.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\system\feign\IDataScopeClientFallback.class -org\springblade\system\handler\ApiScopePermissionHandler.class -META-INF\spring.factories -org\springblade\system\feign\IDataScopeClient.class diff --git a/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 0d6b360a0..000000000 --- a/blade-service-api/blade-scope-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,9 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\handler\ApiScopePermissionHandler.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\feign\IDataScopeClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\cache\ApiScopeCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\cache\DataScopeCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\config\ScopeConfiguration.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\feign\IApiScopeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\feign\IApiScopeClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\feign\IDataScopeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-scope-api\src\main\java\org\springblade\system\handler\DataScopeModelHandler.java diff --git a/blade-service-api/blade-service-api.iml b/blade-service-api/blade-service-api.iml deleted file mode 100644 index 96cc09d9f..000000000 --- a/blade-service-api/blade-service-api.iml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-system-api/.flattened-pom.xml b/blade-service-api/blade-system-api/.flattened-pom.xml deleted file mode 100644 index a41011ebf..000000000 --- a/blade-service-api/blade-system-api/.flattened-pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - org.springblade - blade-system-api - 4.6.0.RELEASE - blade-system-api - BladeX 微服务API集合 - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-system-api/.gitignore b/blade-service-api/blade-system-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-system-api/.gitignore +++ b/blade-service-api/blade-system-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-system-api/blade-system-api.iml b/blade-service-api/blade-system-api/blade-system-api.iml deleted file mode 100644 index b184e36f5..000000000 --- a/blade-service-api/blade-system-api/blade-system-api.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-system-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-system-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index b6148b6e7..000000000 --- a/blade-service-api/blade-system-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-system-api=/blade-system-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-system-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-system-api/target/classes/META-INF/spring.factories deleted file mode 100644 index 2ae75ca91..000000000 --- a/blade-service-api/blade-system-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.system.feign.ISysClientFallback -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.system.feign.ISysClient diff --git a/blade-service-api/blade-system-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/blade-service-api/blade-system-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e74ec1648..000000000 --- a/blade-service-api/blade-system-api/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springblade.system.feign.ISysClientFallback \ No newline at end of file diff --git a/blade-service-api/blade-system-api/target/maven-archiver/pom.properties b/blade-service-api/blade-system-api/target/maven-archiver/pom.properties deleted file mode 100644 index d5ca318d7..000000000 --- a/blade-service-api/blade-system-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:03:41 CST 2025 -groupId=org.springblade -artifactId=blade-system-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index bdcc3aa07..000000000 --- a/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,45 +0,0 @@ -org\springblade\system\pojo\vo\DataScopeVO.class -org\springblade\system\pojo\vo\RecordDataVO.class -org\springblade\system\pojo\dto\ParamDTO.class -org\springblade\system\pojo\entity\Dept.class -org\springblade\system\pojo\entity\ApiScope.class -org\springblade\system\pojo\vo\ApiScopeVO.class -org\springblade\system\pojo\vo\DeptVO.class -org\springblade\system\pojo\vo\RoleMenuVO.class -META-INF\spring.factories -org\springblade\system\pojo\vo\PostVO.class -org\springblade\system\pojo\vo\RegionVO.class -org\springblade\system\pojo\vo\RoleVO.class -org\springblade\system\pojo\entity\DataScope.class -org\springblade\system\pojo\entity\Param.class -org\springblade\system\feign\ISysClientFallback.class -org\springblade\system\cache\ParamCache.class -org\springblade\system\pojo\entity\AuthClient.class -org\springblade\system\pojo\dto\RoleMenuDTO.class -org\springblade\system\pojo\entity\TenantDatasource.class -org\springblade\system\pojo\entity\Tenant.class -org\springblade\system\pojo\vo\GrantVO.class -org\springblade\system\cache\SysCache.class -org\springblade\system\pojo\dto\MenuDTO.class -META-INF\spring-devtools.properties -org\springblade\system\pojo\entity\RecordData.class -org\springblade\system\pojo\entity\Region.class -org\springblade\system\pojo\entity\TenantPackage.class -org\springblade\system\pojo\vo\TenantVO.class -org\springblade\system\pojo\vo\CheckedTreeVO.class -org\springblade\system\pojo\dto\PostDTO.class -org\springblade\system\pojo\entity\Menu.class -org\springblade\system\pojo\entity\RoleScope.class -org\springblade\system\pojo\entity\TopMenu.class -org\springblade\system\pojo\vo\GrantTreeVO.class -org\springblade\system\pojo\dto\DeptDTO.class -org\springblade\system\cache\RegionCache.class -org\springblade\system\pojo\entity\RoleMenu.class -org\springblade\system\pojo\entity\TopMenuSetting.class -org\springblade\system\pojo\vo\ParamVO.class -org\springblade\system\feign\ISysClient.class -META-INF\spring\org.springframework.boot.autoconfigure.AutoConfiguration.imports -org\springblade\system\pojo\dto\RoleDTO.class -org\springblade\system\pojo\entity\Role.class -org\springblade\system\pojo\vo\MenuVO.class -org\springblade\system\pojo\entity\Post.class diff --git a/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 2d410ede1..000000000 --- a/blade-service-api/blade-system-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,42 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Dept.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\PostVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\RoleScope.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\DataScope.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\cache\ParamCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\CheckedTreeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\ParamVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\ApiScopeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\cache\SysCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\GrantTreeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\feign\ISysClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\ParamDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\feign\ISysClientFallback.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\TenantPackage.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\PostDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\TopMenuSetting.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\DataScopeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Tenant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\DeptDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\RecordDataVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Region.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\RoleMenu.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\RecordData.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\GrantVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\MenuVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\RegionVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\DeptVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\MenuDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\TopMenu.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\TenantVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Role.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\ApiScope.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\AuthClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\TenantDatasource.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\cache\RegionCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\RoleDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\RoleVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\dto\RoleMenuDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\vo\RoleMenuVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Post.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Menu.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-system-api\src\main\java\org\springblade\system\pojo\entity\Param.java diff --git a/blade-service-api/blade-user-api/.flattened-pom.xml b/blade-service-api/blade-user-api/.flattened-pom.xml deleted file mode 100644 index e4151ea85..000000000 --- a/blade-service-api/blade-user-api/.flattened-pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - org.springblade - blade-user-api - 4.6.0.RELEASE - blade-user-api - BladeX 微服务API集合 - - - org.springblade - blade-core-tool - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-cache - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-mybatis - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.1.4 - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-core-auto - 4.6.0.RELEASE - provided - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service-api/blade-user-api/.gitignore b/blade-service-api/blade-user-api/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service-api/blade-user-api/.gitignore +++ b/blade-service-api/blade-user-api/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service-api/blade-user-api/blade-user-api.iml b/blade-service-api/blade-user-api/blade-user-api.iml deleted file mode 100644 index 8df30ae47..000000000 --- a/blade-service-api/blade-user-api/blade-user-api.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service-api/blade-user-api/target/classes/META-INF/spring-devtools.properties b/blade-service-api/blade-user-api/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 9cccbcb16..000000000 --- a/blade-service-api/blade-user-api/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-user-api=/blade-user-api[\\w-]+\.jar \ No newline at end of file diff --git a/blade-service-api/blade-user-api/target/classes/META-INF/spring.factories b/blade-service-api/blade-user-api/target/classes/META-INF/spring.factories deleted file mode 100644 index cbe46c606..000000000 --- a/blade-service-api/blade-user-api/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\ - org.springblade.system.feign.IUserClient,\ - org.springblade.system.feign.IUserSearchClient diff --git a/blade-service-api/blade-user-api/target/maven-archiver/pom.properties b/blade-service-api/blade-user-api/target/maven-archiver/pom.properties deleted file mode 100644 index 8b40771d6..000000000 --- a/blade-service-api/blade-user-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:03:33 CST 2025 -groupId=org.springblade -artifactId=blade-user-api -version=4.6.0.RELEASE diff --git a/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 0c04ac194..000000000 --- a/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,14 +0,0 @@ -org\springblade\system\pojo\entity\UserOauth.class -META-INF\spring-devtools.properties -org\springblade\system\pojo\entity\UserInfo.class -org\springblade\system\pojo\vo\UserVO.class -org\springblade\system\feign\IUserSearchClient.class -org\springblade\system\pojo\entity\UserWeb.class -META-INF\spring.factories -org\springblade\system\pojo\entity\User.class -org\springblade\system\pojo\enums\UserType.class -org\springblade\system\feign\IUserClient.class -org\springblade\system\pojo\entity\UserApp.class -org\springblade\system\pojo\entity\UserDept.class -org\springblade\system\pojo\entity\UserOther.class -org\springblade\system\cache\UserCache.class diff --git a/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index d13127924..000000000 --- a/blade-service-api/blade-user-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,12 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserInfo.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserOauth.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserWeb.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\feign\IUserSearchClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\feign\IUserClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserOther.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\cache\UserCache.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\enums\UserType.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserDept.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\vo\UserVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\UserApp.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service-api\blade-user-api\src\main\java\org\springblade\system\pojo\entity\User.java diff --git a/blade-service/.flattened-pom.xml b/blade-service/.flattened-pom.xml deleted file mode 100644 index eef8e5f05..000000000 --- a/blade-service/.flattened-pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - 4.0.0 - org.springblade - blade-service - 4.6.0.RELEASE - pom - blade-service - BladeX 微服务集合 - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-api-crypto - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-record-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-scope-api - 4.6.0.RELEASE - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service/blade-desk/.flattened-pom.xml b/blade-service/blade-desk/.flattened-pom.xml deleted file mode 100644 index f4dadb026..000000000 --- a/blade-service/blade-desk/.flattened-pom.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - 4.0.0 - org.springblade - blade-desk - 4.6.0.RELEASE - blade-desk - BladeX 微服务集合 - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-desk-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-user-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-flow-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-oss - 4.6.0.RELEASE - compile - - - io.minio - minio - 8.5.7 - compile - - - com.qiniu - qiniu-java-sdk - 7.12.1 - compile - - - org.flowable - flowable-engine - 7.1.0 - compile - - - org.springblade - blade-starter-excel - 4.6.0.RELEASE - compile - - - cn.hutool - hutool-all - 5.8.16 - compile - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-api-crypto - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-record-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-scope-api - 4.6.0.RELEASE - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service/blade-desk/.gitignore b/blade-service/blade-desk/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service/blade-desk/.gitignore +++ b/blade-service/blade-desk/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service/blade-desk/blade-desk.iml b/blade-service/blade-desk/blade-desk.iml index 09683da3a..b212ee73f 100644 --- a/blade-service/blade-desk/blade-desk.iml +++ b/blade-service/blade-desk/blade-desk.iml @@ -4,6 +4,10 @@ + + + + @@ -13,11 +17,18 @@ + - + + + + + + + @@ -286,6 +297,7 @@ + diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index d5213ec64..865161098 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -66,6 +66,15 @@ org.springblade blade-starter-excel + + + + org.springblade + blade-job-api + 4.6.0.RELEASE + compile + + cn.hutool diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java new file mode 100644 index 000000000..47905fa5f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java @@ -0,0 +1,13 @@ +package org.springblade.desk.basic.constant; + +public interface FormulaConst { + + /** + * + */ + final Integer TYPE_1 = 1; + /** + * + */ + final Integer TYPE_2 = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java new file mode 100644 index 000000000..4c59306ac --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.FormulaGenExcel; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springblade.desk.basic.pojo.vo.gen.FormulaGenVO; +import org.springblade.desk.basic.service.gen.IFormulaGenService; +import org.springblade.desk.basic.wrapper.gen.FormulaGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [计算公式] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Formula") +@Tag(name = "[计算公式]", description = "[计算公式]接口") +public class FormulaController extends BladeController { + + private final IFormulaGenService formulaGenService; + + /** + * [计算公式] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Formula") + public R detail(Formula formula) { + Formula detail = formulaGenService.getOne(Condition.getQueryWrapper(formula)); + return R.data(FormulaGenWrapper.build().entityVO(detail)); + } + + /** + * [计算公式] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Formula") + public R> list(@Parameter(hidden = true) @RequestParam Map formula, Query query) { + IPage pages = formulaGenService.page(Condition.getPage(query), Condition.getQueryWrapper(formula, Formula.class)); + return R.data(FormulaGenWrapper.build().pageVO(pages)); + } + + + /** + * [计算公式] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Formula") + public R> page(FormulaGenVO formula, Query query) { + IPage pages = formulaGenService.selectFormulaPage(Condition.getPage(query), formula); + return R.data(pages); + } + + /** + * [计算公式] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Formula") + public R save(@Valid @RequestBody Formula formula) { + return R.status(formulaGenService.save(formula)); + } + + /** + * [计算公式] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Formula") + public R update(@Valid @RequestBody Formula formula) { + return R.status(formulaGenService.updateById(formula)); + } + + /** + * [计算公式] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Formula") + public R submit(@Valid @RequestBody Formula formula) { + return R.status(formulaGenService.saveOrUpdate(formula)); + } + + /** + * [计算公式] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(formulaGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Formula") + public void exportFormula(@Parameter(hidden = true) @RequestParam Map formula, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(formula, Formula.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Formula::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(FormulaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = formulaGenService.exportFormula(queryWrapper); + ExcelUtil.export(response, "[计算公式]数据" + DateUtil.time(), "[计算公式]数据表", list, FormulaGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java new file mode 100644 index 000000000..2e4d11935 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; +import org.springblade.desk.basic.service.gen.IShiftGenService; +import org.springblade.desk.basic.wrapper.gen.ShiftGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [班次] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Shift") +@Tag(name = "[班次]", description = "[班次]接口") +public class ShiftController extends BladeController { + + private final IShiftGenService shiftGenService; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Shift") + public R detail(Shift shift) { + Shift detail = shiftGenService.getOne(Condition.getQueryWrapper(shift)); + return R.data(ShiftGenWrapper.build().entityVO(detail)); + } + + /** + * [班次] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Shift") + public R> list(@Parameter(hidden = true) @RequestParam Map shift, Query query) { + IPage pages = shiftGenService.page(Condition.getPage(query), Condition.getQueryWrapper(shift, Shift.class)); + return R.data(ShiftGenWrapper.build().pageVO(pages)); + } + + + /** + * [班次] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Shift") + public R> page(ShiftGenVO shift, Query query) { + IPage pages = shiftGenService.selectShiftPage(Condition.getPage(query), shift); + return R.data(pages); + } + + /** + * [班次] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Shift") + public R save(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.save(shift)); + } + + /** + * [班次] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Shift") + public R update(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.updateById(shift)); + } + + /** + * [班次] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Shift") + public R submit(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.saveOrUpdate(shift)); + } + + /** + * [班次] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(shiftGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Shift") + public void exportShift(@Parameter(hidden = true) @RequestParam Map shift, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(shift, Shift.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shift::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = shiftGenService.exportShift(queryWrapper); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), "[班次]数据表", list, ShiftGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java new file mode 100644 index 000000000..5841fd628 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; +import org.springblade.desk.basic.service.gen.ITeamGenService; +import org.springblade.desk.basic.wrapper.gen.TeamGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [班组] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Team") +@Tag(name = "[班组]", description = "[班组]接口") +public class TeamController extends BladeController { + + private final ITeamGenService teamGenService; + + /** + * [班组] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Team") + public R detail(Team team) { + Team detail = teamGenService.getOne(Condition.getQueryWrapper(team)); + return R.data(TeamGenWrapper.build().entityVO(detail)); + } + + /** + * [班组] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Team") + public R> list(@Parameter(hidden = true) @RequestParam Map team, Query query) { + IPage pages = teamGenService.page(Condition.getPage(query), Condition.getQueryWrapper(team, Team.class)); + return R.data(TeamGenWrapper.build().pageVO(pages)); + } + + + /** + * [班组] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Team") + public R> page(TeamGenVO team, Query query) { + IPage pages = teamGenService.selectTeamPage(Condition.getPage(query), team); + return R.data(pages); + } + + /** + * [班组] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Team") + public R save(@Valid @RequestBody Team team) { + return R.status(teamGenService.save(team)); + } + + /** + * [班组] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Team") + public R update(@Valid @RequestBody Team team) { + return R.status(teamGenService.updateById(team)); + } + + /** + * [班组] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Team") + public R submit(@Valid @RequestBody Team team) { + return R.status(teamGenService.saveOrUpdate(team)); + } + + /** + * [班组] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(teamGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Team") + public void exportTeam(@Parameter(hidden = true) @RequestParam Map team, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(team, Team.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Team::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(TeamEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = teamGenService.exportTeam(queryWrapper); + ExcelUtil.export(response, "[班组]数据" + DateUtil.time(), "[班组]数据表", list, TeamGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java new file mode 100644 index 000000000..f8e1c372d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.WorkTankGenExcel; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.pojo.vo.gen.WorkTankGenVO; +import org.springblade.desk.basic.service.gen.IWorkTankGenService; +import org.springblade.desk.basic.wrapper.gen.WorkTankGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [作业槽] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/BA/WorkTank") +@Tag(name = "[作业槽]", description = "[作业槽]接口") +public class WorkTankController extends BladeController { + + private final IWorkTankGenService workTankGenService; + + /** + * [作业槽] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入WorkTank") + public R detail(WorkTank workTank) { + WorkTank detail = workTankGenService.getOne(Condition.getQueryWrapper(workTank)); + return R.data(WorkTankGenWrapper.build().entityVO(detail)); + } + + /** + * [作业槽] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入WorkTank") + public R> list(@Parameter(hidden = true) @RequestParam Map workTank, Query query) { + IPage pages = workTankGenService.page(Condition.getPage(query), Condition.getQueryWrapper(workTank, WorkTank.class)); + return R.data(WorkTankGenWrapper.build().pageVO(pages)); + } + + + /** + * [作业槽] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入WorkTank") + public R> page(WorkTankGenVO workTank, Query query) { + IPage pages = workTankGenService.selectWorkTankPage(Condition.getPage(query), workTank); + return R.data(pages); + } + + /** + * [作业槽] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入WorkTank") + public R save(@Valid @RequestBody WorkTank workTank) { + return R.status(workTankGenService.save(workTank)); + } + + /** + * [作业槽] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入WorkTank") + public R update(@Valid @RequestBody WorkTank workTank) { + return R.status(workTankGenService.updateById(workTank)); + } + + /** + * [作业槽] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入WorkTank") + public R submit(@Valid @RequestBody WorkTank workTank) { + return R.status(workTankGenService.saveOrUpdate(workTank)); + } + + /** + * [作业槽] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(workTankGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入WorkTank") + public void exportWorkTank(@Parameter(hidden = true) @RequestParam Map workTank, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(workTank, WorkTank.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WorkTank::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkTankEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = workTankGenService.exportWorkTank(queryWrapper); + ExcelUtil.export(response, "[作业槽]数据" + DateUtil.time(), "[作业槽]数据表", list, WorkTankGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java new file mode 100644 index 000000000..a870192a1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; +import org.springblade.desk.basic.service.gen.IWorkstationGenService; +import org.springblade.desk.basic.wrapper.gen.WorkstationGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [作业中心] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Workstation") +@Tag(name = "[作业中心]", description = "[作业中心]接口") +public class WorkstationController extends BladeController { + + private final IWorkstationGenService workstationGenService; + + /** + * [作业中心] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Workstation") + public R detail(Workstation workstation) { + Workstation detail = workstationGenService.getOne(Condition.getQueryWrapper(workstation)); + return R.data(WorkstationGenWrapper.build().entityVO(detail)); + } + + /** + * [作业中心] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Workstation") + public R> list(@Parameter(hidden = true) @RequestParam Map workstation, Query query) { + IPage pages = workstationGenService.page(Condition.getPage(query), Condition.getQueryWrapper(workstation, Workstation.class)); + return R.data(WorkstationGenWrapper.build().pageVO(pages)); + } + + + /** + * [作业中心] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Workstation") + public R> page(WorkstationGenVO workstation, Query query) { + IPage pages = workstationGenService.selectWorkstationPage(Condition.getPage(query), workstation); + return R.data(pages); + } + + /** + * [作业中心] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Workstation") + public R save(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.save(workstation)); + } + + /** + * [作业中心] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Workstation") + public R update(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.updateById(workstation)); + } + + /** + * [作业中心] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Workstation") + public R submit(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.saveOrUpdate(workstation)); + } + + /** + * [作业中心] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(workstationGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Workstation") + public void exportWorkstation(@Parameter(hidden = true) @RequestParam Map workstation, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(workstation, Workstation.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Workstation::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkstationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = workstationGenService.exportWorkstation(queryWrapper); + ExcelUtil.export(response, "[作业中心]数据" + DateUtil.time(), "[作业中心]数据表", list, WorkstationGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/FormulaGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/FormulaGenExcel.java new file mode 100644 index 000000000..e24c8c0b0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/FormulaGenExcel.java @@ -0,0 +1,74 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [计算公式] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class FormulaGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * [计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值; + */ + @ColumnWidth(20) + @ExcelProperty("[计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值;") + private Long formulaType; + /** + * 公式名称 + */ + @ColumnWidth(20) + @ExcelProperty("公式名称") + private String name; + /** + * 公式内容 + */ + @ColumnWidth(20) + @ExcelProperty("公式内容") + private String content; + /** + * 计算表达式 + */ + @ColumnWidth(20) + @ExcelProperty("计算表达式") + private String expression; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java new file mode 100644 index 000000000..661c5075e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [班次] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ShiftGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]名称") + private String name; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java new file mode 100644 index 000000000..a9a0f41b2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java @@ -0,0 +1,183 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [班组] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TeamGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班组]编码") + private String teamCode; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + @ColumnWidth(20) + @ExcelProperty("[班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区;") + private Long teamType; + /** + * [班组]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班组]名称") + private String name; + /** + * 班组长[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("班组长[用户]id") + private BigDecimal leaderUserId; + /** + * 计划员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("计划员[用户]id") + private BigDecimal plannerUserId; + /** + * 调度员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("调度员[用户]id") + private BigDecimal dispatchUserId; + /** + * [XXXX]id + */ + @ColumnWidth(20) + @ExcelProperty("[XXXX]id") + private BigDecimal myId4; + /** + * 是否特殊 + */ + @ColumnWidth(20) + @ExcelProperty("是否特殊") + private Long flagSpecial; + /** + * MY_NUM2 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM2") + private Long myNum2; + /** + * MY_NUM3 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM3") + private Long myNum3; + /** + * MY_NUM4 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM4") + private Long myNum4; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum5; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum6; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum7; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum8; + /** + * MY_CHA1 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA1") + private String myCha1; + /** + * MY_CHA2 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA2") + private String myCha2; + /** + * MY_CHA3 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA3") + private String myCha3; + /** + * MY_CHA4 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA4") + private String myCha4; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha5; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha6; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha7; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha8; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkTankGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkTankGenExcel.java new file mode 100644 index 000000000..7b3b3bfb2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkTankGenExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [作业槽] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkTankGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业槽]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[作业槽]编码") + private String workTankCode; + /** + * [作业槽]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[作业槽]类型") + private Long workTankType; + /** + * [作业槽]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[作业槽]名称") + private String name; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java new file mode 100644 index 000000000..cf9a96b05 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java @@ -0,0 +1,99 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [作业中心] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkstationGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]编码") + private String workstationCode; + /** + * [作业中心]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @ColumnWidth(20) + @ExcelProperty("交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 业务标识 + */ + @ColumnWidth(20) + @ExcelProperty("业务标识") + private String bizTag; + /** + * 检验标记 + */ + @ColumnWidth(20) + @ExcelProperty("检验标记") + private Long flagTest; + /** + * 镀后标记 + */ + @ColumnWidth(20) + @ExcelProperty("镀后标记") + private Long flagAfterPlating; + /** + * 是否大批量 + */ + @ColumnWidth(20) + @ExcelProperty("是否大批量") + private Long flagBigBat; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.java new file mode 100644 index 000000000..472f232f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.FormulaGenExcel; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springblade.desk.basic.pojo.vo.gen.FormulaGenVO; + +import java.util.List; + +/** + * [计算公式] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface FormulaGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param formula 查询参数 + * @return List + */ + List selectFormulaPage(IPage page, FormulaGenVO formula); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFormula(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.xml new file mode 100644 index 000000000..6e67bb05e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/FormulaGenMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java new file mode 100644 index 000000000..332b96aa1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.List; + +/** + * [班次] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface ShiftGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shift 查询参数 + * @return List + */ + List selectShiftPage(IPage page, ShiftGenVO shift); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShift(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml new file mode 100644 index 000000000..eabc94a39 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java new file mode 100644 index 000000000..cef744db6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.List; + +/** + * [班组] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface TeamGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param team 查询参数 + * @return List + */ + List selectTeamPage(IPage page, TeamGenVO team); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTeam(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml new file mode 100644 index 000000000..efa6e4430 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.java new file mode 100644 index 000000000..19b1e53b5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.WorkTankGenExcel; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.pojo.vo.gen.WorkTankGenVO; + +import java.util.List; + +/** + * [作业槽] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface WorkTankGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workTank 查询参数 + * @return List + */ + List selectWorkTankPage(IPage page, WorkTankGenVO workTank); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkTank(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.xml new file mode 100644 index 000000000..0cae4b9de --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkTankGenMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java new file mode 100644 index 000000000..6587b9eff --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.List; + +/** + * [作业中心] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface WorkstationGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workstation 查询参数 + * @return List + */ + List selectWorkstationPage(IPage page, WorkstationGenVO workstation); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkstation(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml new file mode 100644 index 000000000..e337fb7b6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/package-info.java new file mode 100644 index 000000000..8a55c25c3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/package-info.java @@ -0,0 +1,4 @@ +/** + * 基础数据 + */ +package org.springblade.desk.basic; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java new file mode 100644 index 000000000..6f04476be --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; + +import java.io.Serial; + +/** + * [作业中心] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaWorkstationGenDTO extends BaWorkstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/FormulaGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/FormulaGenDTO.java new file mode 100644 index 000000000..fc8fbbcb1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/FormulaGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Formula; + +import java.io.Serial; + +/** + * [计算公式] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FormulaGenDTO extends Formula { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java new file mode 100644 index 000000000..cb2d13a3d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shift; + +import java.io.Serial; + +/** + * [班次] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftGenDTO extends Shift { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java new file mode 100644 index 000000000..b73d6e6eb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Team; + +import java.io.Serial; + +/** + * [班组] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TeamGenDTO extends Team { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkTankGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkTankGenDTO.java new file mode 100644 index 000000000..6bcce3621 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkTankGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.WorkTank; + +import java.io.Serial; + +/** + * [作业槽] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkTankGenDTO extends WorkTank { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java new file mode 100644 index 000000000..2a0f2aa8d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Workstation; + +import java.io.Serial; + +/** + * [作业中心] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkstationGenDTO extends Workstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java new file mode 100644 index 000000000..12ddbca40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java @@ -0,0 +1,103 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [作业中心] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_WORKSTATION") +@Schema(description = "BaWorkstation Entity对象") +@EqualsAndHashCode(callSuper = true) +public class BaWorkstation extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [作业中心]类型 + */ + public static final String COL_WORKSTATION_TYPE = "WORKSTATION_TYPE"; + /** + * [作业中心]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 交付中心 + */ + public static final String COL_DELIVERY_CENTER = "DELIVERY_CENTER"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 业务标识 + */ + public static final String COL_BIZ_TAG = "BIZ_TAG"; + + /** + * [作业中心]编码 + */ + @Schema(description = "[作业中心]编码") + private String code; + /** + * [作业中心]类型 + */ + @Schema(description = "[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @Schema(description = "[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @Schema(description = "交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 业务标识 + */ + @Schema(description = "业务标识") + private String bizTag; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java new file mode 100644 index 000000000..c64fe8f33 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java @@ -0,0 +1,93 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [计算公式] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_FORMULA") +@Schema(description = "Formula Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Formula extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值; + */ + public static final String COL_FORMULA_TYPE = "FORMULA_TYPE"; + /** + * 公式名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 公式内容 + */ + public static final String COL_CONTENT = "CONTENT"; + /** + * 计算表达式 + */ + public static final String COL_EXPRESSION = "EXPRESSION"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * [计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值; + */ + @Schema(description = "[计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值;") + private Long formulaType; + /** + * 公式名称 + */ + @Schema(description = "公式名称") + private String name; + /** + * 公式内容 + */ + @Schema(description = "公式内容") + private String content; + /** + * 计算表达式 + */ + @Schema(description = "计算表达式") + private String expression; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java new file mode 100644 index 000000000..4e3a9e57f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [班次] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_SHIFT") +@Schema(description = "Shift Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Shift extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + public static final String COL_SHIFT_CODE = "SHIFT_CODE"; + /** + * [班次]类型 + */ + public static final String COL_SHIFT_TYPE = "SHIFT_TYPE"; + /** + * [班次]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班次]编码 + */ + @Schema(description = "[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @Schema(description = "[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @Schema(description = "[班次]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java new file mode 100644 index 000000000..bb5367769 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [班组] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_TEAM") +@Schema(description = "Team Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Team extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]编码 + */ + public static final String COL_TEAM_CODE = "TEAM_CODE"; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + public static final String COL_TEAM_TYPE = "TEAM_TYPE"; + /** + * [班组]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 班组长[用户]id + */ + public static final String COL_LEADER_USER_ID = "LEADER_USER_ID"; + /** + * 计划员[用户]id + */ + public static final String COL_PLANNER_USER_ID = "PLANNER_USER_ID"; + /** + * 调度员[用户]id + */ + public static final String COL_DISPATCH_USER_ID = "DISPATCH_USER_ID"; + /** + * [XXXX]id + */ + public static final String COL_MY_ID4 = "MY_ID4"; + /** + * 是否特殊 + */ + public static final String COL_FLAG_SPECIAL = "FLAG_SPECIAL"; + /** + * MY_NUM2 + */ + public static final String COL_MY_NUM2 = "MY_NUM2"; + /** + * MY_NUM3 + */ + public static final String COL_MY_NUM3 = "MY_NUM3"; + /** + * MY_NUM4 + */ + public static final String COL_MY_NUM4 = "MY_NUM4"; + /** + * + */ + public static final String COL_MY_NUM5 = "MY_NUM5"; + /** + * + */ + public static final String COL_MY_NUM6 = "MY_NUM6"; + /** + * + */ + public static final String COL_MY_NUM7 = "MY_NUM7"; + /** + * + */ + public static final String COL_MY_NUM8 = "MY_NUM8"; + /** + * MY_CHA1 + */ + public static final String COL_MY_CHA1 = "MY_CHA1"; + /** + * MY_CHA2 + */ + public static final String COL_MY_CHA2 = "MY_CHA2"; + /** + * MY_CHA3 + */ + public static final String COL_MY_CHA3 = "MY_CHA3"; + /** + * MY_CHA4 + */ + public static final String COL_MY_CHA4 = "MY_CHA4"; + /** + * + */ + public static final String COL_MY_CHA5 = "MY_CHA5"; + /** + * + */ + public static final String COL_MY_CHA6 = "MY_CHA6"; + /** + * + */ + public static final String COL_MY_CHA7 = "MY_CHA7"; + /** + * + */ + public static final String COL_MY_CHA8 = "MY_CHA8"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班组]编码 + */ + @Schema(description = "[班组]编码") + private String teamCode; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + @Schema(description = "[班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区;") + private Long teamType; + /** + * [班组]名称 + */ + @Schema(description = "[班组]名称") + private String name; + /** + * 班组长[用户]id + */ + @Schema(description = "班组长[用户]id") + private BigDecimal leaderUserId; + /** + * 计划员[用户]id + */ + @Schema(description = "计划员[用户]id") + private BigDecimal plannerUserId; + /** + * 调度员[用户]id + */ + @Schema(description = "调度员[用户]id") + private BigDecimal dispatchUserId; + /** + * [XXXX]id + */ + @Schema(description = "[XXXX]id") + private BigDecimal myId4; + /** + * 是否特殊 + */ + @Schema(description = "是否特殊") + private Long flagSpecial; + /** + * MY_NUM2 + */ + @Schema(description = "MY_NUM2") + private Long myNum2; + /** + * MY_NUM3 + */ + @Schema(description = "MY_NUM3") + private Long myNum3; + /** + * MY_NUM4 + */ + @Schema(description = "MY_NUM4") + private Long myNum4; + /** + * + */ + @Schema(description = "") + private Long myNum5; + /** + * + */ + @Schema(description = "") + private Long myNum6; + /** + * + */ + @Schema(description = "") + private Long myNum7; + /** + * + */ + @Schema(description = "") + private Long myNum8; + /** + * MY_CHA1 + */ + @Schema(description = "MY_CHA1") + private String myCha1; + /** + * MY_CHA2 + */ + @Schema(description = "MY_CHA2") + private String myCha2; + /** + * MY_CHA3 + */ + @Schema(description = "MY_CHA3") + private String myCha3; + /** + * MY_CHA4 + */ + @Schema(description = "MY_CHA4") + private String myCha4; + /** + * + */ + @Schema(description = "") + private String myCha5; + /** + * + */ + @Schema(description = "") + private String myCha6; + /** + * + */ + @Schema(description = "") + private String myCha7; + /** + * + */ + @Schema(description = "") + private String myCha8; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java new file mode 100644 index 000000000..b7fdd86a0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [作业槽] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_WORK_TANK") +@Schema(description = "WorkTank Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkTank extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业槽]编码 + */ + public static final String COL_WORK_TANK_CODE = "WORK_TANK_CODE"; + /** + * [作业槽]类型 + */ + public static final String COL_WORK_TANK_TYPE = "WORK_TANK_TYPE"; + /** + * [作业槽]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [作业槽]编码 + */ + @Schema(description = "[作业槽]编码") + private String workTankCode; + /** + * [作业槽]类型 + */ + @Schema(description = "[作业槽]类型") + private Long workTankType; + /** + * [作业槽]名称 + */ + @Schema(description = "[作业槽]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java new file mode 100644 index 000000000..d6cb5ce9c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java @@ -0,0 +1,130 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [作业中心] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_WORKSTATION") +@Schema(description = "Workstation Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Workstation extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + public static final String COL_WORKSTATION_CODE = "WORKSTATION_CODE"; + /** + * [作业中心]类型 + */ + public static final String COL_WORKSTATION_TYPE = "WORKSTATION_TYPE"; + /** + * [作业中心]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 交付中心 + */ + public static final String COL_DELIVERY_CENTER = "DELIVERY_CENTER"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 业务标识 + */ + public static final String COL_BIZ_TAG = "BIZ_TAG"; + /** + * 检验标记 + */ + public static final String COL_FLAG_TEST = "FLAG_TEST"; + /** + * 镀后标记 + */ + public static final String COL_FLAG_AFTER_PLATING = "FLAG_AFTER_PLATING"; + /** + * 是否大批量 + */ + public static final String COL_FLAG_BIG_BAT = "FLAG_BIG_BAT"; + + /** + * [作业中心]编码 + */ + @Schema(description = "[作业中心]编码") + private String workstationCode; + /** + * [作业中心]类型 + */ + @Schema(description = "[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @Schema(description = "[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @Schema(description = "交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 业务标识 + */ + @Schema(description = "业务标识") + private String bizTag; + /** + * 检验标记 + */ + @Schema(description = "检验标记") + private Long flagTest; + /** + * 镀后标记 + */ + @Schema(description = "镀后标记") + private Long flagAfterPlating; + /** + * 是否大批量 + */ + @Schema(description = "是否大批量") + private Long flagBigBat; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java new file mode 100644 index 000000000..b72892ba7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; + +import java.io.Serial; + +/** + * [作业中心] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaWorkstationGenVO extends BaWorkstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/FormulaGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/FormulaGenVO.java new file mode 100644 index 000000000..c6e08524d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/FormulaGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Formula; + +import java.io.Serial; + +/** + * [计算公式] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FormulaGenVO extends Formula { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java new file mode 100644 index 000000000..a0e1f949f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shift; + +import java.io.Serial; + +/** + * [班次] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftGenVO extends Shift { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java new file mode 100644 index 000000000..d82f6d131 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Team; + +import java.io.Serial; + +/** + * [班组] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TeamGenVO extends Team { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkTankGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkTankGenVO.java new file mode 100644 index 000000000..721345321 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkTankGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.WorkTank; + +import java.io.Serial; + +/** + * [作业槽] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkTankGenVO extends WorkTank { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java new file mode 100644 index 000000000..afe48cfaf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Workstation; + +import java.io.Serial; + +/** + * [作业中心] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkstationGenVO extends Workstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java new file mode 100644 index 000000000..e5ee8c0e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java @@ -0,0 +1,21 @@ +package org.springblade.desk.basic.service; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class BAStartService { + + /** + * 应用启动后执行。 + */ + @EventListener(ApplicationReadyEvent.class) + public void start() { + log.info("====BA基础模块启动成功!===="); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/FormulaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/FormulaService.java new file mode 100644 index 000000000..1f71c8c13 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/FormulaService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.FormulaGenMapper; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class FormulaService { + + @Resource + private FormulaGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ShiftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ShiftService.java new file mode 100644 index 000000000..5bc5285ce --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ShiftService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.ShiftGenMapper; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class ShiftService { + + @Resource + private ShiftGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/TeamService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/TeamService.java new file mode 100644 index 000000000..9ebf4c508 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/TeamService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.TeamGenMapper; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class TeamService { + + @Resource + private TeamGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java new file mode 100644 index 000000000..586fc8aef --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.WorkTankGenMapper; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class WorkTankService { + + @Resource + private WorkTankGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java new file mode 100644 index 000000000..62318529f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.WorkstationGenMapper; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class WorkstationService { + + @Resource + private WorkstationGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IFormulaGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IFormulaGenService.java new file mode 100644 index 000000000..fa13d23e9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IFormulaGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.FormulaGenExcel; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springblade.desk.basic.pojo.vo.gen.FormulaGenVO; + +import java.util.List; + +/** + * [计算公式] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IFormulaGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param formula 查询参数 + * @return IPage + */ + IPage selectFormulaPage(IPage page, FormulaGenVO formula); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFormula(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java new file mode 100644 index 000000000..608b18b4c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.List; + +/** + * [班次] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IShiftGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shift 查询参数 + * @return IPage + */ + IPage selectShiftPage(IPage page, ShiftGenVO shift); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShift(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java new file mode 100644 index 000000000..dab25fc4b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.List; + +/** + * [班组] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface ITeamGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param team 查询参数 + * @return IPage + */ + IPage selectTeamPage(IPage page, TeamGenVO team); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTeam(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkTankGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkTankGenService.java new file mode 100644 index 000000000..973bcf583 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkTankGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.WorkTankGenExcel; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.pojo.vo.gen.WorkTankGenVO; + +import java.util.List; + +/** + * [作业槽] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IWorkTankGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workTank 查询参数 + * @return IPage + */ + IPage selectWorkTankPage(IPage page, WorkTankGenVO workTank); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkTank(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java new file mode 100644 index 000000000..62d22d530 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.List; + +/** + * [作业中心] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IWorkstationGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workstation 查询参数 + * @return IPage + */ + IPage selectWorkstationPage(IPage page, WorkstationGenVO workstation); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkstation(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/FormulaGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/FormulaGenServiceImpl.java new file mode 100644 index 000000000..3feffaaa6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/FormulaGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.FormulaGenExcel; +import org.springblade.desk.basic.mapper.gen.FormulaGenMapper; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springblade.desk.basic.pojo.vo.gen.FormulaGenVO; +import org.springblade.desk.basic.service.gen.IFormulaGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [计算公式] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class FormulaGenServiceImpl extends BaseServiceImpl implements IFormulaGenService { + + @Override + public IPage selectFormulaPage(IPage page, FormulaGenVO formula) { + return page.setRecords(baseMapper.selectFormulaPage(page, formula)); + } + + @Override + public List exportFormula(Wrapper queryWrapper) { + List formulaList = baseMapper.exportFormula(queryWrapper); + //formulaList.forEach(formula -> { + // formula.setTypeName(DictCache.getValue(DictEnum.YES_NO, Formula.getType())); + //}); + return formulaList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java new file mode 100644 index 000000000..791697a27 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.mapper.gen.ShiftGenMapper; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; +import org.springblade.desk.basic.service.gen.IShiftGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班次] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class ShiftGenServiceImpl extends BaseServiceImpl implements IShiftGenService { + + @Override + public IPage selectShiftPage(IPage page, ShiftGenVO shift) { + return page.setRecords(baseMapper.selectShiftPage(page, shift)); + } + + @Override + public List exportShift(Wrapper queryWrapper) { + List shiftList = baseMapper.exportShift(queryWrapper); + //shiftList.forEach(shift -> { + // shift.setTypeName(DictCache.getValue(DictEnum.YES_NO, Shift.getType())); + //}); + return shiftList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java new file mode 100644 index 000000000..31e93d354 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.mapper.gen.TeamGenMapper; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; +import org.springblade.desk.basic.service.gen.ITeamGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班组] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class TeamGenServiceImpl extends BaseServiceImpl implements ITeamGenService { + + @Override + public IPage selectTeamPage(IPage page, TeamGenVO team) { + return page.setRecords(baseMapper.selectTeamPage(page, team)); + } + + @Override + public List exportTeam(Wrapper queryWrapper) { + List teamList = baseMapper.exportTeam(queryWrapper); + //teamList.forEach(team -> { + // team.setTypeName(DictCache.getValue(DictEnum.YES_NO, Team.getType())); + //}); + return teamList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkTankGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkTankGenServiceImpl.java new file mode 100644 index 000000000..d70f99a52 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkTankGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.WorkTankGenExcel; +import org.springblade.desk.basic.mapper.gen.WorkTankGenMapper; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.pojo.vo.gen.WorkTankGenVO; +import org.springblade.desk.basic.service.gen.IWorkTankGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [作业槽] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class WorkTankGenServiceImpl extends BaseServiceImpl implements IWorkTankGenService { + + @Override + public IPage selectWorkTankPage(IPage page, WorkTankGenVO workTank) { + return page.setRecords(baseMapper.selectWorkTankPage(page, workTank)); + } + + @Override + public List exportWorkTank(Wrapper queryWrapper) { + List workTankList = baseMapper.exportWorkTank(queryWrapper); + //workTankList.forEach(workTank -> { + // workTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkTank.getType())); + //}); + return workTankList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java new file mode 100644 index 000000000..45d344dfb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.mapper.gen.WorkstationGenMapper; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; +import org.springblade.desk.basic.service.gen.IWorkstationGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [作业中心] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class WorkstationGenServiceImpl extends BaseServiceImpl implements IWorkstationGenService { + + @Override + public IPage selectWorkstationPage(IPage page, WorkstationGenVO workstation) { + return page.setRecords(baseMapper.selectWorkstationPage(page, workstation)); + } + + @Override + public List exportWorkstation(Wrapper queryWrapper) { + List workstationList = baseMapper.exportWorkstation(queryWrapper); + //workstationList.forEach(workstation -> { + // workstation.setTypeName(DictCache.getValue(DictEnum.YES_NO, Workstation.getType())); + //}); + return workstationList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java new file mode 100644 index 000000000..3c2eed875 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; +import org.springblade.desk.basic.pojo.vo.gen.BaWorkstationGenVO; + +import java.util.Objects; + +/** + * [作业中心] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class BaWorkstationGenWrapper extends BaseEntityWrapper { + + public static BaWorkstationGenWrapper build() { + return new BaWorkstationGenWrapper(); + } + + @Override + public BaWorkstationGenVO entityVO(BaWorkstation baWorkstation) { + BaWorkstationGenVO baWorkstationVO = Objects.requireNonNull(BeanUtil.copyProperties(baWorkstation, BaWorkstationGenVO.class)); + + //User createUser = UserCache.getUser(baWorkstation.getCreateUser()); + //User updateUser = UserCache.getUser(baWorkstation.getUpdateUser()); + //baWorkstationVO.setCreateUserName(createUser.getName()); + //baWorkstationVO.setUpdateUserName(updateUser.getName()); + + return baWorkstationVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/FormulaGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/FormulaGenWrapper.java new file mode 100644 index 000000000..9b238bfb1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/FormulaGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Formula; +import org.springblade.desk.basic.pojo.vo.gen.FormulaGenVO; + +import java.util.Objects; + +/** + * [计算公式] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class FormulaGenWrapper extends BaseEntityWrapper { + + public static FormulaGenWrapper build() { + return new FormulaGenWrapper(); + } + + @Override + public FormulaGenVO entityVO(Formula formula) { + FormulaGenVO formulaVO = Objects.requireNonNull(BeanUtil.copyProperties(formula, FormulaGenVO.class)); + + //User createUser = UserCache.getUser(formula.getCreateUser()); + //User updateUser = UserCache.getUser(formula.getUpdateUser()); + //formulaVO.setCreateUserName(createUser.getName()); + //formulaVO.setUpdateUserName(updateUser.getName()); + + return formulaVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java new file mode 100644 index 000000000..2c6695b95 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.Objects; + +/** + * [班次] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class ShiftGenWrapper extends BaseEntityWrapper { + + public static ShiftGenWrapper build() { + return new ShiftGenWrapper(); + } + + @Override + public ShiftGenVO entityVO(Shift shift) { + ShiftGenVO shiftVO = Objects.requireNonNull(BeanUtil.copyProperties(shift, ShiftGenVO.class)); + + //User createUser = UserCache.getUser(shift.getCreateUser()); + //User updateUser = UserCache.getUser(shift.getUpdateUser()); + //shiftVO.setCreateUserName(createUser.getName()); + //shiftVO.setUpdateUserName(updateUser.getName()); + + return shiftVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java new file mode 100644 index 000000000..9a47fa975 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.Objects; + +/** + * [班组] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class TeamGenWrapper extends BaseEntityWrapper { + + public static TeamGenWrapper build() { + return new TeamGenWrapper(); + } + + @Override + public TeamGenVO entityVO(Team team) { + TeamGenVO teamVO = Objects.requireNonNull(BeanUtil.copyProperties(team, TeamGenVO.class)); + + //User createUser = UserCache.getUser(team.getCreateUser()); + //User updateUser = UserCache.getUser(team.getUpdateUser()); + //teamVO.setCreateUserName(createUser.getName()); + //teamVO.setUpdateUserName(updateUser.getName()); + + return teamVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkTankGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkTankGenWrapper.java new file mode 100644 index 000000000..1023f9aad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkTankGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.pojo.vo.gen.WorkTankGenVO; + +import java.util.Objects; + +/** + * [作业槽] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class WorkTankGenWrapper extends BaseEntityWrapper { + + public static WorkTankGenWrapper build() { + return new WorkTankGenWrapper(); + } + + @Override + public WorkTankGenVO entityVO(WorkTank workTank) { + WorkTankGenVO workTankVO = Objects.requireNonNull(BeanUtil.copyProperties(workTank, WorkTankGenVO.class)); + + //User createUser = UserCache.getUser(workTank.getCreateUser()); + //User updateUser = UserCache.getUser(workTank.getUpdateUser()); + //workTankVO.setCreateUserName(createUser.getName()); + //workTankVO.setUpdateUserName(updateUser.getName()); + + return workTankVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java new file mode 100644 index 000000000..693d89243 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.Objects; + +/** + * [作业中心] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class WorkstationGenWrapper extends BaseEntityWrapper { + + public static WorkstationGenWrapper build() { + return new WorkstationGenWrapper(); + } + + @Override + public WorkstationGenVO entityVO(Workstation workstation) { + WorkstationGenVO workstationVO = Objects.requireNonNull(BeanUtil.copyProperties(workstation, WorkstationGenVO.class)); + + //User createUser = UserCache.getUser(workstation.getCreateUser()); + //User updateUser = UserCache.getUser(workstation.getUpdateUser()); + //workstationVO.setCreateUserName(createUser.getName()); + //workstationVO.setUpdateUserName(updateUser.getName()); + + return workstationVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java new file mode 100644 index 000000000..647584996 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java @@ -0,0 +1,102 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.AssayContentDetail; +import org.springblade.desk.order.service.IAssayContentDetailService; +import org.springblade.desk.order.service.IAssayContentService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 化验含量 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/assayContent") +@Tag(name = "化验含量", description = "接口") +public class AssayContentController extends BladeController { + + private final IAssayContentDetailService assayContentDetailService; + private final IAssayContentService assayContentService; + + /** + * 分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(AssayContentDetail authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + AssayContentDetail detail = assayContentDetailService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody AssayContentDetail entity) { + assayContentDetailService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody AssayContentDetail entity) { + assayContentDetailService.updateById(entity); + return R.status(true); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(assayContentDetailService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 列表 - 未使用的化验含量 + */ + @GetMapping("/listNoUsed") + @ApiOperationSupport(order = 1) + @Operation(summary = "列表", description = "") + public R listNoUsed(AssayContentDetail authClient, Query query) { + return R.data(null); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java new file mode 100644 index 000000000..b4568812d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java @@ -0,0 +1,117 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.service.IMoldPlanOrderService; +import org.springblade.desk.order.service.IMoldPlanService; +import org.springblade.desk.order.service.IMoldPlanToolService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 烧结模具计划 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/moldPlan") +@Tag(name = "烧结模具计划", description = "接口") +public class MoldPlanController extends BladeController { + + private final IMoldPlanService moldPlanService; + private final IMoldPlanToolService moldPlanToolService; + private final IMoldPlanOrderService moldPlanOrderService; + + /** + * 分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(MoldPlan authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + MoldPlan detail = moldPlanService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody MoldPlan entity) { + // 保存模具需求 + // 保存模具需求明细（工装信息、订单信息） + moldPlanService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody MoldPlan entity) { + moldPlanService.updateById(entity); + return R.status(true); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(moldPlanService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 批量关闭 + */ + @PostMapping("/closeBatch") + @ApiOperationSupport(order = 7) + @Operation(summary = "批量关闭", description = "传入ids") + public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(true); + } + + /** + * 分页-近一月的模具计划 + */ + @GetMapping("/pageNearlyMonth") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> pageNearlyMonth(MoldPlan authClient, Query query) { + // 根据零件号，分页查询近一月的模具申报 + return R.data(null); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java new file mode 100644 index 000000000..28d65c67c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -0,0 +1,103 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; +import org.springblade.desk.order.service.IPlateGoodsApplyService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 镀层物料添加量申报 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/plateGoodsApply") +@Tag(name = "镀层物料添加量申报", description = "接口") +public class PlateGoodsApplyController extends BladeController { + + private final IPlateGoodsApplyService plateGoodsApplyService; + private final IPlateGoodsApplyDetailService plateGoodsApplyDetailService; + + /** + * 分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(PlateGoodsApply authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + PlateGoodsApply detail = plateGoodsApplyService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody PlateGoodsApply entity) { + // 保存添加申报 + // 保存添加申报明细 + plateGoodsApplyService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody PlateGoodsApply entity) { + plateGoodsApplyService.updateById(entity); + return R.status(true); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(plateGoodsApplyService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 批量审核 + */ + @PostMapping("/confirmBatch") + @ApiOperationSupport(order = 7) + @Operation(summary = "批量审核", description = "传入ids") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(true); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java new file mode 100644 index 000000000..ea43deea1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -0,0 +1,125 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.AssayContentDetail; +import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.entity.YieldPlan; +import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; +import org.springblade.desk.order.service.IPlateGoodsRecordService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 镀层物料需求申报 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/plateGoodsRecord") +@Tag(name = "镀层物料需求申报", description = "接口") +public class PlateGoodsRecordController extends BladeController { + + private final IPlateGoodsRecordService assayContentDetailService; + private final IPlateGoodsRecordDetailService plateGoodsRecordDetailService; + + /** + * 分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(YieldPlan authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + PlateGoodsRecord detail = assayContentDetailService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody PlateGoodsRecord entity) { + // 保存申报结果 + // 保存申报明细 + assayContentDetailService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody PlateGoodsRecord entity) { + assayContentDetailService.updateById(entity); + return R.status(true); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 5) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(assayContentDetailService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 批量审核 + */ + @PostMapping("/confirmBatch") + @ApiOperationSupport(order = 6) + @Operation(summary = "批量审核", description = "传入ids") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(true); + } + + /** + * 批量关闭 + */ + @PostMapping("/closeBatch") + @ApiOperationSupport(order = 7) + @Operation(summary = "批量关闭", description = "传入ids") + public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(true); + } + + /** + * 列表 - 查询已审批通过但未添加完成的申请列表 + */ + @GetMapping("/listNoFinished") + @ApiOperationSupport(order = 1) + @Operation(summary = "列表", description = "") + public R listNoFinished(AssayContentDetail authClient, Query query) { + return R.data(null); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldErrorController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldErrorController.java new file mode 100644 index 000000000..4b2232392 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldErrorController.java @@ -0,0 +1,118 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.desk.order.entity.YieldError; +import org.springblade.desk.order.entity.YieldOrder; +import org.springblade.desk.order.entity.YieldPlan; +import org.springblade.desk.order.service.IYieldErrorService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 异常订单 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/yieldError") +@Tag(name = "异常订单", description = "接口") +public class YieldErrorController extends BladeController { + + private final IYieldErrorService yieldErrorService; + + /** + * 分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(YieldPlan authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + YieldError detail = yieldErrorService.getById(id); + return R.data(detail); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 3) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody YieldOrder entity) { + return R.status(true); + } + + /** + * 批量关闭订单 + */ + @PostMapping("/closeBatch") + @ApiOperationSupport(order = 4) + @Operation(summary = "批量确认", description = "传入ids") + public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(true); + } + + /** + * 数据缺失验证 + */ + @PostMapping("/checkData") + @ApiOperationSupport(order = 5) + @Operation(summary = "数据缺失验证", description = "") + public R checkData(@Valid @RequestBody String id) { + return R.status(true); + } + + /** + * 工艺缺失验证 + */ + @PostMapping("/checkCraft") + @ApiOperationSupport(order = 6) + @Operation(summary = "工艺缺失验证", description = "") + public R checkCraft(@Valid @RequestBody String id) { + return R.status(true); + } + + /** + * 资源缺失验证 + */ + @PostMapping("/checkResource") + @ApiOperationSupport(order = 7) + @Operation(summary = "资源缺失验证", description = "") + public R checkResource(@Valid @RequestBody String id) { + return R.status(true); + } + + /** + * 交期冲突验证 + */ + @PostMapping("/checkDelivery") + @ApiOperationSupport(order = 8) + @Operation(summary = "交期冲突验证", description = "") + public R checkDelivery(@Valid @RequestBody String id) { + return R.status(true); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java new file mode 100644 index 000000000..e165e2927 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -0,0 +1,125 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.YieldOrder; +import org.springblade.desk.order.service.IYieldOrderCraftService; +import org.springblade.desk.order.service.IYieldOrderService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 生产订单 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/yieldOrder") +@Tag(name = "生产订单", description = "接口") +public class YieldOrderController extends BladeController { + + private final IYieldOrderService yieldOrderService; + private final IYieldOrderCraftService yieldOrderCraftService; + + /** + * 分页查询列表 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(YieldOrder authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + YieldOrder detail = yieldOrderService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody YieldOrder entity) { + yieldOrderService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody YieldOrder entity) { + yieldOrderService.updateById(entity); + return R.status(true); + } + + + /** + * 批量确认 + */ + @PostMapping("/confirmBatch") + @ApiOperationSupport(order = 5) + @Operation(summary = "批量确认", description = "传入ids") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(yieldOrderService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 工艺路线 + */ + @PostMapping("/getCraftList") + @ApiOperationSupport(order = 6) + @Operation(summary = "批量确认", description = "传入id") + public R getCraftList(@Parameter(description = "主键", required = true) @RequestParam String id) { + // 根据生产订单ID查询工艺列表 + return R.data(null); + } + + /** + * 批量修改优先级 + */ + @PostMapping("/updatePreference") + @ApiOperationSupport(order = 7) + @Operation(summary = "修改优先级", description = "传入id") + public R updatePreferenceBatch(@Parameter(description = "主键", required = true) @RequestParam String id, @RequestParam String preference) { + // 根据生产订单ID修改排产优先级 + return R.status(yieldOrderService.deleteLogic(Func.toLongList(id))); + } + + /** + * 分页-查询订单配套信息 + */ + @PostMapping("/pageAllocation") + @ApiOperationSupport(order = 8) + @Operation(summary = "分页查询订单配套信息", description = "") + public R pageAllocation() { + // 从ERP查询生产订单的配套信息 + return R.data(null); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java new file mode 100644 index 000000000..2129efac5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java @@ -0,0 +1,136 @@ +package org.springblade.desk.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.IsAdministrator; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.YieldPlan; +import org.springblade.desk.order.service.IYieldPlanService; +import org.springframework.web.bind.annotation.*; + +/** + * 应用管理控制器 - 生产计划 + * + * @author lqk + */ +@Hidden +@NonDS +@RestController +@AllArgsConstructor +@IsAdministrator +@RequestMapping("/order/yieldPlan") +@Tag(name = "生产计划", description = "接口") +public class YieldPlanController extends BladeController { + + private final IYieldPlanService yieldPlanService; + + /** + * 分页查询列表 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "分页", description = "") + public R> page(YieldPlan authClient, Query query) { + return R.data(null); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 2) + @Operation(summary = "详情", description = "") + public R detail(String id) { + YieldPlan detail = yieldPlanService.getById(id); + return R.data(detail); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 3) + @Operation(summary = "新增", description = "") + public R save(@Valid @RequestBody YieldPlan entity) { + yieldPlanService.save(entity); + return R.status(true); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 4) + @Operation(summary = "修改", description = "") + public R update(@Valid @RequestBody YieldPlan entity) { + yieldPlanService.updateById(entity); + return R.status(true); + } + + /** + * 根据生产计划ID获取二级工艺 + * + * @param ypId + * @return + */ + @GetMapping(value = "/getCraftData/{ypId}") + @ApiOperationSupport(order = 5) + @Operation(summary = "根据生产计划获取二级工艺", description = "") + public R getCraftData(@PathVariable Long ypId) { + return R.data(null); + } + + /** + * 通过零件号从ERP查询一级工序 + * + * @param partCode + * @return + */ + @GetMapping(value = "/getFirstProcess/{partCode}") + @ApiOperationSupport(order = 6) + @Operation(summary = "通过零件号查询一级工序", description = "") + public R getFirstProcess(@PathVariable String partCode) { + return R.data(null); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(yieldPlanService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 批量关闭 + */ + @PostMapping("/closeBatch") + @ApiOperationSupport(order = 8) + @Operation(summary = "批量关闭", description = "传入ids") + public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(yieldPlanService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 下发玻璃饼订单 + */ + @PostMapping("/saveGlassCake") + @ApiOperationSupport(order = 9) + @Operation(summary = "下发玻璃饼订单", description = "传入id") + public R saveGlassCake(@Parameter(description = "主键", required = true) @RequestParam String ids) { + // 根据生产计划ID， 生产玻璃饼生产订单 + return R.status(yieldPlanService.deleteLogic(Func.toLongList(ids))); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java new file mode 100644 index 000000000..ee827ca16 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.AssayContentDetail; + +/** + * @author lqk + * @description 针对表【MES_ASSAY_CONTENT_DETAIL(化验含量明细)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.AssayContentDetail + */ +public interface AssayContentDetailMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(AssayContentDetail record); + + int insertSelective(AssayContentDetail record); + + AssayContentDetail selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(AssayContentDetail record); + + int updateByPrimaryKey(AssayContentDetail record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml new file mode 100644 index 000000000..2c87f0cdc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + AC_ID,SLOT,TEST_VAL, + SAVE_GOLD_VAL,SAVE_SILVER_VAL,SAVE_BOARD_VAL, + ACTUAL_VAL + + + + + + DELETE + FROM mes_assay_content_detail + WHERE id = #{ID,jdbcType=DECIMAL} + + + INSERT INTO mes_assay_content_detail ( id, tenant_id, create_user + , create_dept, create_time, update_user + , update_time, status, is_deleted + , ac_id, slot, test_val + , save_gold_val, save_silver_val, save_board_val + , actual_val) + VALUES ( #{ID,jdbcType=DECIMAL}, #{TENANT_ID,jdbcType=VARCHAR}, #{CREATE_USER,jdbcType=DECIMAL} + , #{CREATE_DEPT,jdbcType=DECIMAL}, #{CREATE_TIME,jdbcType=TIMESTAMP}, #{UPDATE_USER,jdbcType=DECIMAL} + , #{UPDATE_TIME,jdbcType=TIMESTAMP}, #{STATUS,jdbcType=DECIMAL}, #{IS_DELETED,jdbcType=DECIMAL} + , #{AC_ID,jdbcType=DECIMAL}, #{SLOT,jdbcType=VARCHAR}, #{TEST_VAL,jdbcType=DECIMAL} + , #{SAVE_GOLD_VAL,jdbcType=DECIMAL}, #{SAVE_SILVER_VAL,jdbcType=DECIMAL}, #{SAVE_BOARD_VAL,jdbcType=DECIMAL} + , #{ACTUAL_VAL,jdbcType=DECIMAL}) + + + insert into MES_ASSAY_CONTENT_DETAIL + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + AC_ID, + SLOT, + TEST_VAL, + SAVE_GOLD_VAL, + SAVE_SILVER_VAL, + SAVE_BOARD_VAL, + ACTUAL_VAL, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{AC_ID,jdbcType=DECIMAL}, + #{SLOT,jdbcType=VARCHAR}, + #{TEST_VAL,jdbcType=DECIMAL}, + #{SAVE_GOLD_VAL,jdbcType=DECIMAL}, + #{SAVE_SILVER_VAL,jdbcType=DECIMAL}, + #{SAVE_BOARD_VAL,jdbcType=DECIMAL}, + #{ACTUAL_VAL,jdbcType=DECIMAL}, + + + + update MES_ASSAY_CONTENT_DETAIL + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + AC_ID = #{AC_ID,jdbcType=DECIMAL}, + + + SLOT = #{SLOT,jdbcType=VARCHAR}, + + + TEST_VAL = #{TEST_VAL,jdbcType=DECIMAL}, + + + SAVE_GOLD_VAL = #{SAVE_GOLD_VAL,jdbcType=DECIMAL}, + + + SAVE_SILVER_VAL = #{SAVE_SILVER_VAL,jdbcType=DECIMAL}, + + + SAVE_BOARD_VAL = #{SAVE_BOARD_VAL,jdbcType=DECIMAL}, + + + ACTUAL_VAL = #{ACTUAL_VAL,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + UPDATE mes_assay_content_detail + SET tenant_id = #{TENANT_ID,jdbcType=VARCHAR}, + create_user = #{CREATE_USER,jdbcType=DECIMAL}, + create_dept = #{CREATE_DEPT,jdbcType=DECIMAL}, + create_time = #{CREATE_TIME,jdbcType=TIMESTAMP}, + update_user = #{UPDATE_USER,jdbcType=DECIMAL}, + update_time = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + status = #{STATUS,jdbcType=DECIMAL}, + is_deleted = #{IS_DELETED,jdbcType=DECIMAL}, + ac_id = #{AC_ID,jdbcType=DECIMAL}, + slot = #{SLOT,jdbcType=VARCHAR}, + test_val = #{TEST_VAL,jdbcType=DECIMAL}, + save_gold_val = #{SAVE_GOLD_VAL,jdbcType=DECIMAL}, + save_silver_val = #{SAVE_SILVER_VAL,jdbcType=DECIMAL}, + save_board_val = #{SAVE_BOARD_VAL,jdbcType=DECIMAL}, + actual_val = #{ACTUAL_VAL,jdbcType=DECIMAL} + WHERE id = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java new file mode 100644 index 000000000..f68444e3e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.AssayContent; +import org.springblade.desk.order.entity.AssayContentDetail; + +/** + * @author lqk + * @description 针对表【MES_ASSAY_CONTENT(化验含量)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.AssayContent + */ +public interface AssayContentMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(AssayContent record); + + int insertSelective(AssayContent record); + + AssayContent selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(AssayContent record); + + int updateByPrimaryKey(AssayContent record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml new file mode 100644 index 000000000..a814b2281 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + WC_ID,ASSAY_MAN,ASSAY_TIME, + APPLY_STATUS,GOLD_POTASSIUM,SILVER_POTASSIUM, + SILVER_PLATE + + + + + + delete from MES_ASSAY_CONTENT + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_ASSAY_CONTENT + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,WC_ID,ASSAY_MAN,ASSAY_TIME + ,APPLY_STATUS,GOLD_POTASSIUM,SILVER_POTASSIUM + ,SILVER_PLATE) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{WC_ID,jdbcType=DECIMAL},#{ASSAY_MAN,jdbcType=DECIMAL},#{ASSAY_TIME,jdbcType=TIMESTAMP} + ,#{APPLY_STATUS,jdbcType=DECIMAL},#{GOLD_POTASSIUM,jdbcType=DECIMAL},#{SILVER_POTASSIUM,jdbcType=DECIMAL} + ,#{SILVER_PLATE,jdbcType=DECIMAL}) + + + insert into MES_ASSAY_CONTENT + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + WC_ID, + ASSAY_MAN, + ASSAY_TIME, + APPLY_STATUS, + GOLD_POTASSIUM, + SILVER_POTASSIUM, + SILVER_PLATE, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{WC_ID,jdbcType=DECIMAL}, + #{ASSAY_MAN,jdbcType=DECIMAL}, + #{ASSAY_TIME,jdbcType=TIMESTAMP}, + #{APPLY_STATUS,jdbcType=DECIMAL}, + #{GOLD_POTASSIUM,jdbcType=DECIMAL}, + #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + #{SILVER_PLATE,jdbcType=DECIMAL}, + + + + update MES_ASSAY_CONTENT + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + + + ASSAY_MAN = #{ASSAY_MAN,jdbcType=DECIMAL}, + + + ASSAY_TIME = #{ASSAY_TIME,jdbcType=TIMESTAMP}, + + + APPLY_STATUS = #{APPLY_STATUS,jdbcType=DECIMAL}, + + + GOLD_POTASSIUM = #{GOLD_POTASSIUM,jdbcType=DECIMAL}, + + + SILVER_POTASSIUM = #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + + + SILVER_PLATE = #{SILVER_PLATE,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_ASSAY_CONTENT + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + ASSAY_MAN = #{ASSAY_MAN,jdbcType=DECIMAL}, + ASSAY_TIME = #{ASSAY_TIME,jdbcType=TIMESTAMP}, + APPLY_STATUS = #{APPLY_STATUS,jdbcType=DECIMAL}, + GOLD_POTASSIUM = #{GOLD_POTASSIUM,jdbcType=DECIMAL}, + SILVER_POTASSIUM = #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + SILVER_PLATE = #{SILVER_PLATE,jdbcType=DECIMAL} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java new file mode 100644 index 000000000..60094a031 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.AssayContentDetail; +import org.springblade.desk.order.entity.MoldPlan; + +/** + * @author lqk + * @description 针对表【MES_MOLD_PLAN(烧结模具计划)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.MoldPlan + */ +public interface MoldPlanMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(MoldPlan record); + + int insertSelective(MoldPlan record); + + MoldPlan selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(MoldPlan record); + + int updateByPrimaryKey(MoldPlan record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml new file mode 100644 index 000000000..447172bda --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + MO_CODE,MO_NAME,QUANTITY, + ERP_ID,YP_ID,ERP_WO_CODE, + MAF_STATUS,PLAN_TYPE,NEED_DATE, + KEEPER,RELEASER,QUA_LEVEL, + PLAN_TYPE_NAME,PART_CODE,PART_NAME, + MEMO,MAF_TYPE,URGENT_TYPE + + + + + + delete from MES_MOLD_PLAN + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_MOLD_PLAN + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,MO_CODE,MO_NAME,QUANTITY + ,ERP_ID,YP_ID,ERP_WO_CODE + ,MAF_STATUS,PLAN_TYPE,NEED_DATE + ,KEEPER,RELEASER,QUA_LEVEL + ,PLAN_TYPE_NAME,PART_CODE,PART_NAME + ,MEMO,MAF_TYPE,URGENT_TYPE + ) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{MO_CODE,jdbcType=VARCHAR},#{MO_NAME,jdbcType=VARCHAR},#{QUANTITY,jdbcType=DECIMAL} + ,#{ERP_ID,jdbcType=DECIMAL},#{YP_ID,jdbcType=DECIMAL},#{ERP_WO_CODE,jdbcType=VARCHAR} + ,#{MAF_STATUS,jdbcType=DECIMAL},#{PLAN_TYPE,jdbcType=VARCHAR},#{NEED_DATE,jdbcType=TIMESTAMP} + ,#{KEEPER,jdbcType=DECIMAL},#{RELEASER,jdbcType=DECIMAL},#{QUA_LEVEL,jdbcType=VARCHAR} + ,#{PLAN_TYPE_NAME,jdbcType=VARCHAR},#{PART_CODE,jdbcType=VARCHAR},#{PART_NAME,jdbcType=VARCHAR} + ,#{MEMO,jdbcType=VARCHAR},#{MAF_TYPE,jdbcType=DECIMAL},#{URGENT_TYPE,jdbcType=VARCHAR} + ) + + + insert into MES_MOLD_PLAN + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + MO_CODE, + MO_NAME, + QUANTITY, + ERP_ID, + YP_ID, + ERP_WO_CODE, + MAF_STATUS, + PLAN_TYPE, + NEED_DATE, + KEEPER, + RELEASER, + QUA_LEVEL, + PLAN_TYPE_NAME, + PART_CODE, + PART_NAME, + MEMO, + MAF_TYPE, + URGENT_TYPE, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{MO_CODE,jdbcType=VARCHAR}, + #{MO_NAME,jdbcType=VARCHAR}, + #{QUANTITY,jdbcType=DECIMAL}, + #{ERP_ID,jdbcType=DECIMAL}, + #{YP_ID,jdbcType=DECIMAL}, + #{ERP_WO_CODE,jdbcType=VARCHAR}, + #{MAF_STATUS,jdbcType=DECIMAL}, + #{PLAN_TYPE,jdbcType=VARCHAR}, + #{NEED_DATE,jdbcType=TIMESTAMP}, + #{KEEPER,jdbcType=DECIMAL}, + #{RELEASER,jdbcType=DECIMAL}, + #{QUA_LEVEL,jdbcType=VARCHAR}, + #{PLAN_TYPE_NAME,jdbcType=VARCHAR}, + #{PART_CODE,jdbcType=VARCHAR}, + #{PART_NAME,jdbcType=VARCHAR}, + #{MEMO,jdbcType=VARCHAR}, + #{MAF_TYPE,jdbcType=DECIMAL}, + #{URGENT_TYPE,jdbcType=VARCHAR}, + + + + update MES_MOLD_PLAN + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + MO_CODE = #{MO_CODE,jdbcType=VARCHAR}, + + + MO_NAME = #{MO_NAME,jdbcType=VARCHAR}, + + + QUANTITY = #{QUANTITY,jdbcType=DECIMAL}, + + + ERP_ID = #{ERP_ID,jdbcType=DECIMAL}, + + + YP_ID = #{YP_ID,jdbcType=DECIMAL}, + + + ERP_WO_CODE = #{ERP_WO_CODE,jdbcType=VARCHAR}, + + + MAF_STATUS = #{MAF_STATUS,jdbcType=DECIMAL}, + + + PLAN_TYPE = #{PLAN_TYPE,jdbcType=VARCHAR}, + + + NEED_DATE = #{NEED_DATE,jdbcType=TIMESTAMP}, + + + KEEPER = #{KEEPER,jdbcType=DECIMAL}, + + + RELEASER = #{RELEASER,jdbcType=DECIMAL}, + + + QUA_LEVEL = #{QUA_LEVEL,jdbcType=VARCHAR}, + + + PLAN_TYPE_NAME = #{PLAN_TYPE_NAME,jdbcType=VARCHAR}, + + + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + + + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + + + MEMO = #{MEMO,jdbcType=VARCHAR}, + + + MAF_TYPE = #{MAF_TYPE,jdbcType=DECIMAL}, + + + URGENT_TYPE = #{URGENT_TYPE,jdbcType=VARCHAR}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_MOLD_PLAN + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + MO_CODE = #{MO_CODE,jdbcType=VARCHAR}, + MO_NAME = #{MO_NAME,jdbcType=VARCHAR}, + QUANTITY = #{QUANTITY,jdbcType=DECIMAL}, + ERP_ID = #{ERP_ID,jdbcType=DECIMAL}, + YP_ID = #{YP_ID,jdbcType=DECIMAL}, + ERP_WO_CODE = #{ERP_WO_CODE,jdbcType=VARCHAR}, + MAF_STATUS = #{MAF_STATUS,jdbcType=DECIMAL}, + PLAN_TYPE = #{PLAN_TYPE,jdbcType=VARCHAR}, + NEED_DATE = #{NEED_DATE,jdbcType=TIMESTAMP}, + KEEPER = #{KEEPER,jdbcType=DECIMAL}, + RELEASER = #{RELEASER,jdbcType=DECIMAL}, + QUA_LEVEL = #{QUA_LEVEL,jdbcType=VARCHAR}, + PLAN_TYPE_NAME = #{PLAN_TYPE_NAME,jdbcType=VARCHAR}, + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + MEMO = #{MEMO,jdbcType=VARCHAR}, + MAF_TYPE = #{MAF_TYPE,jdbcType=DECIMAL}, + URGENT_TYPE = #{URGENT_TYPE,jdbcType=VARCHAR} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java new file mode 100644 index 000000000..1825525a5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.entity.MoldPlanOrder; + +/** + * @author lqk + * @description 针对表【MES_MOLD_PLAN_ORDER(烧结模具计划-订单关联表)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.MoldPlanOrder + */ +public interface MoldPlanOrderMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(MoldPlanOrder record); + + int insertSelective(MoldPlanOrder record); + + MoldPlanOrder selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(MoldPlanOrder record); + + int updateByPrimaryKey(MoldPlanOrder record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml new file mode 100644 index 000000000..36f8f2ce8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + MP_ID,YO_ID + + + + + + delete from MES_MOLD_PLAN_ORDER + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_MOLD_PLAN_ORDER + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,MP_ID,YO_ID) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{MP_ID,jdbcType=DECIMAL},#{YO_ID,jdbcType=DECIMAL}) + + + insert into MES_MOLD_PLAN_ORDER + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + MP_ID, + YO_ID, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{MP_ID,jdbcType=DECIMAL}, + #{YO_ID,jdbcType=DECIMAL}, + + + + update MES_MOLD_PLAN_ORDER + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + MP_ID = #{MP_ID,jdbcType=DECIMAL}, + + + YO_ID = #{YO_ID,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_MOLD_PLAN_ORDER + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + MP_ID = #{MP_ID,jdbcType=DECIMAL}, + YO_ID = #{YO_ID,jdbcType=DECIMAL} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java new file mode 100644 index 000000000..7a19cdd0f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.MoldPlanTool; + +/** + * @author lqk + * @description 针对表【MES_MOLD_PLAN_TOOL(烧结模具计划-工装关联表)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.MoldPlanTool + */ +public interface MoldPlanToolMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(MoldPlanTool record); + + int insertSelective(MoldPlanTool record); + + MoldPlanTool selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(MoldPlanTool record); + + int updateByPrimaryKey(MoldPlanTool record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml new file mode 100644 index 000000000..e6ac827a3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + MP_ID,TOOL_ID + + + + + + delete from MES_MOLD_PLAN_TOOL + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_MOLD_PLAN_TOOL + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,MP_ID,TOOL_ID) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{MP_ID,jdbcType=DECIMAL},#{TOOL_ID,jdbcType=DECIMAL}) + + + insert into MES_MOLD_PLAN_TOOL + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + MP_ID, + TOOL_ID, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{MP_ID,jdbcType=DECIMAL}, + #{TOOL_ID,jdbcType=DECIMAL}, + + + + update MES_MOLD_PLAN_TOOL + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + MP_ID = #{MP_ID,jdbcType=DECIMAL}, + + + TOOL_ID = #{TOOL_ID,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_MOLD_PLAN_TOOL + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + MP_ID = #{MP_ID,jdbcType=DECIMAL}, + TOOL_ID = #{TOOL_ID,jdbcType=DECIMAL} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java new file mode 100644 index 000000000..ad438a348 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; + +/** + * @author lqk + * @description 针对表【MES_PLATE_GOODS_APPLY_DETAIL(镀层物料添加量申报明细)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.PlateGoodsApplyDetail + */ +public interface PlateGoodsApplyDetailMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(PlateGoodsApplyDetail record); + + int insertSelective(PlateGoodsApplyDetail record); + + PlateGoodsApplyDetail selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(PlateGoodsApplyDetail record); + + int updateByPrimaryKey(PlateGoodsApplyDetail record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml new file mode 100644 index 000000000..4d10bfbbe --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + GOODS_CODE,GOODS_DEMAND,APPROVAL_STATUS, + PGAD_ID,INVOLVE_CODE + + + + + + delete from MES_PLATE_GOODS_APPLY_DETAIL + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_PLATE_GOODS_APPLY_DETAIL + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,GOODS_CODE,GOODS_DEMAND,APPROVAL_STATUS + ,PGAD_ID,INVOLVE_CODE) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{GOODS_CODE,jdbcType=VARCHAR},#{GOODS_DEMAND,jdbcType=DECIMAL},#{APPROVAL_STATUS,jdbcType=DECIMAL} + ,#{PGAD_ID,jdbcType=DECIMAL},#{INVOLVE_CODE,jdbcType=VARCHAR}) + + + insert into MES_PLATE_GOODS_APPLY_DETAIL + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + GOODS_CODE, + GOODS_DEMAND, + APPROVAL_STATUS, + PGAD_ID, + INVOLVE_CODE, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{GOODS_CODE,jdbcType=VARCHAR}, + #{GOODS_DEMAND,jdbcType=DECIMAL}, + #{APPROVAL_STATUS,jdbcType=DECIMAL}, + #{PGAD_ID,jdbcType=DECIMAL}, + #{INVOLVE_CODE,jdbcType=VARCHAR}, + + + + update MES_PLATE_GOODS_APPLY_DETAIL + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + GOODS_CODE = #{GOODS_CODE,jdbcType=VARCHAR}, + + + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + + + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + + + PGAD_ID = #{PGAD_ID,jdbcType=DECIMAL}, + + + INVOLVE_CODE = #{INVOLVE_CODE,jdbcType=VARCHAR}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_PLATE_GOODS_APPLY_DETAIL + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + GOODS_CODE = #{GOODS_CODE,jdbcType=VARCHAR}, + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + PGAD_ID = #{PGAD_ID,jdbcType=DECIMAL}, + INVOLVE_CODE = #{INVOLVE_CODE,jdbcType=VARCHAR} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java new file mode 100644 index 000000000..df3cac504 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.PlateGoodsApply; + +/** + * @author lqk + * @description 针对表【MES_PLATE_GOODS_APPLY(镀层物料申报添加量)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.PlateGoodsApply + */ +public interface PlateGoodsApplyMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(PlateGoodsApply record); + + int insertSelective(PlateGoodsApply record); + + PlateGoodsApply selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(PlateGoodsApply record); + + int updateByPrimaryKey(PlateGoodsApply record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml new file mode 100644 index 000000000..950d87004 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + GOODS_CODE,GOODS_DEMAND,APPROVAL_STATUS, + BO_ID,BR_ID,AC_ID, + PGR_ID,WC_ID,INVOLVE_CODE, + CODE_NUM + + + + + + delete from MES_PLATE_GOODS_APPLY + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_PLATE_GOODS_APPLY + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,GOODS_CODE,GOODS_DEMAND,APPROVAL_STATUS + ,BO_ID,BR_ID,AC_ID + ,PGR_ID,WC_ID,INVOLVE_CODE + ,CODE_NUM) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{GOODS_CODE,jdbcType=VARCHAR},#{GOODS_DEMAND,jdbcType=DECIMAL},#{APPROVAL_STATUS,jdbcType=DECIMAL} + ,#{BO_ID,jdbcType=DECIMAL},#{BR_ID,jdbcType=DECIMAL},#{AC_ID,jdbcType=DECIMAL} + ,#{PGR_ID,jdbcType=DECIMAL},#{WC_ID,jdbcType=DECIMAL},#{INVOLVE_CODE,jdbcType=VARCHAR} + ,#{CODE_NUM,jdbcType=VARCHAR}) + + + insert into MES_PLATE_GOODS_APPLY + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + GOODS_CODE, + GOODS_DEMAND, + APPROVAL_STATUS, + BO_ID, + BR_ID, + AC_ID, + PGR_ID, + WC_ID, + INVOLVE_CODE, + CODE_NUM, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{GOODS_CODE,jdbcType=VARCHAR}, + #{GOODS_DEMAND,jdbcType=DECIMAL}, + #{APPROVAL_STATUS,jdbcType=DECIMAL}, + #{BO_ID,jdbcType=DECIMAL}, + #{BR_ID,jdbcType=DECIMAL}, + #{AC_ID,jdbcType=DECIMAL}, + #{PGR_ID,jdbcType=DECIMAL}, + #{WC_ID,jdbcType=DECIMAL}, + #{INVOLVE_CODE,jdbcType=VARCHAR}, + #{CODE_NUM,jdbcType=VARCHAR}, + + + + update MES_PLATE_GOODS_APPLY + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + GOODS_CODE = #{GOODS_CODE,jdbcType=VARCHAR}, + + + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + + + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + + + BO_ID = #{BO_ID,jdbcType=DECIMAL}, + + + BR_ID = #{BR_ID,jdbcType=DECIMAL}, + + + AC_ID = #{AC_ID,jdbcType=DECIMAL}, + + + PGR_ID = #{PGR_ID,jdbcType=DECIMAL}, + + + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + + + INVOLVE_CODE = #{INVOLVE_CODE,jdbcType=VARCHAR}, + + + CODE_NUM = #{CODE_NUM,jdbcType=VARCHAR}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_PLATE_GOODS_APPLY + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + GOODS_CODE = #{GOODS_CODE,jdbcType=VARCHAR}, + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + BO_ID = #{BO_ID,jdbcType=DECIMAL}, + BR_ID = #{BR_ID,jdbcType=DECIMAL}, + AC_ID = #{AC_ID,jdbcType=DECIMAL}, + PGR_ID = #{PGR_ID,jdbcType=DECIMAL}, + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + INVOLVE_CODE = #{INVOLVE_CODE,jdbcType=VARCHAR}, + CODE_NUM = #{CODE_NUM,jdbcType=VARCHAR} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java new file mode 100644 index 000000000..3802825db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; + +/** + * @author lqk + * @description 针对表【MES_PLATE_GOODS_RECORD_DETAIL(镀层物料需求申报明细)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.PlateGoodsRecordDetail + */ +public interface PlateGoodsRecordDetailMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(PlateGoodsRecordDetail record); + + int insertSelective(PlateGoodsRecordDetail record); + + PlateGoodsRecordDetail selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(PlateGoodsRecordDetail record); + + int updateByPrimaryKey(PlateGoodsRecordDetail record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml new file mode 100644 index 000000000..fbd861dfc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + PGRD_ID,YO_ID + + + + + + delete from MES_PLATE_GOODS_RECORD_DETAIL + where + + + insert into MES_PLATE_GOODS_RECORD_DETAIL + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,PGRD_ID,YO_ID) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{PGRD_ID,jdbcType=DECIMAL},#{YO_ID,jdbcType=VARCHAR}) + + + insert into MES_PLATE_GOODS_RECORD_DETAIL + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + PGRD_ID, + YO_ID, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{PGRD_ID,jdbcType=DECIMAL}, + #{YO_ID,jdbcType=VARCHAR}, + + + + update MES_PLATE_GOODS_RECORD_DETAIL + + + ID = #{ID,jdbcType=DECIMAL}, + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + PGRD_ID = #{PGRD_ID,jdbcType=DECIMAL}, + + + YO_ID = #{YO_ID,jdbcType=VARCHAR}, + + + where + + + update MES_PLATE_GOODS_RECORD_DETAIL + set + ID = #{ID,jdbcType=DECIMAL}, + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + PGRD_ID = #{PGRD_ID,jdbcType=DECIMAL}, + YO_ID = #{YO_ID,jdbcType=VARCHAR} + where + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java new file mode 100644 index 000000000..4f193ba1b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.PlateGoodsRecord; + +/** + * @author lqk + * @description 针对表【MES_PLATE_GOODS_RECORD(镀层物料额外需求上报)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.PlateGoodsRecord + */ +public interface PlateGoodsRecordMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(PlateGoodsRecord record); + + int insertSelective(PlateGoodsRecord record); + + PlateGoodsRecord selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(PlateGoodsRecord record); + + int updateByPrimaryKey(PlateGoodsRecord record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml new file mode 100644 index 000000000..fcc0f4f2b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + WC_ID,PLATE_GOODS_CODE,GOODS_DEMAND, + SILVER_POTASSIUM,COEFFICIENT,APPROVAL_MAN, + APPROVAL_TIME,APPROVAL_STATUS,APPROVAL_MEMO, + DECLARED_QUOTA,DECLARED_SILVER,DECLARED_STATUS, + GOODS_BO_ID,COEFFICIENT_BO_ID,PGR_CODE, + SURPLUS,SILVER_POTASSIUM_RESIDUE + + + + + + delete from MES_PLATE_GOODS_RECORD + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_PLATE_GOODS_RECORD + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,WC_ID,PLATE_GOODS_CODE,GOODS_DEMAND + ,SILVER_POTASSIUM,COEFFICIENT,APPROVAL_MAN + ,APPROVAL_TIME,APPROVAL_STATUS,APPROVAL_MEMO + ,DECLARED_QUOTA,DECLARED_SILVER,DECLARED_STATUS + ,GOODS_BO_ID,COEFFICIENT_BO_ID,PGR_CODE + ,SURPLUS,SILVER_POTASSIUM_RESIDUE) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{WC_ID,jdbcType=DECIMAL},#{PLATE_GOODS_CODE,jdbcType=VARCHAR},#{GOODS_DEMAND,jdbcType=DECIMAL} + ,#{SILVER_POTASSIUM,jdbcType=DECIMAL},#{COEFFICIENT,jdbcType=DECIMAL},#{APPROVAL_MAN,jdbcType=DECIMAL} + ,#{APPROVAL_TIME,jdbcType=TIMESTAMP},#{APPROVAL_STATUS,jdbcType=DECIMAL},#{APPROVAL_MEMO,jdbcType=VARCHAR} + ,#{DECLARED_QUOTA,jdbcType=DECIMAL},#{DECLARED_SILVER,jdbcType=DECIMAL},#{DECLARED_STATUS,jdbcType=DECIMAL} + ,#{GOODS_BO_ID,jdbcType=DECIMAL},#{COEFFICIENT_BO_ID,jdbcType=DECIMAL},#{PGR_CODE,jdbcType=VARCHAR} + ,#{SURPLUS,jdbcType=DECIMAL},#{SILVER_POTASSIUM_RESIDUE,jdbcType=DECIMAL}) + + + insert into MES_PLATE_GOODS_RECORD + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + WC_ID, + PLATE_GOODS_CODE, + GOODS_DEMAND, + SILVER_POTASSIUM, + COEFFICIENT, + APPROVAL_MAN, + APPROVAL_TIME, + APPROVAL_STATUS, + APPROVAL_MEMO, + DECLARED_QUOTA, + DECLARED_SILVER, + DECLARED_STATUS, + GOODS_BO_ID, + COEFFICIENT_BO_ID, + PGR_CODE, + SURPLUS, + SILVER_POTASSIUM_RESIDUE, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{WC_ID,jdbcType=DECIMAL}, + #{PLATE_GOODS_CODE,jdbcType=VARCHAR}, + #{GOODS_DEMAND,jdbcType=DECIMAL}, + #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + #{COEFFICIENT,jdbcType=DECIMAL}, + #{APPROVAL_MAN,jdbcType=DECIMAL}, + #{APPROVAL_TIME,jdbcType=TIMESTAMP}, + #{APPROVAL_STATUS,jdbcType=DECIMAL}, + #{APPROVAL_MEMO,jdbcType=VARCHAR}, + #{DECLARED_QUOTA,jdbcType=DECIMAL}, + #{DECLARED_SILVER,jdbcType=DECIMAL}, + #{DECLARED_STATUS,jdbcType=DECIMAL}, + #{GOODS_BO_ID,jdbcType=DECIMAL}, + #{COEFFICIENT_BO_ID,jdbcType=DECIMAL}, + #{PGR_CODE,jdbcType=VARCHAR}, + #{SURPLUS,jdbcType=DECIMAL}, + #{SILVER_POTASSIUM_RESIDUE,jdbcType=DECIMAL}, + + + + update MES_PLATE_GOODS_RECORD + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + + + PLATE_GOODS_CODE = #{PLATE_GOODS_CODE,jdbcType=VARCHAR}, + + + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + + + SILVER_POTASSIUM = #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + + + COEFFICIENT = #{COEFFICIENT,jdbcType=DECIMAL}, + + + APPROVAL_MAN = #{APPROVAL_MAN,jdbcType=DECIMAL}, + + + APPROVAL_TIME = #{APPROVAL_TIME,jdbcType=TIMESTAMP}, + + + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + + + APPROVAL_MEMO = #{APPROVAL_MEMO,jdbcType=VARCHAR}, + + + DECLARED_QUOTA = #{DECLARED_QUOTA,jdbcType=DECIMAL}, + + + DECLARED_SILVER = #{DECLARED_SILVER,jdbcType=DECIMAL}, + + + DECLARED_STATUS = #{DECLARED_STATUS,jdbcType=DECIMAL}, + + + GOODS_BO_ID = #{GOODS_BO_ID,jdbcType=DECIMAL}, + + + COEFFICIENT_BO_ID = #{COEFFICIENT_BO_ID,jdbcType=DECIMAL}, + + + PGR_CODE = #{PGR_CODE,jdbcType=VARCHAR}, + + + SURPLUS = #{SURPLUS,jdbcType=DECIMAL}, + + + SILVER_POTASSIUM_RESIDUE = #{SILVER_POTASSIUM_RESIDUE,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_PLATE_GOODS_RECORD + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + WC_ID = #{WC_ID,jdbcType=DECIMAL}, + PLATE_GOODS_CODE = #{PLATE_GOODS_CODE,jdbcType=VARCHAR}, + GOODS_DEMAND = #{GOODS_DEMAND,jdbcType=DECIMAL}, + SILVER_POTASSIUM = #{SILVER_POTASSIUM,jdbcType=DECIMAL}, + COEFFICIENT = #{COEFFICIENT,jdbcType=DECIMAL}, + APPROVAL_MAN = #{APPROVAL_MAN,jdbcType=DECIMAL}, + APPROVAL_TIME = #{APPROVAL_TIME,jdbcType=TIMESTAMP}, + APPROVAL_STATUS = #{APPROVAL_STATUS,jdbcType=DECIMAL}, + APPROVAL_MEMO = #{APPROVAL_MEMO,jdbcType=VARCHAR}, + DECLARED_QUOTA = #{DECLARED_QUOTA,jdbcType=DECIMAL}, + DECLARED_SILVER = #{DECLARED_SILVER,jdbcType=DECIMAL}, + DECLARED_STATUS = #{DECLARED_STATUS,jdbcType=DECIMAL}, + GOODS_BO_ID = #{GOODS_BO_ID,jdbcType=DECIMAL}, + COEFFICIENT_BO_ID = #{COEFFICIENT_BO_ID,jdbcType=DECIMAL}, + PGR_CODE = #{PGR_CODE,jdbcType=VARCHAR}, + SURPLUS = #{SURPLUS,jdbcType=DECIMAL}, + SILVER_POTASSIUM_RESIDUE = #{SILVER_POTASSIUM_RESIDUE,jdbcType=DECIMAL} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.java new file mode 100644 index 000000000..7c513934b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.YieldError; + +/** + * @author lqk + * @description 针对表【MES_YIELD_ERROR(异常订单)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.YieldError + */ +public interface YieldErrorMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(YieldError record); + + int insertSelective(YieldError record); + + YieldError selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(YieldError record); + + int updateByPrimaryKey(YieldError record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.xml new file mode 100644 index 000000000..5c4ffa92f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldErrorMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + YP_ID,YO_ID,EX_TYPE, + EX_MEMO + + + + + + delete from MES_YIELD_ERROR + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_YIELD_ERROR + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,YP_ID,YO_ID,EX_TYPE + ,EX_MEMO) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{YP_ID,jdbcType=DECIMAL},#{YO_ID,jdbcType=DECIMAL},#{EX_TYPE,jdbcType=DECIMAL} + ,#{EX_MEMO,jdbcType=VARCHAR}) + + + insert into MES_YIELD_ERROR + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + YP_ID, + YO_ID, + EX_TYPE, + EX_MEMO, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{YP_ID,jdbcType=DECIMAL}, + #{YO_ID,jdbcType=DECIMAL}, + #{EX_TYPE,jdbcType=DECIMAL}, + #{EX_MEMO,jdbcType=VARCHAR}, + + + + update MES_YIELD_ERROR + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + YP_ID = #{YP_ID,jdbcType=DECIMAL}, + + + YO_ID = #{YO_ID,jdbcType=DECIMAL}, + + + EX_TYPE = #{EX_TYPE,jdbcType=DECIMAL}, + + + EX_MEMO = #{EX_MEMO,jdbcType=VARCHAR}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_YIELD_ERROR + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + YP_ID = #{YP_ID,jdbcType=DECIMAL}, + YO_ID = #{YO_ID,jdbcType=DECIMAL}, + EX_TYPE = #{EX_TYPE,jdbcType=DECIMAL}, + EX_MEMO = #{EX_MEMO,jdbcType=VARCHAR} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java new file mode 100644 index 000000000..22f68e9ad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.YieldOrderCraft; + +/** + * @author lqk + * @description 针对表【MES_YIELD_ORDER_CRAFT(生产订单工艺)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.YieldOrderCraft + */ +public interface YieldOrderCraftMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(YieldOrderCraft record); + + int insertSelective(YieldOrderCraft record); + + YieldOrderCraft selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(YieldOrderCraft record); + + int updateByPrimaryKey(YieldOrderCraft record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml new file mode 100644 index 000000000..0e7b505ec --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + YO_ID,CRAFT_NO,PROCESS_NO, + PPS_ID,MAKE_MEMO,HOUR_QUOTA, + PID,START_TIME,END_TIME, + MAKE_TEAM,OC_ID,CA_ID, + RP_ID + + + + + + delete from MES_YIELD_ORDER_CRAFT + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_YIELD_ORDER_CRAFT + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,YO_ID,CRAFT_NO,PROCESS_NO + ,PPS_ID,MAKE_MEMO,HOUR_QUOTA + ,PID,START_TIME,END_TIME + ,MAKE_TEAM,OC_ID,CA_ID + ,RP_ID) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{YO_ID,jdbcType=VARCHAR},#{CRAFT_NO,jdbcType=VARCHAR},#{PROCESS_NO,jdbcType=VARCHAR} + ,#{PPS_ID,jdbcType=DECIMAL},#{MAKE_MEMO,jdbcType=VARCHAR},#{HOUR_QUOTA,jdbcType=DECIMAL} + ,#{PID,jdbcType=DECIMAL},#{START_TIME,jdbcType=TIMESTAMP},#{END_TIME,jdbcType=TIMESTAMP} + ,#{MAKE_TEAM,jdbcType=DECIMAL},#{OC_ID,jdbcType=DECIMAL},#{CA_ID,jdbcType=DECIMAL} + ,#{RP_ID,jdbcType=DECIMAL}) + + + insert into MES_YIELD_ORDER_CRAFT + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + YO_ID, + CRAFT_NO, + PROCESS_NO, + PPS_ID, + MAKE_MEMO, + HOUR_QUOTA, + PID, + START_TIME, + END_TIME, + MAKE_TEAM, + OC_ID, + CA_ID, + RP_ID, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{YO_ID,jdbcType=VARCHAR}, + #{CRAFT_NO,jdbcType=VARCHAR}, + #{PROCESS_NO,jdbcType=VARCHAR}, + #{PPS_ID,jdbcType=DECIMAL}, + #{MAKE_MEMO,jdbcType=VARCHAR}, + #{HOUR_QUOTA,jdbcType=DECIMAL}, + #{PID,jdbcType=DECIMAL}, + #{START_TIME,jdbcType=TIMESTAMP}, + #{END_TIME,jdbcType=TIMESTAMP}, + #{MAKE_TEAM,jdbcType=DECIMAL}, + #{OC_ID,jdbcType=DECIMAL}, + #{CA_ID,jdbcType=DECIMAL}, + #{RP_ID,jdbcType=DECIMAL}, + + + + update MES_YIELD_ORDER_CRAFT + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + YO_ID = #{YO_ID,jdbcType=VARCHAR}, + + + CRAFT_NO = #{CRAFT_NO,jdbcType=VARCHAR}, + + + PROCESS_NO = #{PROCESS_NO,jdbcType=VARCHAR}, + + + PPS_ID = #{PPS_ID,jdbcType=DECIMAL}, + + + MAKE_MEMO = #{MAKE_MEMO,jdbcType=VARCHAR}, + + + HOUR_QUOTA = #{HOUR_QUOTA,jdbcType=DECIMAL}, + + + PID = #{PID,jdbcType=DECIMAL}, + + + START_TIME = #{START_TIME,jdbcType=TIMESTAMP}, + + + END_TIME = #{END_TIME,jdbcType=TIMESTAMP}, + + + MAKE_TEAM = #{MAKE_TEAM,jdbcType=DECIMAL}, + + + OC_ID = #{OC_ID,jdbcType=DECIMAL}, + + + CA_ID = #{CA_ID,jdbcType=DECIMAL}, + + + RP_ID = #{RP_ID,jdbcType=DECIMAL}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_YIELD_ORDER_CRAFT + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + YO_ID = #{YO_ID,jdbcType=VARCHAR}, + CRAFT_NO = #{CRAFT_NO,jdbcType=VARCHAR}, + PROCESS_NO = #{PROCESS_NO,jdbcType=VARCHAR}, + PPS_ID = #{PPS_ID,jdbcType=DECIMAL}, + MAKE_MEMO = #{MAKE_MEMO,jdbcType=VARCHAR}, + HOUR_QUOTA = #{HOUR_QUOTA,jdbcType=DECIMAL}, + PID = #{PID,jdbcType=DECIMAL}, + START_TIME = #{START_TIME,jdbcType=TIMESTAMP}, + END_TIME = #{END_TIME,jdbcType=TIMESTAMP}, + MAKE_TEAM = #{MAKE_TEAM,jdbcType=DECIMAL}, + OC_ID = #{OC_ID,jdbcType=DECIMAL}, + CA_ID = #{CA_ID,jdbcType=DECIMAL}, + RP_ID = #{RP_ID,jdbcType=DECIMAL} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java new file mode 100644 index 000000000..016f0fa68 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.YieldOrder; + +/** + * @author lqk + * @description 针对表【MES_YIELD_ORDER(生产订单)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.YieldOrder + */ +public interface YieldOrderMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(YieldOrder record); + + int insertSelective(YieldOrder record); + + YieldOrder selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(YieldOrder record); + + int updateByPrimaryKey(YieldOrder record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml new file mode 100644 index 000000000..5d3a0e97a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -0,0 +1,507 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + YO_CODE,YP_CODE,PART_CODE, + PRODUCT_TYPE,PART_NAME,PLATE, + PRODUCT_IDENT,USE_DEPT,YP_AREA, + DEMAND_DATE,PLAN_USER,RELEASE_DATE, + MEMO,CARD_NO,BATCH_NO, + SITE_WORK,YP_QTY,SYNC_TIME, + CUR_STATUS,ROAM_NO,PRIMARY_CRAFT, + NEXT_ROAM,PDM_URL,PRIORITY, + CUSTODIAN,REWORK_CODE,REWORK_NO, + ENTRUST_DEPT,REWORK_MEMO,FAILURE_MEMO, + BUSINESS_TYPE,FAILURE_MAN,FAILURE_TIME, + RECSEQ_NO,CART_ID,MANUAL_INCREASE, + YIELD_TYPE,FATHER_YO_ID,NEWLEV_FLAG, + PRODUCE_BOOL,USE_DEPT_CODE,YP_PRODUCT_LINE, + YP_MEMO,SJ_MOLD_PREPARATION,SJ_KIT_PREPARATION, + PK_USERNAME,PK_DATE,KIT_PREPARATION_MAN, + KIT_PREPARATION_TIME + + + + + + delete from MES_YIELD_ORDER + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_YIELD_ORDER + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,YO_CODE,YP_CODE,PART_CODE + ,PRODUCT_TYPE,PART_NAME,PLATE + ,PRODUCT_IDENT,USE_DEPT,YP_AREA + ,DEMAND_DATE,PLAN_USER,RELEASE_DATE + ,MEMO,CARD_NO,BATCH_NO + ,SITE_WORK,YP_QTY,SYNC_TIME + ,CUR_STATUS,ROAM_NO,PRIMARY_CRAFT + ,NEXT_ROAM,PDM_URL,PRIORITY + ,CUSTODIAN,REWORK_CODE,REWORK_NO + ,ENTRUST_DEPT,REWORK_MEMO,FAILURE_MEMO + ,BUSINESS_TYPE,FAILURE_MAN,FAILURE_TIME + ,RECSEQ_NO,CART_ID,MANUAL_INCREASE + ,YIELD_TYPE,FATHER_YO_ID,NEWLEV_FLAG + ,PRODUCE_BOOL,USE_DEPT_CODE,YP_PRODUCT_LINE + ,YP_MEMO,SJ_MOLD_PREPARATION,SJ_KIT_PREPARATION + ,PK_USERNAME,PK_DATE,KIT_PREPARATION_MAN + ,KIT_PREPARATION_TIME) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{YO_CODE,jdbcType=VARCHAR},#{YP_CODE,jdbcType=VARCHAR},#{PART_CODE,jdbcType=VARCHAR} + ,#{PRODUCT_TYPE,jdbcType=VARCHAR},#{PART_NAME,jdbcType=VARCHAR},#{PLATE,jdbcType=VARCHAR} + ,#{PRODUCT_IDENT,jdbcType=VARCHAR},#{USE_DEPT,jdbcType=VARCHAR},#{YP_AREA,jdbcType=DECIMAL} + ,#{DEMAND_DATE,jdbcType=TIMESTAMP},#{PLAN_USER,jdbcType=VARCHAR},#{RELEASE_DATE,jdbcType=TIMESTAMP} + ,#{MEMO,jdbcType=VARCHAR},#{CARD_NO,jdbcType=VARCHAR},#{BATCH_NO,jdbcType=VARCHAR} + ,#{SITE_WORK,jdbcType=CHAR},#{YP_QTY,jdbcType=DECIMAL},#{SYNC_TIME,jdbcType=TIMESTAMP} + ,#{CUR_STATUS,jdbcType=DECIMAL},#{ROAM_NO,jdbcType=VARCHAR},#{PRIMARY_CRAFT,jdbcType=VARCHAR} + ,#{NEXT_ROAM,jdbcType=VARCHAR},#{PDM_URL,jdbcType=VARCHAR},#{PRIORITY,jdbcType=DECIMAL} + ,#{CUSTODIAN,jdbcType=VARCHAR},#{REWORK_CODE,jdbcType=VARCHAR},#{REWORK_NO,jdbcType=DECIMAL} + ,#{ENTRUST_DEPT,jdbcType=VARCHAR},#{REWORK_MEMO,jdbcType=VARCHAR},#{FAILURE_MEMO,jdbcType=VARCHAR} + ,#{BUSINESS_TYPE,jdbcType=DECIMAL},#{FAILURE_MAN,jdbcType=DECIMAL},#{FAILURE_TIME,jdbcType=TIMESTAMP} + ,#{RECSEQ_NO,jdbcType=VARCHAR},#{CART_ID,jdbcType=DECIMAL},#{MANUAL_INCREASE,jdbcType=CHAR} + ,#{YIELD_TYPE,jdbcType=DECIMAL},#{FATHER_YO_ID,jdbcType=DECIMAL},#{NEWLEV_FLAG,jdbcType=VARCHAR} + ,#{PRODUCE_BOOL,jdbcType=CHAR},#{USE_DEPT_CODE,jdbcType=VARCHAR},#{YP_PRODUCT_LINE,jdbcType=VARCHAR} + ,#{YP_MEMO,jdbcType=VARCHAR},#{SJ_MOLD_PREPARATION,jdbcType=DECIMAL},#{SJ_KIT_PREPARATION,jdbcType=DECIMAL} + ,#{PK_USERNAME,jdbcType=VARCHAR},#{PK_DATE,jdbcType=TIMESTAMP},#{KIT_PREPARATION_MAN,jdbcType=VARCHAR} + ,#{KIT_PREPARATION_TIME,jdbcType=TIMESTAMP}) + + + insert into MES_YIELD_ORDER + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + YO_CODE, + YP_CODE, + PART_CODE, + PRODUCT_TYPE, + PART_NAME, + PLATE, + PRODUCT_IDENT, + USE_DEPT, + YP_AREA, + DEMAND_DATE, + PLAN_USER, + RELEASE_DATE, + MEMO, + CARD_NO, + BATCH_NO, + SITE_WORK, + YP_QTY, + SYNC_TIME, + CUR_STATUS, + ROAM_NO, + PRIMARY_CRAFT, + NEXT_ROAM, + PDM_URL, + PRIORITY, + CUSTODIAN, + REWORK_CODE, + REWORK_NO, + ENTRUST_DEPT, + REWORK_MEMO, + FAILURE_MEMO, + BUSINESS_TYPE, + FAILURE_MAN, + FAILURE_TIME, + RECSEQ_NO, + CART_ID, + MANUAL_INCREASE, + YIELD_TYPE, + FATHER_YO_ID, + NEWLEV_FLAG, + PRODUCE_BOOL, + USE_DEPT_CODE, + YP_PRODUCT_LINE, + YP_MEMO, + SJ_MOLD_PREPARATION, + SJ_KIT_PREPARATION, + PK_USERNAME, + PK_DATE, + KIT_PREPARATION_MAN, + KIT_PREPARATION_TIME, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{YO_CODE,jdbcType=VARCHAR}, + #{YP_CODE,jdbcType=VARCHAR}, + #{PART_CODE,jdbcType=VARCHAR}, + #{PRODUCT_TYPE,jdbcType=VARCHAR}, + #{PART_NAME,jdbcType=VARCHAR}, + #{PLATE,jdbcType=VARCHAR}, + #{PRODUCT_IDENT,jdbcType=VARCHAR}, + #{USE_DEPT,jdbcType=VARCHAR}, + #{YP_AREA,jdbcType=DECIMAL}, + #{DEMAND_DATE,jdbcType=TIMESTAMP}, + #{PLAN_USER,jdbcType=VARCHAR}, + #{RELEASE_DATE,jdbcType=TIMESTAMP}, + #{MEMO,jdbcType=VARCHAR}, + #{CARD_NO,jdbcType=VARCHAR}, + #{BATCH_NO,jdbcType=VARCHAR}, + #{SITE_WORK,jdbcType=CHAR}, + #{YP_QTY,jdbcType=DECIMAL}, + #{SYNC_TIME,jdbcType=TIMESTAMP}, + #{CUR_STATUS,jdbcType=DECIMAL}, + #{ROAM_NO,jdbcType=VARCHAR}, + #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + #{NEXT_ROAM,jdbcType=VARCHAR}, + #{PDM_URL,jdbcType=VARCHAR}, + #{PRIORITY,jdbcType=DECIMAL}, + #{CUSTODIAN,jdbcType=VARCHAR}, + #{REWORK_CODE,jdbcType=VARCHAR}, + #{REWORK_NO,jdbcType=DECIMAL}, + #{ENTRUST_DEPT,jdbcType=VARCHAR}, + #{REWORK_MEMO,jdbcType=VARCHAR}, + #{FAILURE_MEMO,jdbcType=VARCHAR}, + #{BUSINESS_TYPE,jdbcType=DECIMAL}, + #{FAILURE_MAN,jdbcType=DECIMAL}, + #{FAILURE_TIME,jdbcType=TIMESTAMP}, + #{RECSEQ_NO,jdbcType=VARCHAR}, + #{CART_ID,jdbcType=DECIMAL}, + #{MANUAL_INCREASE,jdbcType=CHAR}, + #{YIELD_TYPE,jdbcType=DECIMAL}, + #{FATHER_YO_ID,jdbcType=DECIMAL}, + #{NEWLEV_FLAG,jdbcType=VARCHAR}, + #{PRODUCE_BOOL,jdbcType=CHAR}, + #{USE_DEPT_CODE,jdbcType=VARCHAR}, + #{YP_PRODUCT_LINE,jdbcType=VARCHAR}, + #{YP_MEMO,jdbcType=VARCHAR}, + #{SJ_MOLD_PREPARATION,jdbcType=DECIMAL}, + #{SJ_KIT_PREPARATION,jdbcType=DECIMAL}, + #{PK_USERNAME,jdbcType=VARCHAR}, + #{PK_DATE,jdbcType=TIMESTAMP}, + #{KIT_PREPARATION_MAN,jdbcType=VARCHAR}, + #{KIT_PREPARATION_TIME,jdbcType=TIMESTAMP}, + + + + update MES_YIELD_ORDER + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + YO_CODE = #{YO_CODE,jdbcType=VARCHAR}, + + + YP_CODE = #{YP_CODE,jdbcType=VARCHAR}, + + + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + + + PRODUCT_TYPE = #{PRODUCT_TYPE,jdbcType=VARCHAR}, + + + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + + + PLATE = #{PLATE,jdbcType=VARCHAR}, + + + PRODUCT_IDENT = #{PRODUCT_IDENT,jdbcType=VARCHAR}, + + + USE_DEPT = #{USE_DEPT,jdbcType=VARCHAR}, + + + YP_AREA = #{YP_AREA,jdbcType=DECIMAL}, + + + DEMAND_DATE = #{DEMAND_DATE,jdbcType=TIMESTAMP}, + + + PLAN_USER = #{PLAN_USER,jdbcType=VARCHAR}, + + + RELEASE_DATE = #{RELEASE_DATE,jdbcType=TIMESTAMP}, + + + MEMO = #{MEMO,jdbcType=VARCHAR}, + + + CARD_NO = #{CARD_NO,jdbcType=VARCHAR}, + + + BATCH_NO = #{BATCH_NO,jdbcType=VARCHAR}, + + + SITE_WORK = #{SITE_WORK,jdbcType=CHAR}, + + + YP_QTY = #{YP_QTY,jdbcType=DECIMAL}, + + + SYNC_TIME = #{SYNC_TIME,jdbcType=TIMESTAMP}, + + + CUR_STATUS = #{CUR_STATUS,jdbcType=DECIMAL}, + + + ROAM_NO = #{ROAM_NO,jdbcType=VARCHAR}, + + + PRIMARY_CRAFT = #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + + + NEXT_ROAM = #{NEXT_ROAM,jdbcType=VARCHAR}, + + + PDM_URL = #{PDM_URL,jdbcType=VARCHAR}, + + + PRIORITY = #{PRIORITY,jdbcType=DECIMAL}, + + + CUSTODIAN = #{CUSTODIAN,jdbcType=VARCHAR}, + + + REWORK_CODE = #{REWORK_CODE,jdbcType=VARCHAR}, + + + REWORK_NO = #{REWORK_NO,jdbcType=DECIMAL}, + + + ENTRUST_DEPT = #{ENTRUST_DEPT,jdbcType=VARCHAR}, + + + REWORK_MEMO = #{REWORK_MEMO,jdbcType=VARCHAR}, + + + FAILURE_MEMO = #{FAILURE_MEMO,jdbcType=VARCHAR}, + + + BUSINESS_TYPE = #{BUSINESS_TYPE,jdbcType=DECIMAL}, + + + FAILURE_MAN = #{FAILURE_MAN,jdbcType=DECIMAL}, + + + FAILURE_TIME = #{FAILURE_TIME,jdbcType=TIMESTAMP}, + + + RECSEQ_NO = #{RECSEQ_NO,jdbcType=VARCHAR}, + + + CART_ID = #{CART_ID,jdbcType=DECIMAL}, + + + MANUAL_INCREASE = #{MANUAL_INCREASE,jdbcType=CHAR}, + + + YIELD_TYPE = #{YIELD_TYPE,jdbcType=DECIMAL}, + + + FATHER_YO_ID = #{FATHER_YO_ID,jdbcType=DECIMAL}, + + + NEWLEV_FLAG = #{NEWLEV_FLAG,jdbcType=VARCHAR}, + + + PRODUCE_BOOL = #{PRODUCE_BOOL,jdbcType=CHAR}, + + + USE_DEPT_CODE = #{USE_DEPT_CODE,jdbcType=VARCHAR}, + + + YP_PRODUCT_LINE = #{YP_PRODUCT_LINE,jdbcType=VARCHAR}, + + + YP_MEMO = #{YP_MEMO,jdbcType=VARCHAR}, + + + SJ_MOLD_PREPARATION = #{SJ_MOLD_PREPARATION,jdbcType=DECIMAL}, + + + SJ_KIT_PREPARATION = #{SJ_KIT_PREPARATION,jdbcType=DECIMAL}, + + + PK_USERNAME = #{PK_USERNAME,jdbcType=VARCHAR}, + + + PK_DATE = #{PK_DATE,jdbcType=TIMESTAMP}, + + + KIT_PREPARATION_MAN = #{KIT_PREPARATION_MAN,jdbcType=VARCHAR}, + + + KIT_PREPARATION_TIME = #{KIT_PREPARATION_TIME,jdbcType=TIMESTAMP}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_YIELD_ORDER + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + YO_CODE = #{YO_CODE,jdbcType=VARCHAR}, + YP_CODE = #{YP_CODE,jdbcType=VARCHAR}, + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + PRODUCT_TYPE = #{PRODUCT_TYPE,jdbcType=VARCHAR}, + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + PLATE = #{PLATE,jdbcType=VARCHAR}, + PRODUCT_IDENT = #{PRODUCT_IDENT,jdbcType=VARCHAR}, + USE_DEPT = #{USE_DEPT,jdbcType=VARCHAR}, + YP_AREA = #{YP_AREA,jdbcType=DECIMAL}, + DEMAND_DATE = #{DEMAND_DATE,jdbcType=TIMESTAMP}, + PLAN_USER = #{PLAN_USER,jdbcType=VARCHAR}, + RELEASE_DATE = #{RELEASE_DATE,jdbcType=TIMESTAMP}, + MEMO = #{MEMO,jdbcType=VARCHAR}, + CARD_NO = #{CARD_NO,jdbcType=VARCHAR}, + BATCH_NO = #{BATCH_NO,jdbcType=VARCHAR}, + SITE_WORK = #{SITE_WORK,jdbcType=CHAR}, + YP_QTY = #{YP_QTY,jdbcType=DECIMAL}, + SYNC_TIME = #{SYNC_TIME,jdbcType=TIMESTAMP}, + CUR_STATUS = #{CUR_STATUS,jdbcType=DECIMAL}, + ROAM_NO = #{ROAM_NO,jdbcType=VARCHAR}, + PRIMARY_CRAFT = #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + NEXT_ROAM = #{NEXT_ROAM,jdbcType=VARCHAR}, + PDM_URL = #{PDM_URL,jdbcType=VARCHAR}, + PRIORITY = #{PRIORITY,jdbcType=DECIMAL}, + CUSTODIAN = #{CUSTODIAN,jdbcType=VARCHAR}, + REWORK_CODE = #{REWORK_CODE,jdbcType=VARCHAR}, + REWORK_NO = #{REWORK_NO,jdbcType=DECIMAL}, + ENTRUST_DEPT = #{ENTRUST_DEPT,jdbcType=VARCHAR}, + REWORK_MEMO = #{REWORK_MEMO,jdbcType=VARCHAR}, + FAILURE_MEMO = #{FAILURE_MEMO,jdbcType=VARCHAR}, + BUSINESS_TYPE = #{BUSINESS_TYPE,jdbcType=DECIMAL}, + FAILURE_MAN = #{FAILURE_MAN,jdbcType=DECIMAL}, + FAILURE_TIME = #{FAILURE_TIME,jdbcType=TIMESTAMP}, + RECSEQ_NO = #{RECSEQ_NO,jdbcType=VARCHAR}, + CART_ID = #{CART_ID,jdbcType=DECIMAL}, + MANUAL_INCREASE = #{MANUAL_INCREASE,jdbcType=CHAR}, + YIELD_TYPE = #{YIELD_TYPE,jdbcType=DECIMAL}, + FATHER_YO_ID = #{FATHER_YO_ID,jdbcType=DECIMAL}, + NEWLEV_FLAG = #{NEWLEV_FLAG,jdbcType=VARCHAR}, + PRODUCE_BOOL = #{PRODUCE_BOOL,jdbcType=CHAR}, + USE_DEPT_CODE = #{USE_DEPT_CODE,jdbcType=VARCHAR}, + YP_PRODUCT_LINE = #{YP_PRODUCT_LINE,jdbcType=VARCHAR}, + YP_MEMO = #{YP_MEMO,jdbcType=VARCHAR}, + SJ_MOLD_PREPARATION = #{SJ_MOLD_PREPARATION,jdbcType=DECIMAL}, + SJ_KIT_PREPARATION = #{SJ_KIT_PREPARATION,jdbcType=DECIMAL}, + PK_USERNAME = #{PK_USERNAME,jdbcType=VARCHAR}, + PK_DATE = #{PK_DATE,jdbcType=TIMESTAMP}, + KIT_PREPARATION_MAN = #{KIT_PREPARATION_MAN,jdbcType=VARCHAR}, + KIT_PREPARATION_TIME = #{KIT_PREPARATION_TIME,jdbcType=TIMESTAMP} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java new file mode 100644 index 000000000..fd75d0ef5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.desk.order.entity.YieldPlan; + +/** + * @author lqk + * @description 针对表【MES_YIELD_PLAN(生产计划)】的数据库操作Mapper + * @createDate 2025-11-24 11:41:58 + * @Entity org.springblade.desk.order.entity.YieldPlan + */ +public interface YieldPlanMapper extends BaseMapper { + + int deleteByPrimaryKey(Long id); + + @Override + int insert(YieldPlan record); + + int insertSelective(YieldPlan record); + + YieldPlan selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(YieldPlan record); + + int updateByPrimaryKey(YieldPlan record); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml new file mode 100644 index 000000000..f75945052 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID,TENANT_ID,CREATE_USER, + CREATE_DEPT,CREATE_TIME,UPDATE_USER, + UPDATE_TIME,STATUS,IS_DELETED, + YP_CODE,PART_CODE,PRODUCT_TYPE, + PART_NAME,PLATE,PRODUCT_IDENT, + USE_DEPT,YP_QTY,YP_AREA, + DEMAND_DATE,PLAN_USER,RELEASE_DATE, + ROAM_NO,DELIVERY_QTY,ALREADY_BRANCH_QTY, + CUR_STATUS,PRIMARY_CRAFT,SYNC_TIME, + DOMINANT_DEPT,MEMO,ROUTE_NO, + CUSTODIAN,BPS_ID,PRIORITY, + PLAN_TYPE,SURE_TYPE,CLOSE_MAN, + CLOSE_TIME,PRODUCT_LINE + + + + + + delete from MES_YIELD_PLAN + where ID = #{ID,jdbcType=DECIMAL} + + + insert into MES_YIELD_PLAN + ( ID,TENANT_ID,CREATE_USER + ,CREATE_DEPT,CREATE_TIME,UPDATE_USER + ,UPDATE_TIME,STATUS,IS_DELETED + ,YP_CODE,PART_CODE,PRODUCT_TYPE + ,PART_NAME,PLATE,PRODUCT_IDENT + ,USE_DEPT,YP_QTY,YP_AREA + ,DEMAND_DATE,PLAN_USER,RELEASE_DATE + ,ROAM_NO,DELIVERY_QTY,ALREADY_BRANCH_QTY + ,CUR_STATUS,PRIMARY_CRAFT,SYNC_TIME + ,DOMINANT_DEPT,MEMO,ROUTE_NO + ,CUSTODIAN,BPS_ID,PRIORITY + ,PLAN_TYPE,SURE_TYPE,CLOSE_MAN + ,CLOSE_TIME,PRODUCT_LINE) + values (#{ID,jdbcType=DECIMAL},#{TENANT_ID,jdbcType=VARCHAR},#{CREATE_USER,jdbcType=DECIMAL} + ,#{CREATE_DEPT,jdbcType=DECIMAL},#{CREATE_TIME,jdbcType=TIMESTAMP},#{UPDATE_USER,jdbcType=DECIMAL} + ,#{UPDATE_TIME,jdbcType=TIMESTAMP},#{STATUS,jdbcType=DECIMAL},#{IS_DELETED,jdbcType=DECIMAL} + ,#{YP_CODE,jdbcType=VARCHAR},#{PART_CODE,jdbcType=VARCHAR},#{PRODUCT_TYPE,jdbcType=VARCHAR} + ,#{PART_NAME,jdbcType=VARCHAR},#{PLATE,jdbcType=VARCHAR},#{PRODUCT_IDENT,jdbcType=VARCHAR} + ,#{USE_DEPT,jdbcType=VARCHAR},#{YP_QTY,jdbcType=DECIMAL},#{YP_AREA,jdbcType=DECIMAL} + ,#{DEMAND_DATE,jdbcType=TIMESTAMP},#{PLAN_USER,jdbcType=VARCHAR},#{RELEASE_DATE,jdbcType=TIMESTAMP} + ,#{ROAM_NO,jdbcType=VARCHAR},#{DELIVERY_QTY,jdbcType=DECIMAL},#{ALREADY_BRANCH_QTY,jdbcType=DECIMAL} + ,#{CUR_STATUS,jdbcType=DECIMAL},#{PRIMARY_CRAFT,jdbcType=VARCHAR},#{SYNC_TIME,jdbcType=TIMESTAMP} + ,#{DOMINANT_DEPT,jdbcType=VARCHAR},#{MEMO,jdbcType=VARCHAR},#{ROUTE_NO,jdbcType=VARCHAR} + ,#{CUSTODIAN,jdbcType=VARCHAR},#{BPS_ID,jdbcType=DECIMAL},#{PRIORITY,jdbcType=DECIMAL} + ,#{PLAN_TYPE,jdbcType=DECIMAL},#{SURE_TYPE,jdbcType=DECIMAL},#{CLOSE_MAN,jdbcType=DECIMAL} + ,#{CLOSE_TIME,jdbcType=TIMESTAMP},#{PRODUCT_LINE,jdbcType=VARCHAR}) + + + insert into MES_YIELD_PLAN + + ID, + TENANT_ID, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + YP_CODE, + PART_CODE, + PRODUCT_TYPE, + PART_NAME, + PLATE, + PRODUCT_IDENT, + USE_DEPT, + YP_QTY, + YP_AREA, + DEMAND_DATE, + PLAN_USER, + RELEASE_DATE, + ROAM_NO, + DELIVERY_QTY, + ALREADY_BRANCH_QTY, + CUR_STATUS, + PRIMARY_CRAFT, + SYNC_TIME, + DOMINANT_DEPT, + MEMO, + ROUTE_NO, + CUSTODIAN, + BPS_ID, + PRIORITY, + PLAN_TYPE, + SURE_TYPE, + CLOSE_MAN, + CLOSE_TIME, + PRODUCT_LINE, + + + #{ID,jdbcType=DECIMAL}, + #{TENANT_ID,jdbcType=VARCHAR}, + #{CREATE_USER,jdbcType=DECIMAL}, + #{CREATE_DEPT,jdbcType=DECIMAL}, + #{CREATE_TIME,jdbcType=TIMESTAMP}, + #{UPDATE_USER,jdbcType=DECIMAL}, + #{UPDATE_TIME,jdbcType=TIMESTAMP}, + #{STATUS,jdbcType=DECIMAL}, + #{IS_DELETED,jdbcType=DECIMAL}, + #{YP_CODE,jdbcType=VARCHAR}, + #{PART_CODE,jdbcType=VARCHAR}, + #{PRODUCT_TYPE,jdbcType=VARCHAR}, + #{PART_NAME,jdbcType=VARCHAR}, + #{PLATE,jdbcType=VARCHAR}, + #{PRODUCT_IDENT,jdbcType=VARCHAR}, + #{USE_DEPT,jdbcType=VARCHAR}, + #{YP_QTY,jdbcType=DECIMAL}, + #{YP_AREA,jdbcType=DECIMAL}, + #{DEMAND_DATE,jdbcType=TIMESTAMP}, + #{PLAN_USER,jdbcType=VARCHAR}, + #{RELEASE_DATE,jdbcType=TIMESTAMP}, + #{ROAM_NO,jdbcType=VARCHAR}, + #{DELIVERY_QTY,jdbcType=DECIMAL}, + #{ALREADY_BRANCH_QTY,jdbcType=DECIMAL}, + #{CUR_STATUS,jdbcType=DECIMAL}, + #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + #{SYNC_TIME,jdbcType=TIMESTAMP}, + #{DOMINANT_DEPT,jdbcType=VARCHAR}, + #{MEMO,jdbcType=VARCHAR}, + #{ROUTE_NO,jdbcType=VARCHAR}, + #{CUSTODIAN,jdbcType=VARCHAR}, + #{BPS_ID,jdbcType=DECIMAL}, + #{PRIORITY,jdbcType=DECIMAL}, + #{PLAN_TYPE,jdbcType=DECIMAL}, + #{SURE_TYPE,jdbcType=DECIMAL}, + #{CLOSE_MAN,jdbcType=DECIMAL}, + #{CLOSE_TIME,jdbcType=TIMESTAMP}, + #{PRODUCT_LINE,jdbcType=VARCHAR}, + + + + update MES_YIELD_PLAN + + + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + + + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + + + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + + + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + + + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + + + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + + + STATUS = #{STATUS,jdbcType=DECIMAL}, + + + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + + + YP_CODE = #{YP_CODE,jdbcType=VARCHAR}, + + + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + + + PRODUCT_TYPE = #{PRODUCT_TYPE,jdbcType=VARCHAR}, + + + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + + + PLATE = #{PLATE,jdbcType=VARCHAR}, + + + PRODUCT_IDENT = #{PRODUCT_IDENT,jdbcType=VARCHAR}, + + + USE_DEPT = #{USE_DEPT,jdbcType=VARCHAR}, + + + YP_QTY = #{YP_QTY,jdbcType=DECIMAL}, + + + YP_AREA = #{YP_AREA,jdbcType=DECIMAL}, + + + DEMAND_DATE = #{DEMAND_DATE,jdbcType=TIMESTAMP}, + + + PLAN_USER = #{PLAN_USER,jdbcType=VARCHAR}, + + + RELEASE_DATE = #{RELEASE_DATE,jdbcType=TIMESTAMP}, + + + ROAM_NO = #{ROAM_NO,jdbcType=VARCHAR}, + + + DELIVERY_QTY = #{DELIVERY_QTY,jdbcType=DECIMAL}, + + + ALREADY_BRANCH_QTY = #{ALREADY_BRANCH_QTY,jdbcType=DECIMAL}, + + + CUR_STATUS = #{CUR_STATUS,jdbcType=DECIMAL}, + + + PRIMARY_CRAFT = #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + + + SYNC_TIME = #{SYNC_TIME,jdbcType=TIMESTAMP}, + + + DOMINANT_DEPT = #{DOMINANT_DEPT,jdbcType=VARCHAR}, + + + MEMO = #{MEMO,jdbcType=VARCHAR}, + + + ROUTE_NO = #{ROUTE_NO,jdbcType=VARCHAR}, + + + CUSTODIAN = #{CUSTODIAN,jdbcType=VARCHAR}, + + + BPS_ID = #{BPS_ID,jdbcType=DECIMAL}, + + + PRIORITY = #{PRIORITY,jdbcType=DECIMAL}, + + + PLAN_TYPE = #{PLAN_TYPE,jdbcType=DECIMAL}, + + + SURE_TYPE = #{SURE_TYPE,jdbcType=DECIMAL}, + + + CLOSE_MAN = #{CLOSE_MAN,jdbcType=DECIMAL}, + + + CLOSE_TIME = #{CLOSE_TIME,jdbcType=TIMESTAMP}, + + + PRODUCT_LINE = #{PRODUCT_LINE,jdbcType=VARCHAR}, + + + where ID = #{ID,jdbcType=DECIMAL} + + + update MES_YIELD_PLAN + set + TENANT_ID = #{TENANT_ID,jdbcType=VARCHAR}, + CREATE_USER = #{CREATE_USER,jdbcType=DECIMAL}, + CREATE_DEPT = #{CREATE_DEPT,jdbcType=DECIMAL}, + CREATE_TIME = #{CREATE_TIME,jdbcType=TIMESTAMP}, + UPDATE_USER = #{UPDATE_USER,jdbcType=DECIMAL}, + UPDATE_TIME = #{UPDATE_TIME,jdbcType=TIMESTAMP}, + STATUS = #{STATUS,jdbcType=DECIMAL}, + IS_DELETED = #{IS_DELETED,jdbcType=DECIMAL}, + YP_CODE = #{YP_CODE,jdbcType=VARCHAR}, + PART_CODE = #{PART_CODE,jdbcType=VARCHAR}, + PRODUCT_TYPE = #{PRODUCT_TYPE,jdbcType=VARCHAR}, + PART_NAME = #{PART_NAME,jdbcType=VARCHAR}, + PLATE = #{PLATE,jdbcType=VARCHAR}, + PRODUCT_IDENT = #{PRODUCT_IDENT,jdbcType=VARCHAR}, + USE_DEPT = #{USE_DEPT,jdbcType=VARCHAR}, + YP_QTY = #{YP_QTY,jdbcType=DECIMAL}, + YP_AREA = #{YP_AREA,jdbcType=DECIMAL}, + DEMAND_DATE = #{DEMAND_DATE,jdbcType=TIMESTAMP}, + PLAN_USER = #{PLAN_USER,jdbcType=VARCHAR}, + RELEASE_DATE = #{RELEASE_DATE,jdbcType=TIMESTAMP}, + ROAM_NO = #{ROAM_NO,jdbcType=VARCHAR}, + DELIVERY_QTY = #{DELIVERY_QTY,jdbcType=DECIMAL}, + ALREADY_BRANCH_QTY = #{ALREADY_BRANCH_QTY,jdbcType=DECIMAL}, + CUR_STATUS = #{CUR_STATUS,jdbcType=DECIMAL}, + PRIMARY_CRAFT = #{PRIMARY_CRAFT,jdbcType=VARCHAR}, + SYNC_TIME = #{SYNC_TIME,jdbcType=TIMESTAMP}, + DOMINANT_DEPT = #{DOMINANT_DEPT,jdbcType=VARCHAR}, + MEMO = #{MEMO,jdbcType=VARCHAR}, + ROUTE_NO = #{ROUTE_NO,jdbcType=VARCHAR}, + CUSTODIAN = #{CUSTODIAN,jdbcType=VARCHAR}, + BPS_ID = #{BPS_ID,jdbcType=DECIMAL}, + PRIORITY = #{PRIORITY,jdbcType=DECIMAL}, + PLAN_TYPE = #{PLAN_TYPE,jdbcType=DECIMAL}, + SURE_TYPE = #{SURE_TYPE,jdbcType=DECIMAL}, + CLOSE_MAN = #{CLOSE_MAN,jdbcType=DECIMAL}, + CLOSE_TIME = #{CLOSE_TIME,jdbcType=TIMESTAMP}, + PRODUCT_LINE = #{PRODUCT_LINE,jdbcType=VARCHAR} + where ID = #{ID,jdbcType=DECIMAL} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java new file mode 100644 index 000000000..0b9b411ff --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.AssayContentDetail; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IAssayContentDetailService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java new file mode 100644 index 000000000..b75921cd6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.AssayContent; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IAssayContentService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java new file mode 100644 index 000000000..0ae46d40b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.MoldPlanOrder; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IMoldPlanOrderService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java new file mode 100644 index 000000000..e300d8465 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.MoldPlan; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IMoldPlanService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java new file mode 100644 index 000000000..5163e03c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.MoldPlanTool; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IMoldPlanToolService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java new file mode 100644 index 000000000..e9ecc26f1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IPlateGoodsApplyDetailService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java new file mode 100644 index 000000000..dc136eef7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.PlateGoodsApply; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IPlateGoodsApplyService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java new file mode 100644 index 000000000..343c39102 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IPlateGoodsRecordDetailService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java new file mode 100644 index 000000000..c7efeed35 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.PlateGoodsRecord; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IPlateGoodsRecordService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldErrorService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldErrorService.java new file mode 100644 index 000000000..fd84d5e4e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldErrorService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.YieldError; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IYieldErrorService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java new file mode 100644 index 000000000..8f01b5772 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.YieldOrderCraft; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IYieldOrderCraftService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java new file mode 100644 index 000000000..59b67cdca --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -0,0 +1,13 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.YieldOrder; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IYieldOrderService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java new file mode 100644 index 000000000..fce6214f4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java @@ -0,0 +1,20 @@ +package org.springblade.desk.order.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.order.entity.YieldPlan; + +/** + * 服务实现类 + * + * @author BladeX + */ +public interface IYieldPlanService extends BaseService { + + /** + * 根据生产计划ID生成玻璃饼订单 + * + * @param yieldPlanId + * @return + */ + int saveGlassCake(String yieldPlanId); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java new file mode 100644 index 000000000..a65275d33 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.AssayContentDetail; +import org.springblade.desk.order.mapper.AssayContentDetailMapper; +import org.springblade.desk.order.service.IAssayContentDetailService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class AssayContentDetailServiceImpl extends BaseServiceImpl implements IAssayContentDetailService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java new file mode 100644 index 000000000..ab3793b7e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.AssayContent; +import org.springblade.desk.order.mapper.AssayContentMapper; +import org.springblade.desk.order.service.IAssayContentService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class AssayContentServiceImpl extends BaseServiceImpl implements IAssayContentService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java new file mode 100644 index 000000000..fceb18c43 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.MoldPlanOrder; +import org.springblade.desk.order.mapper.MoldPlanOrderMapper; +import org.springblade.desk.order.service.IMoldPlanOrderService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class MoldPlanOrderServiceImpl extends BaseServiceImpl implements IMoldPlanOrderService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java new file mode 100644 index 000000000..9b89d439c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.mapper.MoldPlanMapper; +import org.springblade.desk.order.service.IMoldPlanService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class MoldPlanServiceImpl extends BaseServiceImpl implements IMoldPlanService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java new file mode 100644 index 000000000..88af10286 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.MoldPlanTool; +import org.springblade.desk.order.mapper.MoldPlanToolMapper; +import org.springblade.desk.order.service.IMoldPlanToolService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class MoldPlanToolServiceImpl extends BaseServiceImpl implements IMoldPlanToolService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java new file mode 100644 index 000000000..af3b43e61 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; +import org.springblade.desk.order.mapper.PlateGoodsApplyDetailMapper; +import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class PlateGoodsApplyDetailServiceImpl extends BaseServiceImpl implements IPlateGoodsApplyDetailService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java new file mode 100644 index 000000000..d931eec36 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.mapper.PlateGoodsApplyMapper; +import org.springblade.desk.order.service.IPlateGoodsApplyService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class PlateGoodsApplyServiceImpl extends BaseServiceImpl implements IPlateGoodsApplyService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java new file mode 100644 index 000000000..897113dfb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; +import org.springblade.desk.order.mapper.PlateGoodsRecordDetailMapper; +import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class PlateGoodsRecordDetailServiceImpl extends BaseServiceImpl implements IPlateGoodsRecordDetailService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java new file mode 100644 index 000000000..67dff417b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.mapper.PlateGoodsRecordMapper; +import org.springblade.desk.order.service.IPlateGoodsRecordService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class PlateGoodsRecordServiceImpl extends BaseServiceImpl implements IPlateGoodsRecordService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldErrorServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldErrorServiceImpl.java new file mode 100644 index 000000000..e8efe3961 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldErrorServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.YieldError; +import org.springblade.desk.order.mapper.YieldErrorMapper; +import org.springblade.desk.order.service.IYieldErrorService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class YieldErrorServiceImpl extends BaseServiceImpl implements IYieldErrorService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java new file mode 100644 index 000000000..f38cd0809 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.YieldOrderCraft; +import org.springblade.desk.order.mapper.YieldOrderCraftMapper; +import org.springblade.desk.order.service.IYieldOrderCraftService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class YieldOrderCraftServiceImpl extends BaseServiceImpl implements IYieldOrderCraftService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java new file mode 100644 index 000000000..4576bfd15 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.order.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.YieldOrder; +import org.springblade.desk.order.mapper.YieldOrderMapper; +import org.springblade.desk.order.service.IYieldOrderService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@Service +public class YieldOrderServiceImpl extends BaseServiceImpl implements IYieldOrderService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java new file mode 100644 index 000000000..b62062b64 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.service.impl; + +import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.entity.YieldPlan; +import org.springblade.desk.order.mapper.YieldPlanMapper; +import org.springblade.desk.order.service.IYieldOrderService; +import org.springblade.desk.order.service.IYieldPlanService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author BladeX + */ +@RequiredArgsConstructor +@Service +public class YieldPlanServiceImpl extends BaseServiceImpl implements IYieldPlanService { + + private final IYieldOrderService yieldOrderService; + + @Override + public int saveGlassCake(String yieldPlanId) { + // 查询生产计划信息 + // 调用生产订单服务类中方法，生成玻璃饼订单并保存 + return 0; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java new file mode 100644 index 000000000..6328be16f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java @@ -0,0 +1,24 @@ +package org.springblade.desk.quality.constant; + +public interface ColBase { + + String ID = "ID"; + + String CREATE_USER = "CREATE_USER"; + + String CREATE_TIME = "CREATE_TIME"; + + String CREATE_DEPT = "CREATE_DEPT"; + + String UPDATE_USER = "UPDATE_USER"; + + String UPDATE_TIME = "UPDATE_TIME"; + + String STATUS = "STATUS"; + + String IS_DELETE = "IS_DELETE"; + + String SORT = "SORT"; + + String TENANT_ID = "TENANT_ID"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColValue.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColValue.java new file mode 100644 index 000000000..70e9203ed --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColValue.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.constant; + +public interface ColValue { + + /** + * 启用 + */ + Integer STATE_ENABLE = 1; + /** + * 禁用 + */ + Integer STATE_DISABLE = 0; + + /** + * admin user id + */ + Long ADMIN_USER_ID = 1123598821738675201L; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/Excel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/Excel.java new file mode 100644 index 000000000..45242d3de --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/Excel.java @@ -0,0 +1,8 @@ +package org.springblade.desk.quality.constant; + +public interface Excel { + + String EXT_XLS = ".xls"; + + String EXT_XLSX = ".xlsx"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java new file mode 100644 index 000000000..564dcb282 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.constant; + +public interface InspectionTaskConst { + + + /** + * 热表 + */ + Integer TYPE_1 = 1; + + /** + * 烧结 + */ + Integer TYPE_2 = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/JobInfoConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/JobInfoConst.java new file mode 100644 index 000000000..930edab3c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/JobInfoConst.java @@ -0,0 +1,77 @@ +package org.springblade.desk.quality.constant; + +public interface JobInfoConst { + + /** + * API + */ + Integer TIME_EXPRESSION_TYPE_API = 1; + /** + * CRON + */ + Integer TIME_EXPRESSION_TYPE_CRON = 2; + /** + * 固定频率(毫秒) + */ + Integer TIME_EXPRESSION_TYPE_3 = 3; + /** + * 固定延迟(毫秒) + */ + Integer TIME_EXPRESSION_TYPE_4 = 4; + /** + * 工作流 + */ + Integer TIME_EXPRESSION_TYPE_5 = 5; + /** + * 单机执行 + */ + Integer EXECUTE_TYPE_1 = 1; + /** + * 广播执行 + */ + Integer EXECUTE_TYPE_2 = 2; + /** + * MapReduce执行 + */ + Integer EXECUTE_MAP_REDUCE = 3; + /** + * Map执行 + */ + Integer EXECUTE_TYPE_4 = 4; + /** + * 内建 + */ + Integer PROCESSOR_TYPE_1 = 1; + /** + * 外置(动态加载) + */ + Integer PROCESSOR_TYPE_4 = 4; + /** + * HEALTH_FIRST 健康第一 + */ + Integer DISPATCH_STRATEGY_1 = 1; + /** + * RANDOM 随机 + */ + Integer DISPATCH_STRATEGY_RANDOM = 2; + /** + * SPECIFY + */ + Integer DISPATCH_STRATEGY_SPECIFY = 11; + /** + * ENABLE + */ + Integer STATUS_ENABLE = 1; + /** + * DISABLE + */ + Integer STATUS_DISABLE = 2; + /** + * + */ + Integer LOG_TYPE_1 = 1; + /** + * + */ + Integer LOG_TYPE_2 = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankConst.java new file mode 100644 index 000000000..36a0e5e79 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankConst.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.constant; + +public interface LiquidTankConst { + + Integer GEN_CYCLE_TYPE_1 = 1; + + Integer GEN_CYCLE_TYPE_2 = 2; + + Integer GEN_CYCLE_TYPE_3 = 3; + + Integer GEN_CYCLE_TYPE_4 = 4; + + String JOB_TYPE_GEN_TASK = "GEN_TASK"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java new file mode 100644 index 000000000..ee7ed480d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -0,0 +1,76 @@ +package org.springblade.desk.quality.constant; + +public interface LiquidTankTaskConst { + /** + * 来源类型-[1]:[1]:手动; + */ + Integer FROM_TYPE_MANUAL = 1; + /** + * 来源类型-[2]:周期自动生成; + */ + Integer FROM_TYPE_PERIODIC = 2; + + /** + * 来源类型-[3]:计算自动生成; + */ + Integer FROM_TYPE_CAL = 3; + + /** + * 状态-初始化 + */ + Integer STATE_INIT = 0; + /** + * 状态-已经生成，待接收-程序生成 或 试验化验班长手动 + * 班组已处理 todo: + */ + Integer STATE_PENDING_ACCEPT = 1; + /** + * 状态-已经接收，待检测 + */ + Integer STATE_PENDING_TEST = 2; + /** + * 状态-已填报，待自动计算加药量-检测员填报 + */ + Integer STATE_FILL_DATA_FIRST = 3; + /** + * 状态-已自动计算加药量，待人工编辑加药量-程序计算加药量 + */ + Integer STATE_PENDING_EDIT_DRUG = 4; + /** + * 状态-提交审核加药量，待审核加药量-检测员提交 + */ + Integer STATE_PENDING_REVIEW = 5; + /** + * 状态-:已经通过加药量审核，待发药-工艺员同意 + */ + Integer STATE_PENDING_SEND_DRUG = 6; + /** + * 状态-已经发药，待收药-药房人员 + */ + Integer STATE_PENDING_RECEIVE_DRUG = 7; + /** + * 状态-已经收药，待复检-检测员 + */ + Integer STATE_PENDING_FILL_DATA_SECOND = 9; + /** + * 状态-待下发，没有分派至检测员 + */ + Integer STATE_NOT_READY = 11; + /** + * 状态-已完成，异常结束 + */ + Integer STATE_FINISH_FAILED = 21; + /** + * 状态-已完成，正常结束 + */ + Integer STATE_FINISH_OK = 22; + + /** + * 首测 + */ + Integer FILL_DATA_FIRST = 1; + /** + * 复测 + */ + Integer FILL_DATA_SECOND = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java new file mode 100644 index 000000000..26abaa29c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.constant; + +/** + * QA模块常量。 + */ +public interface QAModuleConst { + + /** + * 模块前缀 + */ + String PREFIX = "QA"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QARoleConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QARoleConst.java new file mode 100644 index 000000000..197900852 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QARoleConst.java @@ -0,0 +1,6 @@ +package org.springblade.desk.quality.constant; + +public interface QARoleConst { + + String QA_ROLE_ADMIN = "admin"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/package-info.java new file mode 100644 index 000000000..2b6f2c123 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.constant; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java new file mode 100644 index 000000000..5540cd4e2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -0,0 +1,141 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/CycleTest") +@Tag(name = "[周期试验]", description = "[周期试验]接口") +public class CycleTestController extends BladeController { + + private final ICycleTestGenService cycleTestGenService; + + /** + * [周期试验] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTest") + public R detail(CycleTest cycleTest) { + CycleTest detail = cycleTestGenService.getOne(Condition.getQueryWrapper(cycleTest)); + return R.data(CycleTestGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTest") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTest, + Query query) { + IPage pages = cycleTestGenService.page(Condition.getPage(query), + Condition.getQueryWrapper(cycleTest, CycleTest.class)); + return R.data(CycleTestGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTest") + public R> page(CycleTestGenVO cycleTest, Query query) { + IPage pages = cycleTestGenService.selectCycleTestPage(Condition.getPage(query), cycleTest); + return R.data(pages); + } + + /** + * [周期试验] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTest") + public R save(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.save(cycleTest)); + } + + /** + * [周期试验] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTest") + public R update(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.updateById(cycleTest)); + } + + /** + * [周期试验] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTest") + public R submit(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.saveOrUpdate(cycleTest)); + } + + /** + * [周期试验] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTest") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTest") + public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map cycleTest, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestGenService.exportCycleTest(queryWrapper); + ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", list, CycleTestGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java new file mode 100644 index 000000000..176b3476e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestItemGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验项目] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/cycleTestItem") +@Tag(name = "[周期试验项目]", description = "[周期试验项目]接口") +public class CycleTestItemController extends BladeController { + + private final ICycleTestItemGenService cycleTestItemGenService; + + /** + * [周期试验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestItem") + public R detail(CycleTestItem cycleTestItem) { + CycleTestItem detail = cycleTestItemGenService.getOne(Condition.getQueryWrapper(cycleTestItem)); + return R.data(CycleTestItemGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验项目] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class)); + return R.data(CycleTestItemGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验项目] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> page(CycleTestItemGenVO cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.selectCycleTestItemPage(Condition.getPage(query), cycleTestItem); + return R.data(pages); + } + + /** + * [周期试验项目] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestItem") + public R save(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.save(cycleTestItem)); + } + + /** + * [周期试验项目] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestItem") + public R update(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.updateById(cycleTestItem)); + } + + /** + * [周期试验项目] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestItem") + public R submit(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.saveOrUpdate(cycleTestItem)); + } + + /** + * [周期试验项目] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestItemGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestItem") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestItem") + public void exportCycleTestItem(@Parameter(hidden = true) @RequestParam Map cycleTestItem, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestItemGenService.exportCycleTestItem(queryWrapper); + ExcelUtil.export(response, "[周期试验项目]数据" + DateUtil.time(), "[周期试验项目]数据表", list, CycleTestItemGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java new file mode 100644 index 000000000..fa2ecdd2e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -0,0 +1,153 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.service.CycleTestTaskService; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestTaskGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验任务] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@Data +@AllArgsConstructor +@RequestMapping("/QA/cycleTestTask") +@Tag(name = "[周期试验任务]", description = "[周期试验任务]接口") +public class CycleTestTaskController extends BladeController { + + @Resource + private ICycleTestTaskGenService cycleTestTaskGenService; + @Resource + private CycleTestTaskService service; + + /** + * [周期试验任务] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestTask") + public R detail(CycleTestTask cycleTestTask) { + CycleTestTask detail = cycleTestTaskGenService.getOne(Condition.getQueryWrapper(cycleTestTask)); + return R.data(CycleTestTaskGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验任务] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class)); + return R.data(CycleTestTaskGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验任务] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> page(CycleTestTaskGenVO cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.selectCycleTestTaskPage(Condition.getPage(query), cycleTestTask); + return R.data(pages); + } + + /** + * [周期试验任务] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestTask") + public R save(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.save(cycleTestTask)); + } + + /** + * [周期试验任务] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestTask") + public R update(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.updateById(cycleTestTask)); + } + + /** + * [周期试验任务] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestTask") + public R submit(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.saveOrUpdate(cycleTestTask)); + } + + /** + * [周期试验任务] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestTaskGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestTask") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestTask") + public void exportCycleTestTask(@Parameter(hidden = true) @RequestParam Map cycleTestTask, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestTask::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestTaskGenService.exportCycleTestTask(queryWrapper); + ExcelUtil.export(response, "[周期试验任务]数据" + DateUtil.time(), "[周期试验任务]数据表", list, CycleTestTaskGenExcel.class); + } + + @GetMapping("/test") + @ApiOperationSupport(order = 100) + @Operation(summary = "test", description = "test") + public R test() { + service.test(); + return R.success(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java new file mode 100644 index 000000000..c288db6da --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.InspectionItemGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.vo.gen.InspectionItemGenVO; +import org.springblade.desk.quality.service.gen.IInspectionItemGenService; +import org.springblade.desk.quality.wrapper.gen.InspectionItemGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [检验项目] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/inspectionItem") +@Tag(name = "[检验项目]", description = "[检验项目]接口") +public class InspectionItemController extends BladeController { + + private final IInspectionItemGenService inspectionItemGenService; + + /** + * [检验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入inspectionItem") + public R detail(InspectionItem inspectionItem) { + InspectionItem detail = inspectionItemGenService.getOne(Condition.getQueryWrapper(inspectionItem)); + return R.data(InspectionItemGenWrapper.build().entityVO(detail)); + } + + /** + * [检验项目] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入inspectionItem") + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionItem, Query query) { + IPage pages = inspectionItemGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionItem, InspectionItem.class)); + return R.data(InspectionItemGenWrapper.build().pageVO(pages)); + } + + + /** + * [检验项目] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入inspectionItem") + public R> page(InspectionItemGenVO inspectionItem, Query query) { + IPage pages = inspectionItemGenService.selectInspectionItemPage(Condition.getPage(query), inspectionItem); + return R.data(pages); + } + + /** + * [检验项目] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入inspectionItem") + public R save(@Valid @RequestBody InspectionItem inspectionItem) { + return R.status(inspectionItemGenService.save(inspectionItem)); + } + + /** + * [检验项目] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入inspectionItem") + public R update(@Valid @RequestBody InspectionItem inspectionItem) { + return R.status(inspectionItemGenService.updateById(inspectionItem)); + } + + /** + * [检验项目] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入inspectionItem") + public R submit(@Valid @RequestBody InspectionItem inspectionItem) { + return R.status(inspectionItemGenService.saveOrUpdate(inspectionItem)); + } + + /** + * [检验项目] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionItemGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-inspectionItem") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入inspectionItem") + public void exportInspectionItem(@Parameter(hidden = true) @RequestParam Map inspectionItem, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(InspectionItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(InspectionItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = inspectionItemGenService.exportInspectionItem(queryWrapper); + ExcelUtil.export(response, "[检验项目]数据" + DateUtil.time(), "[检验项目]数据表", list, InspectionItemGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java new file mode 100644 index 000000000..d07a5ad68 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.InspectionResultGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.vo.gen.InspectionResultGenVO; +import org.springblade.desk.quality.service.gen.IInspectionResultGenService; +import org.springblade.desk.quality.wrapper.gen.InspectionResultGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [检验结果] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/inspectionResult") +@Tag(name = "[检验结果]", description = "[检验结果]接口") +public class InspectionResultController extends BladeController { + + private final IInspectionResultGenService inspectionResultGenService; + + /** + * [检验结果] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入inspectionResult") + public R detail(InspectionResult inspectionResult) { + InspectionResult detail = inspectionResultGenService.getOne(Condition.getQueryWrapper(inspectionResult)); + return R.data(InspectionResultGenWrapper.build().entityVO(detail)); + } + + /** + * [检验结果] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入inspectionResult") + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionResult, Query query) { + IPage pages = inspectionResultGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionResult, InspectionResult.class)); + return R.data(InspectionResultGenWrapper.build().pageVO(pages)); + } + + + /** + * [检验结果] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入inspectionResult") + public R> page(InspectionResultGenVO inspectionResult, Query query) { + IPage pages = inspectionResultGenService.selectInspectionResultPage(Condition.getPage(query), inspectionResult); + return R.data(pages); + } + + /** + * [检验结果] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入inspectionResult") + public R save(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultGenService.save(inspectionResult)); + } + + /** + * [检验结果] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入inspectionResult") + public R update(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultGenService.updateById(inspectionResult)); + } + + /** + * [检验结果] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入inspectionResult") + public R submit(@Valid @RequestBody InspectionResult inspectionResult) { + return R.status(inspectionResultGenService.saveOrUpdate(inspectionResult)); + } + + /** + * [检验结果] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionResultGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-inspectionResult") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入inspectionResult") + public void exportInspectionResult(@Parameter(hidden = true) @RequestParam Map inspectionResult, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(inspectionResult, InspectionResult.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(InspectionResult::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(InspectionResultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = inspectionResultGenService.exportInspectionResult(queryWrapper); + ExcelUtil.export(response, "[检验结果]数据" + DateUtil.time(), "[检验结果]数据表", list, InspectionResultGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java new file mode 100644 index 000000000..96500962e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -0,0 +1,157 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; +import org.springblade.desk.quality.service.InspectionTaskService; +import org.springblade.desk.quality.service.gen.IInspectionTaskGenService; +import org.springblade.desk.quality.wrapper.gen.InspectionTaskGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [检验任务] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@Data +@EqualsAndHashCode(callSuper = true) +@RequestMapping("/QA/inspectionTask") +@Tag(name = "[检验任务]", description = "[检验任务]接口") +public class InspectionTaskController extends BladeController { + + @Resource + private IInspectionTaskGenService inspectionTaskGenService; + @Resource + private InspectionTaskService service; + + /** + * [检验任务] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入inspectionTask") + public R detail(InspectionTask inspectionTask) { + InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); + return R.data(InspectionTaskGenWrapper.build().entityVO(detail)); + } + + /** + * [检验任务] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入inspectionTask") + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { + IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); + return R.data(InspectionTaskGenWrapper.build().pageVO(pages)); + } + + + /** + * [检验任务] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入inspectionTask") + public R> page(InspectionTaskGenVO inspectionTask, Query query) { + IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + return R.data(pages); + } + + /** + * [检验任务] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入inspectionTask") + public R save(@Valid @RequestBody InspectionTask inspectionTask) { + return R.status(inspectionTaskGenService.save(inspectionTask)); + } + + /** + * [检验任务] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入inspectionTask") + public R update(@Valid @RequestBody InspectionTask inspectionTask) { + return R.status(inspectionTaskGenService.updateById(inspectionTask)); + } + + /** + * [检验任务] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入inspectionTask") + public R submit(@Valid @RequestBody InspectionTask inspectionTask) { + return R.status(inspectionTaskGenService.saveOrUpdate(inspectionTask)); + } + + /** + * [检验任务] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(inspectionTaskGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-inspectionTask") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入inspectionTask") + public void exportInspectionTask(@Parameter(hidden = true) @RequestParam Map inspectionTask, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(inspectionTask, InspectionTask.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(InspectionTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = inspectionTaskGenService.exportInspectionTask(queryWrapper); + ExcelUtil.export(response, "[检验任务]数据" + DateUtil.time(), "[检验任务]数据表", list, InspectionTaskGenExcel.class); + } + + /** + * todo:调用时机待定。talk to 李涛。 + * 工序开始，新增[检验任务] + */ + @PostMapping("/startNew") + @ApiOperationSupport(order = 9) + @Operation(summary = "", description = "传入inspectionTask") + public R save(@Valid @RequestBody InspectionTaskStartNew start) { + return service.startNew(start); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java new file mode 100644 index 000000000..02aa8d2ad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; +import org.springblade.desk.quality.service.gen.IIotHardnessGenService; +import org.springblade.desk.quality.wrapper.gen.IotHardnessGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [IOT硬度] 控制器 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/IotHardness") +@Tag(name = "[IOT硬度]", description = "[IOT硬度]接口") +public class IotHardnessController extends BladeController { + + private final IIotHardnessGenService iotHardnessGenService; + + /** + * [IOT硬度] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入iotHardness") + public R detail(IotHardness iotHardness) { + IotHardness detail = iotHardnessGenService.getOne(Condition.getQueryWrapper(iotHardness)); + return R.data(IotHardnessGenWrapper.build().entityVO(detail)); + } + + /** + * [IOT硬度] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入iotHardness") + public R> list(@Parameter(hidden = true) @RequestParam Map iotHardness, Query query) { + IPage pages = iotHardnessGenService.page(Condition.getPage(query), Condition.getQueryWrapper(iotHardness, IotHardness.class)); + return R.data(IotHardnessGenWrapper.build().pageVO(pages)); + } + + + /** + * [IOT硬度] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入iotHardness") + public R> page(IotHardnessGenVO iotHardness, Query query) { + IPage pages = iotHardnessGenService.selectIotHardnessPage(Condition.getPage(query), iotHardness); + return R.data(pages); + } + + /** + * [IOT硬度] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入iotHardness") + public R save(@Valid @RequestBody IotHardness iotHardness) { + return R.status(iotHardnessGenService.save(iotHardness)); + } + + /** + * [IOT硬度] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入iotHardness") + public R update(@Valid @RequestBody IotHardness iotHardness) { + return R.status(iotHardnessGenService.updateById(iotHardness)); + } + + /** + * [IOT硬度] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入iotHardness") + public R submit(@Valid @RequestBody IotHardness iotHardness) { + return R.status(iotHardnessGenService.saveOrUpdate(iotHardness)); + } + + /** + * [IOT硬度] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(iotHardnessGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-iotHardness") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入iotHardness") + public void exportIotHardness(@Parameter(hidden = true) @RequestParam Map iotHardness, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(iotHardness, IotHardness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(IotHardness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(IotHardnessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = iotHardnessGenService.exportIotHardness(queryWrapper); + ExcelUtil.export(response, "[IOT硬度]数据" + DateUtil.time(), "[IOT硬度]数据表", list, IotHardnessGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java new file mode 100644 index 000000000..5cff8f626 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; +import org.springblade.desk.quality.service.gen.IIotThicknessGenService; +import org.springblade.desk.quality.wrapper.gen.IotThicknessGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [IOT硬度] 控制器 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/IotThickness") +@Tag(name = "[IOT硬度]", description = "[IOT硬度]接口") +public class IotThicknessController extends BladeController { + + private final IIotThicknessGenService iotThicknessGenService; + + /** + * [IOT硬度] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入iotThickness") + public R detail(IotThickness iotThickness) { + IotThickness detail = iotThicknessGenService.getOne(Condition.getQueryWrapper(iotThickness)); + return R.data(IotThicknessGenWrapper.build().entityVO(detail)); + } + + /** + * [IOT硬度] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入iotThickness") + public R> list(@Parameter(hidden = true) @RequestParam Map iotThickness, Query query) { + IPage pages = iotThicknessGenService.page(Condition.getPage(query), Condition.getQueryWrapper(iotThickness, IotThickness.class)); + return R.data(IotThicknessGenWrapper.build().pageVO(pages)); + } + + + /** + * [IOT硬度] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入iotThickness") + public R> page(IotThicknessGenVO iotThickness, Query query) { + IPage pages = iotThicknessGenService.selectIotThicknessPage(Condition.getPage(query), iotThickness); + return R.data(pages); + } + + /** + * [IOT硬度] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入iotThickness") + public R save(@Valid @RequestBody IotThickness iotThickness) { + return R.status(iotThicknessGenService.save(iotThickness)); + } + + /** + * [IOT硬度] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入iotThickness") + public R update(@Valid @RequestBody IotThickness iotThickness) { + return R.status(iotThicknessGenService.updateById(iotThickness)); + } + + /** + * [IOT硬度] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入iotThickness") + public R submit(@Valid @RequestBody IotThickness iotThickness) { + return R.status(iotThicknessGenService.saveOrUpdate(iotThickness)); + } + + /** + * [IOT硬度] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(iotThicknessGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-iotThickness") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入iotThickness") + public void exportIotThickness(@Parameter(hidden = true) @RequestParam Map iotThickness, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(iotThickness, IotThickness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(IotThickness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(IotThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = iotThicknessGenService.exportIotThickness(queryWrapper); + ExcelUtil.export(response, "[IOT硬度]数据" + DateUtil.time(), "[IOT硬度]数据表", list, IotThicknessGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java new file mode 100644 index 000000000..9191a8800 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -0,0 +1,184 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.Excel; +import org.springblade.desk.quality.excel.gen.LiquidTankGenExcel; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.request.LiquidTankSubmit; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankGenVO; +import org.springblade.desk.quality.service.LiquidTankService; +import org.springblade.desk.quality.service.gen.ILiquidTankGenService; +import org.springblade.desk.quality.wrapper.gen.LiquidTankGenWrapper; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * [槽液] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@RequestMapping("/QA/LiquidTank") +@Data +@AllArgsConstructor +@Slf4j +@Tag(name = "QA[槽液]", description = "[槽液]接口") +public class LiquidTankController extends BladeController { + + @Resource + private ILiquidTankGenService genService; + @Resource + private LiquidTankService service; + + /** + * [槽液] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入liquidTank") + public R detail(LiquidTank liquidTank) { + LiquidTank detail = genService.getOne(Condition.getQueryWrapper(liquidTank)); + return R.data(LiquidTankGenWrapper.build().entityVO(detail)); + } + + /** + * [槽液] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入liquidTank") + public R> list(@Parameter(hidden = true) @RequestParam Map liquidTank, + Query query) { + IPage pages = genService.page( + Condition.getPage(query), + Condition.getQueryWrapper(liquidTank, LiquidTank.class) + ); + return R.data(LiquidTankGenWrapper.build().pageVO(pages)); + } + + + /** + * [槽液] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入liquidTank") + public R> page(LiquidTankGenVO liquidTank, Query query) { + IPage pages = genService.selectLiquidTankPage( + Condition.getPage(query), liquidTank + ); + return R.data(pages); + } + + /** + * [槽液] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入liquidTank") + public R save(@Valid @RequestBody LiquidTankSubmit ltSubmit) { + return service.save(ltSubmit); + } + + /** + * [槽液] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入liquidTank") + public R update(@Valid @RequestBody LiquidTankSubmit ltSubmit) { + return service.update(ltSubmit); + } + + /** + * [槽液] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入liquidTank") + public R submit(@Valid @RequestBody LiquidTank liquidTank) { + return R.status(genService.saveOrUpdate(liquidTank)); + } + + /** + * [槽液] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(genService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入liquidTank") + public void exportLiquidTank(@Parameter(hidden = true) @RequestParam Map liquidTank, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(liquidTank, LiquidTank.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LiquidTank::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LiquidTankEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = genService.exportLiquidTank(queryWrapper); + ExcelUtil.export(response, "[槽液]数据" + DateUtil.time(), "[槽液]数据表", + list, LiquidTankGenExcel.class); + } + + /** + * 导入数据 + */ + @PostMapping("/import-excel") + @ApiOperationSupport(order = 9) + @Operation(summary = "导入数据", description = "MultipartFile") + public R importLiquidTank(@RequestParam("file") MultipartFile file) { + if (file.isEmpty()) { + return R.fail("请上传文件"); + } + String fileName = file.getOriginalFilename(); + if (StringUtils.isBlank(fileName)) { + return R.fail("文件名为空"); + } + if (!StringUtils.endsWith(fileName, Excel.EXT_XLS) && + !StringUtils.endsWith(fileName, Excel.EXT_XLSX)) { + return R.fail("格式不正确"); + } + List list = ExcelUtil.read(file, 0, 1, LiquidTank.class); + if (list.isEmpty()) { + log.info("list.isEmpty"); + } + list.forEach(lt -> log.info("LiquidTank - {}", lt)); + genService.saveBatch(list); + return R.success("导入成功"); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java new file mode 100644 index 000000000..121a7890a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -0,0 +1,157 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.LiquidTankTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.request.LiquidTankTaskGenManual; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; +import org.springblade.desk.quality.service.LiquidTankTaskService; +import org.springblade.desk.quality.service.gen.ILiquidTankTaskGenService; +import org.springblade.desk.quality.wrapper.gen.LiquidTankTaskGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [槽液检测任务] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@RequestMapping("/QA/LiquidTankTask") +@Tag(name = "[槽液检测任务]", description = "[槽液检测任务]接口") +public class LiquidTankTaskController extends BladeController { + + @Resource + private ILiquidTankTaskGenService liquidTankTaskGenService; + @Resource + private LiquidTankTaskService service; + + /** + * [槽液检测任务] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入liquidTankTask") + public R detail(LiquidTankTask liquidTankTask) { + LiquidTankTask detail = liquidTankTaskGenService.getOne(Condition.getQueryWrapper(liquidTankTask)); + return R.data(LiquidTankTaskGenWrapper.build().entityVO(detail)); + } + + /** + * [槽液检测任务] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入liquidTankTask") + public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankTask, Query query) { + IPage pages = liquidTankTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class)); + return R.data(LiquidTankTaskGenWrapper.build().pageVO(pages)); + } + + + /** + * [槽液检测任务] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入liquidTankTask") + public R> page(LiquidTankTaskGenVO liquidTankTask, Query query) { + IPage pages = liquidTankTaskGenService.selectLiquidTankTaskPage(Condition.getPage(query), liquidTankTask); + return R.data(pages); + } + + /** + * [槽液检测任务] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入liquidTankTask") + public R save(@Valid @RequestBody LiquidTankTask liquidTankTask) { + return R.status(liquidTankTaskGenService.save(liquidTankTask)); + } + + /** + * [槽液检测任务] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入liquidTankTask") + public R update(@Valid @RequestBody LiquidTankTask liquidTankTask) { + return R.status(liquidTankTaskGenService.updateById(liquidTankTask)); + } + + /** + * [槽液检测任务] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入liquidTankTask") + public R submit(@Valid @RequestBody LiquidTankTask liquidTankTask) { + return R.status(liquidTankTaskGenService.saveOrUpdate(liquidTankTask)); + } + + /** + * [槽液检测任务] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(liquidTankTaskGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入liquidTankTask") + public void exportLiquidTankTask(@Parameter(hidden = true) @RequestParam Map liquidTankTask, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LiquidTankTask::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LiquidTankTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = liquidTankTaskGenService.exportLiquidTankTask(queryWrapper); + ExcelUtil.export(response, "[槽液检测任务]数据" + DateUtil.time(), "[槽液检测任务]数据表", list, LiquidTankTaskGenExcel.class); + } + + /** + * [槽液检测任务] 手动生成新增 + */ + @PostMapping("/generateManual") + @ApiOperationSupport(order = 4) + @Operation(summary = "手动生成新增", description = "") + public R generateManual(@Valid @RequestBody LiquidTankTaskGenManual req) { + return service.generateManual(req); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java new file mode 100644 index 000000000..ad70f5d66 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.NgGenExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; +import org.springblade.desk.quality.service.gen.INgGenService; +import org.springblade.desk.quality.wrapper.gen.NgGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [缺陷] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/qa/ng") +@Tag(name = "[缺陷]", description = "[缺陷]接口") +public class NgController extends BladeController { + + private final INgGenService ngGenService; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入ng") + public R detail(Ng ng) { + Ng detail = ngGenService.getOne(Condition.getQueryWrapper(ng)); + return R.data(NgGenWrapper.build().entityVO(detail)); + } + + /** + * [缺陷] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入ng") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, Query query) { + IPage pages = ngGenService.page(Condition.getPage(query), Condition.getQueryWrapper(ng, Ng.class)); + return R.data(NgGenWrapper.build().pageVO(pages)); + } + + + /** + * [缺陷] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入ng") + public R> page(NgGenVO ng, Query query) { + IPage pages = ngGenService.selectNgPage(Condition.getPage(query), ng); + return R.data(pages); + } + + /** + * [缺陷] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入ng") + public R save(@Valid @RequestBody Ng ng) { + return R.status(ngGenService.save(ng)); + } + + /** + * [缺陷] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入ng") + public R update(@Valid @RequestBody Ng ng) { + return R.status(ngGenService.updateById(ng)); + } + + /** + * [缺陷] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入ng") + public R submit(@Valid @RequestBody Ng ng) { + return R.status(ngGenService.saveOrUpdate(ng)); + } + + /** + * [缺陷] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(ngGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-ng") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入ng") + public void exportNg(@Parameter(hidden = true) @RequestParam Map ng, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = ngGenService.exportNg(queryWrapper); + ExcelUtil.export(response, "[缺陷]数据" + DateUtil.time(), "[缺陷]数据表", list, NgGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java new file mode 100644 index 000000000..e40068115 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.StandardGenExcel; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.vo.gen.StandardGenVO; +import org.springblade.desk.quality.service.gen.IStandardGenService; +import org.springblade.desk.quality.wrapper.gen.StandardGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [质量标准] 控制器 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/Standard") +@Tag(name = "[质量标准]", description = "[质量标准]接口") +public class StandardController extends BladeController { + + private final IStandardGenService standardGenService; + + /** + * [质量标准] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入standard") + public R detail(Standard standard) { + Standard detail = standardGenService.getOne(Condition.getQueryWrapper(standard)); + return R.data(StandardGenWrapper.build().entityVO(detail)); + } + + /** + * [质量标准] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入standard") + public R> list(@Parameter(hidden = true) @RequestParam Map standard, Query query) { + IPage pages = standardGenService.page(Condition.getPage(query), Condition.getQueryWrapper(standard, Standard.class)); + return R.data(StandardGenWrapper.build().pageVO(pages)); + } + + + /** + * [质量标准] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入standard") + public R> page(StandardGenVO standard, Query query) { + IPage pages = standardGenService.selectStandardPage(Condition.getPage(query), standard); + return R.data(pages); + } + + /** + * [质量标准] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入standard") + public R save(@Valid @RequestBody Standard standard) { + return R.status(standardGenService.save(standard)); + } + + /** + * [质量标准] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入standard") + public R update(@Valid @RequestBody Standard standard) { + return R.status(standardGenService.updateById(standard)); + } + + /** + * [质量标准] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入standard") + public R submit(@Valid @RequestBody Standard standard) { + return R.status(standardGenService.saveOrUpdate(standard)); + } + + /** + * [质量标准] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(standardGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-standard") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入standard") + public void exportStandard(@Parameter(hidden = true) @RequestParam Map standard, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(standard, Standard.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Standard::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(StandardEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = standardGenService.exportStandard(queryWrapper); + ExcelUtil.export(response, "[质量标准]数据" + DateUtil.time(), "[质量标准]数据表", list, StandardGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java new file mode 100644 index 000000000..8cf00dc20 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.StandardParamGenExcel; +import org.springblade.desk.quality.pojo.entity.StandardParam; +import org.springblade.desk.quality.pojo.vo.gen.StandardParamGenVO; +import org.springblade.desk.quality.service.gen.IStandardParamGenService; +import org.springblade.desk.quality.wrapper.gen.StandardParamGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [质量标准参数] 控制器 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/StandardParam") +@Tag(name = "[质量标准参数]", description = "[质量标准参数]接口") +public class StandardParamController extends BladeController { + + private final IStandardParamGenService standardParamGenService; + + /** + * [质量标准参数] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入standardParam") + public R detail(StandardParam standardParam) { + StandardParam detail = standardParamGenService.getOne(Condition.getQueryWrapper(standardParam)); + return R.data(StandardParamGenWrapper.build().entityVO(detail)); + } + + /** + * [质量标准参数] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入standardParam") + public R> list(@Parameter(hidden = true) @RequestParam Map standardParam, Query query) { + IPage pages = standardParamGenService.page(Condition.getPage(query), Condition.getQueryWrapper(standardParam, StandardParam.class)); + return R.data(StandardParamGenWrapper.build().pageVO(pages)); + } + + + /** + * [质量标准参数] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入standardParam") + public R> page(StandardParamGenVO standardParam, Query query) { + IPage pages = standardParamGenService.selectStandardParamPage(Condition.getPage(query), standardParam); + return R.data(pages); + } + + /** + * [质量标准参数] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入standardParam") + public R save(@Valid @RequestBody StandardParam standardParam) { + return R.status(standardParamGenService.save(standardParam)); + } + + /** + * [质量标准参数] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入standardParam") + public R update(@Valid @RequestBody StandardParam standardParam) { + return R.status(standardParamGenService.updateById(standardParam)); + } + + /** + * [质量标准参数] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入standardParam") + public R submit(@Valid @RequestBody StandardParam standardParam) { + return R.status(standardParamGenService.saveOrUpdate(standardParam)); + } + + /** + * [质量标准参数] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(standardParamGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-standardParam") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入standardParam") + public void exportStandardParam(@Parameter(hidden = true) @RequestParam Map standardParam, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(standardParam, StandardParam.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(StandardParam::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(StandardParamEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = standardParamGenService.exportStandardParam(queryWrapper); + ExcelUtil.export(response, "[质量标准参数]数据" + DateUtil.time(), "[质量标准参数]数据表", list, StandardParamGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java new file mode 100644 index 000000000..ad04760f5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java @@ -0,0 +1,41 @@ +package org.springblade.desk.quality.controller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.service.TestService; +import org.springblade.system.pojo.entity.User; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@AllArgsConstructor +@RequestMapping("/qa/test") +@Tag(name = "[test]", description = "[test]接口") +public class TestController extends BladeController { + + @Resource + private TestService service; + + /** + * [] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "详情") + public R detail(@RequestParam Long userId) { + return service.getOneUser(userId); + } + + @GetMapping("/test1") + @ApiOperationSupport(order = 2) + public R test1() { + return service.test1(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceChainController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceChainController.java new file mode 100644 index 000000000..ebb8aa3ae --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceChainController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; +import org.springblade.desk.quality.service.gen.ITraceChainGenService; +import org.springblade.desk.quality.wrapper.gen.TraceChainGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [追溯链条] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/TraceChain") +@Tag(name = "[追溯链条]", description = "[追溯链条]接口") +public class TraceChainController extends BladeController { + + private final ITraceChainGenService traceChainGenService; + + /** + * [追溯链条] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入traceChain") + public R detail(TraceChain traceChain) { + TraceChain detail = traceChainGenService.getOne(Condition.getQueryWrapper(traceChain)); + return R.data(TraceChainGenWrapper.build().entityVO(detail)); + } + + /** + * [追溯链条] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入traceChain") + public R> list(@Parameter(hidden = true) @RequestParam Map traceChain, Query query) { + IPage pages = traceChainGenService.page(Condition.getPage(query), Condition.getQueryWrapper(traceChain, TraceChain.class)); + return R.data(TraceChainGenWrapper.build().pageVO(pages)); + } + + + /** + * [追溯链条] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入traceChain") + public R> page(TraceChainGenVO traceChain, Query query) { + IPage pages = traceChainGenService.selectTraceChainPage(Condition.getPage(query), traceChain); + return R.data(pages); + } + + /** + * [追溯链条] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入traceChain") + public R save(@Valid @RequestBody TraceChain traceChain) { + return R.status(traceChainGenService.save(traceChain)); + } + + /** + * [追溯链条] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入traceChain") + public R update(@Valid @RequestBody TraceChain traceChain) { + return R.status(traceChainGenService.updateById(traceChain)); + } + + /** + * [追溯链条] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入traceChain") + public R submit(@Valid @RequestBody TraceChain traceChain) { + return R.status(traceChainGenService.saveOrUpdate(traceChain)); + } + + /** + * [追溯链条] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(traceChainGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-traceChain") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入traceChain") + public void exportTraceChain(@Parameter(hidden = true) @RequestParam Map traceChain, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(traceChain, TraceChain.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(TraceChain::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(TraceChainEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = traceChainGenService.exportTraceChain(queryWrapper); + ExcelUtil.export(response, "[追溯链条]数据" + DateUtil.time(), "[追溯链条]数据表", list, TraceChainGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceEventController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceEventController.java new file mode 100644 index 000000000..69a15b1bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceEventController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; +import org.springblade.desk.quality.service.gen.ITraceEventGenService; +import org.springblade.desk.quality.wrapper.gen.TraceEventGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [追溯事件] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/TraceEvent") +@Tag(name = "[追溯事件]", description = "[追溯事件]接口") +public class TraceEventController extends BladeController { + + private final ITraceEventGenService traceEventGenService; + + /** + * [追溯事件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入traceEvent") + public R detail(TraceEvent traceEvent) { + TraceEvent detail = traceEventGenService.getOne(Condition.getQueryWrapper(traceEvent)); + return R.data(TraceEventGenWrapper.build().entityVO(detail)); + } + + /** + * [追溯事件] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入traceEvent") + public R> list(@Parameter(hidden = true) @RequestParam Map traceEvent, Query query) { + IPage pages = traceEventGenService.page(Condition.getPage(query), Condition.getQueryWrapper(traceEvent, TraceEvent.class)); + return R.data(TraceEventGenWrapper.build().pageVO(pages)); + } + + + /** + * [追溯事件] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入traceEvent") + public R> page(TraceEventGenVO traceEvent, Query query) { + IPage pages = traceEventGenService.selectTraceEventPage(Condition.getPage(query), traceEvent); + return R.data(pages); + } + + /** + * [追溯事件] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入traceEvent") + public R save(@Valid @RequestBody TraceEvent traceEvent) { + return R.status(traceEventGenService.save(traceEvent)); + } + + /** + * [追溯事件] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入traceEvent") + public R update(@Valid @RequestBody TraceEvent traceEvent) { + return R.status(traceEventGenService.updateById(traceEvent)); + } + + /** + * [追溯事件] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入traceEvent") + public R submit(@Valid @RequestBody TraceEvent traceEvent) { + return R.status(traceEventGenService.saveOrUpdate(traceEvent)); + } + + /** + * [追溯事件] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(traceEventGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-traceEvent") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入traceEvent") + public void exportTraceEvent(@Parameter(hidden = true) @RequestParam Map traceEvent, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(traceEvent, TraceEvent.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(TraceEvent::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(TraceEventEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = traceEventGenService.exportTraceEvent(queryWrapper); + ExcelUtil.export(response, "[追溯事件]数据" + DateUtil.time(), "[追溯事件]数据表", list, TraceEventGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceItemController.java new file mode 100644 index 000000000..f492644b0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TraceItemController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; +import org.springblade.desk.quality.service.gen.ITraceItemGenService; +import org.springblade.desk.quality.wrapper.gen.TraceItemGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [追溯明细] 控制器 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/QA/TraceItem") +@Tag(name = "[追溯明细]", description = "[追溯明细]接口") +public class TraceItemController extends BladeController { + + private final ITraceItemGenService traceItemGenService; + + /** + * [追溯明细] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入traceItem") + public R detail(TraceItem traceItem) { + TraceItem detail = traceItemGenService.getOne(Condition.getQueryWrapper(traceItem)); + return R.data(TraceItemGenWrapper.build().entityVO(detail)); + } + + /** + * [追溯明细] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入traceItem") + public R> list(@Parameter(hidden = true) @RequestParam Map traceItem, Query query) { + IPage pages = traceItemGenService.page(Condition.getPage(query), Condition.getQueryWrapper(traceItem, TraceItem.class)); + return R.data(TraceItemGenWrapper.build().pageVO(pages)); + } + + + /** + * [追溯明细] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入traceItem") + public R> page(TraceItemGenVO traceItem, Query query) { + IPage pages = traceItemGenService.selectTraceItemPage(Condition.getPage(query), traceItem); + return R.data(pages); + } + + /** + * [追溯明细] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入traceItem") + public R save(@Valid @RequestBody TraceItem traceItem) { + return R.status(traceItemGenService.save(traceItem)); + } + + /** + * [追溯明细] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入traceItem") + public R update(@Valid @RequestBody TraceItem traceItem) { + return R.status(traceItemGenService.updateById(traceItem)); + } + + /** + * [追溯明细] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入traceItem") + public R submit(@Valid @RequestBody TraceItem traceItem) { + return R.status(traceItemGenService.saveOrUpdate(traceItem)); + } + + /** + * [追溯明细] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(traceItemGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-traceItem") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入traceItem") + public void exportTraceItem(@Parameter(hidden = true) @RequestParam Map traceItem, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(traceItem, TraceItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(TraceItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(TraceItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = traceItemGenService.exportTraceItem(queryWrapper); + ExcelUtil.export(response, "[追溯明细]数据" + DateUtil.time(), "[追溯明细]数据表", list, TraceItemGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/package-info.java new file mode 100644 index 000000000..e300c2e3c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.controller; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/event/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/event/package-info.java new file mode 100644 index 000000000..185cae876 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/event/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.event; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java new file mode 100644 index 000000000..06a658b40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java @@ -0,0 +1,179 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [周期试验] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [班组]id + */ + @ColumnWidth(20) + @ExcelProperty("[班组]id") + private BigDecimal teamId; + /** + * [供应商]id + */ + @ColumnWidth(20) + @ExcelProperty("[供应商]id") + private BigDecimal supplierId; + /** + * [周期试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @ColumnWidth(20) + @ExcelProperty("提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @ColumnWidth(20) + @ExcelProperty("提醒文本") + private String remindText; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 上次试验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @ColumnWidth(20) + @ExcelProperty("cron表达式配置OK") + private Long isCronOk; + /** + * 生成任务PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("生成任务PowerJobId") + private BigDecimal powerJobIdGenTask; + /** + * 提醒PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("提醒PowerJobId") + private BigDecimal powerJobIdRemind; + /** + * 开始PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("开始PowerJobId") + private BigDecimal powerJobIdPlannedStart; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java new file mode 100644 index 000000000..25b5cad47 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java @@ -0,0 +1,69 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [周期试验项目] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestItemGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @ColumnWidth(20) + @ExcelProperty("周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @ColumnWidth(20) + @ExcelProperty("试验条件") + private String condition; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java new file mode 100644 index 000000000..72df702b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java @@ -0,0 +1,154 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [周期试验任务] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestTaskGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 配置[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[班组]id") + private BigDecimal configTeamId; + /** + * 配置[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[外协商]id") + private BigDecimal configOemId; + /** + * [周期性试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期性试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 下发[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[班组]id") + private BigDecimal sendTeamId; + /** + * 下发[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[外协商]id") + private BigDecimal sendOmeId; + /** + * 下发人员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("下发人员[用户]id") + private BigDecimal snedUserId; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long quantity; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 零件号 + */ + @ColumnWidth(20) + @ExcelProperty("零件号") + private String partCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchCode; + /** + * 专家描述 + */ + @ColumnWidth(20) + @ExcelProperty("专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @ColumnWidth(20) + @ExcelProperty("评审描述") + private String reviewDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionItemGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionItemGenExcel.java new file mode 100644 index 000000000..118697503 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionItemGenExcel.java @@ -0,0 +1,130 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [检验项目] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class InspectionItemGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检验项目类型 + */ + @ColumnWidth(20) + @ExcelProperty("检验项目类型") + private Long itemType; + /** + * 检验项目名称 + */ + @ColumnWidth(20) + @ExcelProperty("检验项目名称") + private String name; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * [计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]id") + private BigDecimal unitId; + /** + * [检验标准]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验标准]id") + private Long standardId; + /** + * 目标值 + */ + @ColumnWidth(20) + @ExcelProperty("目标值") + private Long targetValue; + /** + * 上限值 + */ + @ColumnWidth(20) + @ExcelProperty("上限值") + private Long maxValue; + /** + * 下限值 + */ + @ColumnWidth(20) + @ExcelProperty("下限值") + private Long minValue; + /** + * 标准值 + */ + @ColumnWidth(20) + @ExcelProperty("标准值") + private Long standardValue; + /** + * 计量单位 + */ + @ColumnWidth(20) + @ExcelProperty("计量单位") + private String unit; + /** + * 检验方法描述 + */ + @ColumnWidth(20) + @ExcelProperty("检验方法描述") + private String methodDesc; + /** + * 是否关键 + */ + @ColumnWidth(20) + @ExcelProperty("是否关键") + private Long isCrucial; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * [检验标准参数]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验标准参数]id") + private Long standardParamId; + /** + * [工序]代码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]代码") + private String processCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionResultGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionResultGenExcel.java new file mode 100644 index 000000000..14d31c640 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionResultGenExcel.java @@ -0,0 +1,131 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [检验结果] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class InspectionResultGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long inspectionResultType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [检验任务]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]id") + private BigDecimal inspectionTaskId; + /** + * [检验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]id") + private BigDecimal inspectionItemId; + /** + * [缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("[缺陷]id") + private BigDecimal ngId; + /** + * 质检员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("质检员[用户]id") + private BigDecimal testUserId; + /** + * 测量值 + */ + @ColumnWidth(20) + @ExcelProperty("测量值") + private Long testValue; + /** + * 检测文本描述 + */ + @ColumnWidth(20) + @ExcelProperty("检测文本描述") + private Long testDesc; + /** + * 检测结果 + */ + @ColumnWidth(20) + @ExcelProperty("检测结果") + private Long result; + /** + * 是否缺陷 + */ + @ColumnWidth(20) + @ExcelProperty("是否缺陷") + private Long isNg; + /** + * [缺陷]代码 + */ + @ColumnWidth(20) + @ExcelProperty("[缺陷]代码") + private String ngCode; + /** + * [缺陷]描述 + */ + @ColumnWidth(20) + @ExcelProperty("[缺陷]描述") + private String ngDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 检验时间 + */ + @ColumnWidth(20) + @ExcelProperty("检验时间") + private LocalDateTime testDate; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionTaskGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionTaskGenExcel.java new file mode 100644 index 000000000..25091f107 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/InspectionTaskGenExcel.java @@ -0,0 +1,161 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [检验任务] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class InspectionTaskGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [检验任务]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]编码") + private String code; + /** + * [检验任务]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]类型") + private Long inspectionTaskType; + /** + * [检验任务] + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]") + private String name; + /** + * [工单]id + */ + @ColumnWidth(20) + @ExcelProperty("[工单]id") + private BigDecimal workOrderId; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * 质检员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("质检员[用户]id") + private BigDecimal testUserId; + /** + * [制品]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]编码") + private Long productCode; + /** + * [制品]序列号 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]序列号") + private Long productSn; + /** + * 生产批次号 + */ + @ColumnWidth(20) + @ExcelProperty("生产批次号") + private Long batchNumber; + /** + * [工单]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工单]编码") + private String workOrderCode; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private String processCode; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 计划开始时间 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始时间") + private LocalDateTime plannedStartDate; + /** + * 计划结束时间 + */ + @ColumnWidth(20) + @ExcelProperty("计划结束时间") + private LocalDateTime plannedEndDate; + /** + * 实际开始时间 + */ + @ColumnWidth(20) + @ExcelProperty("实际开始时间") + private LocalDateTime actualStartDate; + /** + * 实际结束时间 + */ + @ColumnWidth(20) + @ExcelProperty("实际结束时间") + private LocalDateTime actualEndDate; + /** + * 检验样本数量 + */ + @ColumnWidth(20) + @ExcelProperty("检验样本数量") + private BigDecimal simpleCount; + /** + * 缺陷数量 + */ + @ColumnWidth(20) + @ExcelProperty("缺陷数量") + private BigDecimal ngCount; + /** + * 检验结果 + */ + @ColumnWidth(20) + @ExcelProperty("检验结果") + private Long result; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotHardnessGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotHardnessGenExcel.java new file mode 100644 index 000000000..22719b0f8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotHardnessGenExcel.java @@ -0,0 +1,95 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [IOT硬度] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class IotHardnessGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 使用标记位 + */ + @ColumnWidth(20) + @ExcelProperty("使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @ColumnWidth(20) + @ExcelProperty("读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @ColumnWidth(20) + @ExcelProperty("设备号") + private String equipmentCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * 检测内容 + */ + @ColumnWidth(20) + @ExcelProperty("检测内容") + private String data; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 数据上传时间 + */ + @ColumnWidth(20) + @ExcelProperty("数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @ColumnWidth(20) + @ExcelProperty("[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotThicknessGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotThicknessGenExcel.java new file mode 100644 index 000000000..9667a0850 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/IotThicknessGenExcel.java @@ -0,0 +1,95 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [IOT硬度] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class IotThicknessGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 使用标记位 + */ + @ColumnWidth(20) + @ExcelProperty("使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @ColumnWidth(20) + @ExcelProperty("读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @ColumnWidth(20) + @ExcelProperty("设备号") + private String equipmentCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * 检测内容 + */ + @ColumnWidth(20) + @ExcelProperty("检测内容") + private String data; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 数据上传时间 + */ + @ColumnWidth(20) + @ExcelProperty("数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @ColumnWidth(20) + @ExcelProperty("[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankExportExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankExportExcel.java new file mode 100644 index 000000000..14ae9baad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankExportExcel.java @@ -0,0 +1,215 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [槽液] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class LiquidTankExportExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务前缀 + */ + @ColumnWidth(20) + @ExcelProperty("任务前缀") + private String taskPrefix; + /** + * [作业中心]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]id") + private Long workCenterId; + /** + * 槽液编码/槽号 + */ + @ColumnWidth(20) + @ExcelProperty("槽液编码/槽号") + private String code; + /** + * 待测成分 + */ + @ColumnWidth(20) + @ExcelProperty("待测成分") + private String testElement; + /** + * 药品名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品名称") + private String drugName; + /** + * 药品[物料]id + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]id") + private Long drugMaterialId; + /** + * 药品[物料]编码 + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @ColumnWidth(20) + @ExcelProperty("工艺含量") + private String processContent; + /** + * 目标值 + */ + @ColumnWidth(20) + @ExcelProperty("目标值") + private Long targetValue; + /** + * 目标上下限 + */ + @ColumnWidth(20) + @ExcelProperty("目标上下限") + private String bound; + /** + * 添加点 + */ + @ColumnWidth(20) + @ExcelProperty("添加点") + private Long fillingLocation; + /** + * 体积 + */ + @ColumnWidth(20) + @ExcelProperty("体积") + private Long volume; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String unit; + /** + * 分析周期 + */ + @ColumnWidth(20) + @ExcelProperty("分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @ColumnWidth(20) + @ExcelProperty("有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("化验人[用户]id") + private Long testUserId; + /** + * 工艺主管[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺主管[用户]id") + private Long processUserId; + /** + * 温度范围 + */ + @ColumnWidth(20) + @ExcelProperty("温度范围") + private String temperatureRange; + /** + * 实测温度 + */ + @ColumnWidth(20) + @ExcelProperty("实测温度") + private String temperatureActual; + /** + * ph范围 + */ + @ColumnWidth(20) + @ExcelProperty("ph范围") + private String phRange; + /** + * 实测ph值 + */ + @ColumnWidth(20) + @ExcelProperty("实测ph值") + private String phActual; + /** + * 目标上限 + */ + @ColumnWidth(20) + @ExcelProperty("目标上限") + private String targetValueMax; + /** + * 目标下限 + */ + @ColumnWidth(20) + @ExcelProperty("目标下限") + private String targetValueMin; + /** + * 药品批次号 + */ + @ColumnWidth(20) + @ExcelProperty("药品批次号") + private String drugBatNum; + /** + * 加药后化验值 + */ + @ColumnWidth(20) + @ExcelProperty("加药后化验值") + private String postTestValue; + /** + * 是否合格 + */ + @ColumnWidth(20) + @ExcelProperty("是否合格") + private Long qualified; + /** + * [计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]id") + private Long unitId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankGenExcel.java new file mode 100644 index 000000000..fa0340930 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankGenExcel.java @@ -0,0 +1,216 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [槽液] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class LiquidTankGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务前缀 + */ + @ColumnWidth(20) + @ExcelProperty("任务前缀") + private String taskPrefix; + /** + * [作业中心]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]id") + private BigDecimal workCenterId; + /** + * 槽液编码/槽号 + */ + @ColumnWidth(20) + @ExcelProperty("槽液编码/槽号") + private String code; + /** + * 待测成分 + */ + @ColumnWidth(20) + @ExcelProperty("待测成分") + private String testElement; + /** + * 药品名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品名称") + private String drugName; + /** + * 药品[物料]id + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]id") + private BigDecimal drugMaterialId; + /** + * 药品[物料]编码 + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @ColumnWidth(20) + @ExcelProperty("工艺含量") + private String processContent; + /** + * 目标值 + */ + @ColumnWidth(20) + @ExcelProperty("目标值") + private BigDecimal targetValue; + /** + * 目标上下限 + */ + @ColumnWidth(20) + @ExcelProperty("目标上下限") + private String bound; + /** + * 添加点 + */ + @ColumnWidth(20) + @ExcelProperty("添加点") + private BigDecimal fillingLocation; + /** + * 体积 + */ + @ColumnWidth(20) + @ExcelProperty("体积") + private BigDecimal volume; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String unit; + /** + * 分析周期 + */ + @ColumnWidth(20) + @ExcelProperty("分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @ColumnWidth(20) + @ExcelProperty("有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("化验人[用户]id") + private BigDecimal testUserId; + /** + * 工艺主管[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 温度范围 + */ + @ColumnWidth(20) + @ExcelProperty("温度范围") + private String temperatureRange; + /** + * 实测温度 + */ + @ColumnWidth(20) + @ExcelProperty("实测温度") + private String temperatureActual; + /** + * ph范围 + */ + @ColumnWidth(20) + @ExcelProperty("ph范围") + private String phRange; + /** + * 实测ph值 + */ + @ColumnWidth(20) + @ExcelProperty("实测ph值") + private String phActual; + /** + * 目标上限 + */ + @ColumnWidth(20) + @ExcelProperty("目标上限") + private String targetValueMax; + /** + * 目标下限 + */ + @ColumnWidth(20) + @ExcelProperty("目标下限") + private String targetValueMin; + /** + * 药品批次号 + */ + @ColumnWidth(20) + @ExcelProperty("药品批次号") + private String drugBatNum; + /** + * 加药后化验值 + */ + @ColumnWidth(20) + @ExcelProperty("加药后化验值") + private String postTestValue; + /** + * 是否合格 + */ + @ColumnWidth(20) + @ExcelProperty("是否合格") + private Long qualified; + /** + * [计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]id") + private BigDecimal unitId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankTaskGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankTaskGenExcel.java new file mode 100644 index 000000000..6c1a51a65 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/LiquidTankTaskGenExcel.java @@ -0,0 +1,293 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [槽液检测任务] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class LiquidTankTaskGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [槽液检测任务]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[槽液检测任务]编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long liquidTankTaskType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [槽液]id + */ + @ColumnWidth(20) + @ExcelProperty("[槽液]id") + private BigDecimal liquidTankId; + /** + * [作业中心]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]id") + private BigDecimal workCenterId; + /** + * 药品[物料]id + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]id") + private BigDecimal drugMaterialId; + /** + * [槽液]编号 + */ + @ColumnWidth(20) + @ExcelProperty("[槽液]编号") + private String liquidTankCode; + /** + * 待测成分 + */ + @ColumnWidth(20) + @ExcelProperty("待测成分") + private String testElement; + /** + * 药品名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品名称") + private String drugName; + /** + * 药品[物料]编码 + */ + @ColumnWidth(20) + @ExcelProperty("药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @ColumnWidth(20) + @ExcelProperty("工艺含量") + private String processContent; + /** + * 目标值 + */ + @ColumnWidth(20) + @ExcelProperty("目标值") + private BigDecimal targetValue; + /** + * 目标上下限 + */ + @ColumnWidth(20) + @ExcelProperty("目标上下限") + private String bound; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 添加点 + */ + @ColumnWidth(20) + @ExcelProperty("添加点") + private BigDecimal fillingLocation; + /** + * 电导率测量值 + */ + @ColumnWidth(20) + @ExcelProperty("电导率测量值") + private BigDecimal conductivityTestValue; + /** + * 体积 + */ + @ColumnWidth(20) + @ExcelProperty("体积") + private BigDecimal volume; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private BigDecimal unit; + /** + * [计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]id") + private BigDecimal unitId; + /** + * 加药量单位 + */ + @ColumnWidth(20) + @ExcelProperty("加药量单位") + private String addUnit; + /** + * 加药量[计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("加药量[计量单位]id") + private BigDecimal addUnitId; + /** + * 分析周期 + */ + @ColumnWidth(20) + @ExcelProperty("分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @ColumnWidth(20) + @ExcelProperty("有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("化验人[用户]id") + private BigDecimal testUserId; + /** + * 工艺主管[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 测量值 + */ + @ColumnWidth(20) + @ExcelProperty("测量值") + private BigDecimal testValue; + /** + * 需添加量 + */ + @ColumnWidth(20) + @ExcelProperty("需添加量") + private BigDecimal needAddValue; + /** + * 实际添加量 + */ + @ColumnWidth(20) + @ExcelProperty("实际添加量") + private BigDecimal actualAddValue; + /** + * 加药后含量 + */ + @ColumnWidth(20) + @ExcelProperty("加药后含量") + private BigDecimal afterAddValue; + /** + * [班组]id + */ + @ColumnWidth(20) + @ExcelProperty("[班组]id") + private BigDecimal teamId; + /** + * 参数录入时间 + */ + @ColumnWidth(20) + @ExcelProperty("参数录入时间") + private LocalDateTime entryDate; + /** + * 确认时间 + */ + @ColumnWidth(20) + @ExcelProperty("确认时间") + private LocalDateTime confirmDate; + /** + * 送出[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("送出[用户]id") + private BigDecimal sendUserId; + /** + * 送出时间 + */ + @ColumnWidth(20) + @ExcelProperty("送出时间") + private LocalDateTime sendDate; + /** + * 接收[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("接收[用户]id") + private BigDecimal receiveUserId; + /** + * 接收时间 + */ + @ColumnWidth(20) + @ExcelProperty("接收时间") + private LocalDateTime receiveDate; + /** + * 处理[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("处理[用户]id") + private BigDecimal handleUserId; + /** + * 处理时间 + */ + @ColumnWidth(20) + @ExcelProperty("处理时间") + private LocalDateTime handleDate; + /** + * 来源类型 + */ + @ColumnWidth(20) + @ExcelProperty("来源类型") + private Long fromType; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java new file mode 100644 index 000000000..268c89acc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java @@ -0,0 +1,100 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [缺陷] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class NgGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型1:故障特征 2:故障类别 3:问题大类 4:问题小类 + */ + @ColumnWidth(20) + @ExcelProperty("类型1:故障特征 2:故障类别 3:问题大类 4:问题小类") + private Long ngType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 父级[不良原因]id + */ + @ColumnWidth(20) + @ExcelProperty("父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 缺陷描述 + */ + @ColumnWidth(20) + @ExcelProperty("缺陷描述") + private String desc; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]编码") + private String productCode; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private String processCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardGenExcel.java new file mode 100644 index 000000000..b9cdc798a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardGenExcel.java @@ -0,0 +1,125 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [质量标准] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class StandardGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检验标准类型 + */ + @ColumnWidth(20) + @ExcelProperty("检验标准类型") + private Long standardType; + /** + * 检验标准名称 + */ + @ColumnWidth(20) + @ExcelProperty("检验标准名称") + private String name; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * [物料]id + */ + @ColumnWidth(20) + @ExcelProperty("[物料]id") + private BigDecimal materialId; + /** + * [附件]id + */ + @ColumnWidth(20) + @ExcelProperty("[附件]id") + private BigDecimal attachId; + /** + * 检验标准版本 + */ + @ColumnWidth(20) + @ExcelProperty("检验标准版本") + private Long ver; + /** + * [制品]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]编码") + private String productCode; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private String processCode; + /** + * [物料]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[物料]编码") + private String materialCode; + /** + * 生效日期 + */ + @ColumnWidth(20) + @ExcelProperty("生效日期") + private LocalDateTime effectiveDate; + /** + * 失效日期 + */ + @ColumnWidth(20) + @ExcelProperty("失效日期") + private LocalDateTime expiryDate; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 检验标准编码 + */ + @ColumnWidth(20) + @ExcelProperty("检验标准编码") + private String code; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardParamGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardParamGenExcel.java new file mode 100644 index 000000000..cc2fb6c10 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/StandardParamGenExcel.java @@ -0,0 +1,172 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [质量标准参数] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class StandardParamGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 质量标准参数类型 + */ + @ColumnWidth(20) + @ExcelProperty("质量标准参数类型") + private Long standardParamType; + /** + * 参数名称 + */ + @ColumnWidth(20) + @ExcelProperty("参数名称") + private String name; + /** + * [检验标准]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验标准]id") + private BigDecimal standardId; + /** + * [计量单位]id + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]id") + private BigDecimal unitId; + /** + * 目标值 + */ + @ColumnWidth(20) + @ExcelProperty("目标值") + private BigDecimal targetValue; + /** + * 合格下限 + */ + @ColumnWidth(20) + @ExcelProperty("合格下限") + private BigDecimal okMin; + /** + * 合格上限 + */ + @ColumnWidth(20) + @ExcelProperty("合格上限") + private Long okMax; + /** + * 是否关键参数 + */ + @ColumnWidth(20) + @ExcelProperty("是否关键参数") + private Long isCritical; + /** + * [计量单位]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[计量单位]编码") + private String unitCode; + /** + * 检验方法描述 + */ + @ColumnWidth(20) + @ExcelProperty("检验方法描述") + private String methodDesc; + /** + * 检验设备描述 + */ + @ColumnWidth(20) + @ExcelProperty("检验设备描述") + private String equipmentDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 让步接收L1下限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L1下限") + private BigDecimal concessionL1Min; + /** + * 让步接收L1上限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L1上限") + private BigDecimal concessionL1Max; + /** + * 让步接收L2下限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L2下限") + private BigDecimal concessionL2Min; + /** + * 让步接收L2上限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L2上限") + private BigDecimal concessionL2Max; + /** + * 让步接收L3下限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L3下限") + private BigDecimal concessionL3Min; + /** + * 让步接收L3上限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L3上限") + private BigDecimal concessionL3Max; + /** + * 让步接收L4下限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L4下限") + private BigDecimal concessionL4Min; + /** + * 让步接收L4上限 + */ + @ColumnWidth(20) + @ExcelProperty("让步接收L4上限") + private BigDecimal concessionL4Max; + /** + * 判断表达式 + */ + @ColumnWidth(20) + @ExcelProperty("判断表达式") + private String expression; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceChainGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceChainGenExcel.java new file mode 100644 index 000000000..a0cdf06b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceChainGenExcel.java @@ -0,0 +1,119 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [追溯链条] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TraceChainGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * [追溯链条]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[追溯链条]类型") + private Long traceChainType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [工单]id + */ + @ColumnWidth(20) + @ExcelProperty("[工单]id") + private BigDecimal workOrderId; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * 追溯操作人[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("追溯操作人[用户]id") + private BigDecimal traceUserId; + /** + * 制品序列号 + */ + @ColumnWidth(20) + @ExcelProperty("制品序列号") + private Long productSn; + /** + * 工单编号 + */ + @ColumnWidth(20) + @ExcelProperty("工单编号") + private Long workOrderCode; + /** + * 工序编号 + */ + @ColumnWidth(20) + @ExcelProperty("工序编号") + private Long processCode; + /** + * 追溯时间 + */ + @ColumnWidth(20) + @ExcelProperty("追溯时间") + private LocalDateTime traceDate; + /** + * 追溯结果 + */ + @ColumnWidth(20) + @ExcelProperty("追溯结果") + private String traceResult; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceEventGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceEventGenExcel.java new file mode 100644 index 000000000..b1f6ed612 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceEventGenExcel.java @@ -0,0 +1,95 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [追溯事件] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TraceEventGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * [追溯事件]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[追溯事件]类型") + private Long eventType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [追溯链条]id + */ + @ColumnWidth(20) + @ExcelProperty("[追溯链条]id") + private BigDecimal traceChainId; + /** + * 操作[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("操作[用户]id") + private BigDecimal operateUserId; + /** + * 事件时间 + */ + @ColumnWidth(20) + @ExcelProperty("事件时间") + private LocalDateTime eventDate; + /** + * 关联序列号 + */ + @ColumnWidth(20) + @ExcelProperty("关联序列号") + private String relatedSn; + /** + * 事件描述 + */ + @ColumnWidth(20) + @ExcelProperty("事件描述") + private String eventDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceItemGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceItemGenExcel.java new file mode 100644 index 000000000..a688cefdc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/TraceItemGenExcel.java @@ -0,0 +1,112 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [追溯明细] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TraceItemGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long traceItemType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [追溯链条]id + */ + @ColumnWidth(20) + @ExcelProperty("[追溯链条]id") + private BigDecimal qaTraceChainId; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * 物料/半成品/成品序列号 + */ + @ColumnWidth(20) + @ExcelProperty("物料/半成品/成品序列号") + private Long itemSn; + /** + * 型号 + */ + @ColumnWidth(20) + @ExcelProperty("型号") + private Long itemModel; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private Long itemBatchCode; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private Long processCode; + /** + * 使用数量 + */ + @ColumnWidth(20) + @ExcelProperty("使用数量") + private Long usedQuantity; + /** + * 父项序列号 + */ + @ColumnWidth(20) + @ExcelProperty("父项序列号") + private Long parentItemSn; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/listener/LiquidTankListener.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/listener/LiquidTankListener.java new file mode 100644 index 000000000..4998caa4f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/listener/LiquidTankListener.java @@ -0,0 +1,41 @@ +package org.springblade.desk.quality.excel.listener; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.alibaba.excel.util.ListUtils; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.service.gen.ILiquidTankGenService; + +import java.util.List; + +public class LiquidTankListener implements ReadListener { + + private static final int BATCH_SIZE = 100; + + public LiquidTankListener(ILiquidTankGenService genService) { + this.genService = genService; + } + + private ILiquidTankGenService genService; + private List cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_SIZE); + + @Override + public void invoke(LiquidTank data, AnalysisContext context) { + cachedDataList.add(data); + if (cachedDataList.size() >= BATCH_SIZE) { + saveData(); + cachedDataList.clear(); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + if (!cachedDataList.isEmpty()) { + saveData(); + } + } + + private void saveData() { + genService.saveBatch(cachedDataList); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/package-info.java new file mode 100644 index 000000000..be869fc25 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.excel; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/exception/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/exception/package-info.java new file mode 100644 index 000000000..d41709461 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/exception/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.exception; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/InspectionTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/InspectionTaskClient.java new file mode 100644 index 000000000..0741320b0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/InspectionTaskClient.java @@ -0,0 +1,19 @@ +package org.springblade.desk.quality.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.quality.service.InspectionTaskService; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Hidden +public class InspectionTaskClient implements IInspectionTaskClient { + + @Resource + private InspectionTaskService service; + + @Override + public Boolean timeout(Long id) { + return service.timeout(id); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java new file mode 100644 index 000000000..413b75e99 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java @@ -0,0 +1,19 @@ +package org.springblade.desk.quality.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.quality.service.IotHardnessService; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Hidden +public class IotHardnessClient implements IIotHardnessClient { + + @Resource + private IotHardnessService service; + + @Override + public Integer deleteHistory() { + return service.deleteHistory(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotThicknessClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotThicknessClient.java new file mode 100644 index 000000000..23061bf90 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotThicknessClient.java @@ -0,0 +1,19 @@ +package org.springblade.desk.quality.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.quality.service.IotThicknessService; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Hidden +public class IotThicknessClient implements IIotThicknessClient { + + @Resource + private IotThicknessService service; + + @Override + public Integer deleteHistory() { + return service.deleteHistory(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java new file mode 100644 index 000000000..6ba880d20 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java @@ -0,0 +1,28 @@ +package org.springblade.desk.quality.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.service.LiquidTankTaskService; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@Hidden() +public class LiquidTankTaskClient implements ILquidTankTaskClient { + + @Resource + private LiquidTankTaskService service; + + @Override + public List generate() { + return service.generateAuto(); + } + + @Override + public List timeout() { + return service.timeout(); + } +} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java new file mode 100644 index 000000000..ea9fb4b6a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.List; + +/** + * [周期试验] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface CycleTestGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return List + */ + List selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml new file mode 100644 index 000000000..f5d9e66fb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java new file mode 100644 index 000000000..6810db8ad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.List; + +/** + * [周期试验项目] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface CycleTestItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return List + */ + List selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml new file mode 100644 index 000000000..2f14b4b22 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java new file mode 100644 index 000000000..c93f81622 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.List; + +/** + * [周期试验任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface CycleTestTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return List + */ + List selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml new file mode 100644 index 000000000..5ca370000 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.java new file mode 100644 index 000000000..13b3ccb74 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.InspectionItemGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.vo.gen.InspectionItemGenVO; + +import java.util.List; + +/** + * [检验项目] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface InspectionItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionItem 查询参数 + * @return List + */ + List selectInspectionItemPage(IPage page, InspectionItemGenVO inspectionItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.xml new file mode 100644 index 000000000..847e9ce71 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionItemGenMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.java new file mode 100644 index 000000000..e949fe005 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.InspectionResultGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.vo.gen.InspectionResultGenVO; + +import java.util.List; + +/** + * [检验结果] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface InspectionResultGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionResult 查询参数 + * @return List + */ + List selectInspectionResultPage(IPage page, InspectionResultGenVO inspectionResult); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionResult(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.xml new file mode 100644 index 000000000..84b0dc871 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionResultGenMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java new file mode 100644 index 000000000..d95a808ad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; + +import java.util.List; + +/** + * [检验任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface InspectionTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return List + */ + List selectInspectionTaskPage(IPage page, InspectionTaskGenVO inspectionTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml new file mode 100644 index 000000000..80f37c45e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java new file mode 100644 index 000000000..54fb8c2de --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.List; + +/** + * [IOT硬度] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IotHardnessGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotHardness 查询参数 + * @return List + */ + List selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotHardness(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml new file mode 100644 index 000000000..b9fd6a79b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java new file mode 100644 index 000000000..83319b7c4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.List; + +/** + * [IOT硬度] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IotThicknessGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotThickness 查询参数 + * @return List + */ + List selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotThickness(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml new file mode 100644 index 000000000..063718589 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.java new file mode 100644 index 000000000..27adc8cb2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankGenVO; +import org.springblade.desk.quality.excel.gen.LiquidTankGenExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [槽液] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +public interface LiquidTankGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param liquidTank 查询参数 + * @return List + */ + List selectLiquidTankPage(IPage page, LiquidTankGenVO liquidTank); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLiquidTank(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.xml new file mode 100644 index 000000000..797fb2eb9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankGenMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java new file mode 100644 index 000000000..f8559bbd3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.LiquidTankTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; + +import java.util.List; + +/** + * [槽液检测任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface LiquidTankTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param liquidTankTask 查询参数 + * @return List + */ + List selectLiquidTankTaskPage(IPage page, LiquidTankTaskGenVO liquidTankTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLiquidTankTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml new file mode 100644 index 000000000..a04aa4bb6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java new file mode 100644 index 000000000..72722d670 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.NgGenExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; + +import java.util.List; + +/** + * [缺陷] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface NgGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return List + */ + List selectNgPage(IPage page, NgGenVO ng); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml new file mode 100644 index 000000000..d73a1a043 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.java new file mode 100644 index 000000000..d6a30a34b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.StandardGenExcel; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.vo.gen.StandardGenVO; + +import java.util.List; + +/** + * [质量标准] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public interface StandardGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param standard 查询参数 + * @return List + */ + List selectStandardPage(IPage page, StandardGenVO standard); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStandard(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.xml new file mode 100644 index 000000000..80b0376df --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardGenMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.java new file mode 100644 index 000000000..0b13f01d0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.StandardParamGenExcel; +import org.springblade.desk.quality.pojo.entity.StandardParam; +import org.springblade.desk.quality.pojo.vo.gen.StandardParamGenVO; + +import java.util.List; + +/** + * [质量标准参数] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public interface StandardParamGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param standardParam 查询参数 + * @return List + */ + List selectStandardParamPage(IPage page, StandardParamGenVO standardParam); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStandardParam(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.xml new file mode 100644 index 000000000..73b2ad499 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/StandardParamGenMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java new file mode 100644 index 000000000..d42376423 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.List; + +/** + * [追溯链条] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceChainGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceChain 查询参数 + * @return List + */ + List selectTraceChainPage(IPage page, TraceChainGenVO traceChain); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceChain(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml new file mode 100644 index 000000000..db5551819 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java new file mode 100644 index 000000000..d3dc493d8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.List; + +/** + * [追溯事件] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceEventGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceEvent 查询参数 + * @return List + */ + List selectTraceEventPage(IPage page, TraceEventGenVO traceEvent); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceEvent(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml new file mode 100644 index 000000000..c670f04c6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java new file mode 100644 index 000000000..e17ccb85c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.List; + +/** + * [追溯明细] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceItem 查询参数 + * @return List + */ + List selectTraceItemPage(IPage page, TraceItemGenVO traceItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml new file mode 100644 index 000000000..07340f6cc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/package-info.java new file mode 100644 index 000000000..65925c2f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.mapper; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java new file mode 100644 index 000000000..96e8a59e1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java @@ -0,0 +1,53 @@ +/** + * 质量管理 + * + * 必要启动微服务 + * Auth + * Desk + * Log + * System + * Gateway + * + * + * + * ---- + * MATERIAL + * ATTACH_ID + * IS_CRITICAL + * EQUIPMENT + * SKILL + * + * CONCESSION + * EXPRESSION + * + * + * + * + * THICKNESS + * + * + * + * TRACEABILITY_CHAIN + * + * PRODUCT_SN + * PROCESS_CODE + * ITEM_MODEL + * + * + * USED_QUANTITY + * + * + * OPERATE_USER_ID + * RELATED_SERIAL_NO + * + * RELATED_SN + * + * + * WORKSTATION + * + * TEMPERATURE + * + * STANDARD + * + */ +package org.springblade.desk.quality; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java new file mode 100644 index 000000000..95ec8624b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTest; + +import java.io.Serial; + +/** + * [周期试验] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenDTO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java new file mode 100644 index 000000000..36a82cd87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; + +import java.io.Serial; + +/** + * [周期试验项目] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenDTO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java new file mode 100644 index 000000000..4fed527be --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; + +import java.io.Serial; + +/** + * [周期试验任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenDTO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionItemGenDTO.java new file mode 100644 index 000000000..826c51a58 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionItemGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionItem; + +import java.io.Serial; + +/** + * [检验项目] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionItemGenDTO extends InspectionItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionResultGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionResultGenDTO.java new file mode 100644 index 000000000..e95632d8f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionResultGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionResult; + +import java.io.Serial; + +/** + * [检验结果] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionResultGenDTO extends InspectionResult { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java new file mode 100644 index 000000000..d29e33fa5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskGenDTO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java new file mode 100644 index 000000000..f45f35c77 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotHardness; + +import java.io.Serial; + +/** + * [IOT硬度] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotHardnessGenDTO extends IotHardness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java new file mode 100644 index 000000000..213ed0d6f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotThickness; + +import java.io.Serial; + +/** + * [IOT硬度] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotThicknessGenDTO extends IotThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankGenDTO.java new file mode 100644 index 000000000..f31d62324 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankGenDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [槽液] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankGenDTO extends LiquidTank { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java new file mode 100644 index 000000000..14c28c42a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; + +import java.io.Serial; + +/** + * [槽液检测任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTaskGenDTO extends LiquidTankTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java new file mode 100644 index 000000000..c1f6a346a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgGenDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardGenDTO.java new file mode 100644 index 000000000..c70de2b3d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Standard; + +import java.io.Serial; + +/** + * [质量标准] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class StandardGenDTO extends Standard { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardParamGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardParamGenDTO.java new file mode 100644 index 000000000..02f47d789 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/StandardParamGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.StandardParam; + +import java.io.Serial; + +/** + * [质量标准参数] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class StandardParamGenDTO extends StandardParam { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java new file mode 100644 index 000000000..b4bf11585 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceChain; + +import java.io.Serial; + +/** + * [追溯链条] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceChainGenDTO extends TraceChain { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java new file mode 100644 index 000000000..60a5520d3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceEvent; + +import java.io.Serial; + +/** + * [追溯事件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceEventGenDTO extends TraceEvent { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java new file mode 100644 index 000000000..d0614143a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceItem; + +import java.io.Serial; + +/** + * [追溯明细] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceItemGenDTO extends TraceItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java new file mode 100644 index 000000000..c891b776a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java @@ -0,0 +1,4 @@ +/** + * QA DTO + */ +package org.springblade.desk.quality.pojo.dto; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java new file mode 100644 index 000000000..e39b02e47 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java @@ -0,0 +1,248 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [周期试验] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_CYCLE_TEST") +@Schema(description = "CycleTest Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTest extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [周期试验]类型 + */ + public static final String COL_CYCLE_TEST_TYPE = "CYCLE_TEST_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [班组]id + */ + public static final String COL_TEAM_ID = "TEAM_ID"; + /** + * [供应商]id + */ + public static final String COL_SUPPLIER_ID = "SUPPLIER_ID"; + /** + * [周期试验项目]id + */ + public static final String COL_CYCLE_TEST_ITEM_ID = "CYCLE_TEST_ITEM_ID"; + /** + * [试验件]id + */ + public static final String COL_TEST_ID = "TEST_ID"; + /** + * 工艺员[用户]id + */ + public static final String COL_PROCESS_ENGINEER_USER_ID = "PROCESS_ENGINEER_USER_ID"; + /** + * 试验技术员[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 镀种 + */ + public static final String COL_PLATE = "PLATE"; + /** + * 生成任务cron表达式 + */ + public static final String COL_CRON_GEN_TASK = "CRON_GEN_TASK"; + /** + * 提醒cron表达式 + */ + public static final String COL_CRON_REMIND = "CRON_REMIND"; + /** + * 计划开始cron表达式 + */ + public static final String COL_CRON_PLANNED_START = "CRON_PLANNED_START"; + /** + * 生成任务说明 + */ + public static final String COL_DESC_GEN_TASK = "DESC_GEN_TASK"; + /** + * 提醒说明 + */ + public static final String COL_DESC_REMIND = "DESC_REMIND"; + /** + * 计划开始说明 + */ + public static final String COL_DESC_PLANNED_START = "DESC_PLANNED_START"; + /** + * 提醒文本 + */ + public static final String COL_REMIND_TEXT = "REMIND_TEXT"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 上次试验日期 + */ + public static final String COL_LAST_TEST_DATE = "LAST_TEST_DATE"; + /** + * cron表达式配置OK + */ + public static final String COL_IS_CRON_OK = "IS_CRON_OK"; + /** + * 生成任务PowerJobId + */ + public static final String COL_POWER_JOB_ID_GEN_TASK = "POWER_JOB_ID_GEN_TASK"; + /** + * 提醒PowerJobId + */ + public static final String COL_POWER_JOB_ID_REMIND = "POWER_JOB_ID_REMIND"; + /** + * 开始PowerJobId + */ + public static final String COL_POWER_JOB_ID_PLANNED_START = "POWER_JOB_ID_PLANNED_START"; + + /** + * [周期试验]编码 + */ + @Schema(description = "[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @Schema(description = "[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamId; + /** + * [供应商]id + */ + @Schema(description = "[供应商]id") + private Long supplierId; + /** + * [周期试验项目]id + */ + @Schema(description = "[周期试验项目]id") + private Long cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private Long testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private Long processUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private Long testUserId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @Schema(description = "生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @Schema(description = "提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @Schema(description = "计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @Schema(description = "生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @Schema(description = "提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @Schema(description = "计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @Schema(description = "提醒文本") + private String remindText; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 上次试验日期 + */ + @Schema(description = "上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @Schema(description = "cron表达式配置OK") + private Long isCronOk; + /** + * 生成任务PowerJobId + */ + @Schema(description = "生成任务PowerJobId") + private Long powerJobIdGenTask; + /** + * 提醒PowerJobId + */ + @Schema(description = "提醒PowerJobId") + private Long powerJobIdRemind; + /** + * 开始PowerJobId + */ + @Schema(description = "开始PowerJobId") + private Long powerJobIdPlannedStart; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java new file mode 100644 index 000000000..cb63768a8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java @@ -0,0 +1,85 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [周期试验项目] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_CYCLE_TEST_ITEM") +@Schema(description = "CycleTestItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_CYCLE_TEST_ITEM_TYPE = "CYCLE_TEST_ITEM_TYPE"; + /** + * 周期试验项目名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 试验条件 + */ + public static final String COL_CONDITION = "CONDITION"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @Schema(description = "周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @Schema(description = "试验条件") + private String condition; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java new file mode 100644 index 000000000..a59f0f4ab --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java @@ -0,0 +1,211 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [周期试验任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_CYCLE_TEST_TASK") +@Schema(description = "CycleTestTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_CYCLE_TEST_TASK_TYPE = "CYCLE_TEST_TASK_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 配置[班组]id + */ + public static final String COL_CONFIG_TEAM_ID = "CONFIG_TEAM_ID"; + /** + * 配置[外协商]id + */ + public static final String COL_CONFIG_OEM_ID = "CONFIG_OEM_ID"; + /** + * [周期性试验项目]id + */ + public static final String COL_CYCLE_TEST_ITEM_ID = "CYCLE_TEST_ITEM_ID"; + /** + * [试验件]id + */ + public static final String COL_TEST_ID = "TEST_ID"; + /** + * 工艺员[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 试验技术员[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 下发[班组]id + */ + public static final String COL_SEND_TEAM_ID = "SEND_TEAM_ID"; + /** + * 下发[外协商]id + */ + public static final String COL_SEND_OME_ID = "SEND_OME_ID"; + /** + * 下发人员[用户]id + */ + public static final String COL_SNED_USER_ID = "SNED_USER_ID"; + /** + * 数量 + */ + public static final String COL_QUANTITY = "QUANTITY"; + /** + * 镀种 + */ + public static final String COL_PLATE = "PLATE"; + /** + * 零件号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_CODE = "BATCH_CODE"; + /** + * 专家描述 + */ + public static final String COL_EXPERT_DESC = "EXPERT_DESC"; + /** + * 评审描述 + */ + public static final String COL_REVIEW_DESC = "REVIEW_DESC"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [周期试验任务]编码 + */ + @Schema(description = "[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 配置[班组]id + */ + @Schema(description = "配置[班组]id") + private Long configTeamId; + /** + * 配置[外协商]id + */ + @Schema(description = "配置[外协商]id") + private Long configOemId; + /** + * [周期性试验项目]id + */ + @Schema(description = "[周期性试验项目]id") + private Long cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private Long testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private Long processUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private Long testUserId; + /** + * 下发[班组]id + */ + @Schema(description = "下发[班组]id") + private Long sendTeamId; + /** + * 下发[外协商]id + */ + @Schema(description = "下发[外协商]id") + private Long sendOmeId; + /** + * 下发人员[用户]id + */ + @Schema(description = "下发人员[用户]id") + private Long sendUserId; + /** + * 数量 + */ + @Schema(description = "数量") + private Long quantity; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 零件号 + */ + @Schema(description = "零件号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchCode; + /** + * 专家描述 + */ + @Schema(description = "专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @Schema(description = "评审描述") + private String reviewDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java new file mode 100644 index 000000000..fdefd3d9a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -0,0 +1,113 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [检验项目] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_INSPECTION_ITEM") +@Schema(description = "InspectionItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class InspectionItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + public static final String COL_PROCESS_ID = "PROCESS_ID"; + + /** + * 检验项目类型 + */ + @Schema(description = "检验项目类型") + private Long itemType; + /** + * 检验项目名称 + */ + @Schema(description = "检验项目名称") + private String name; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private BigDecimal unitId; + /** + * [检验标准]id + */ + @Schema(description = "[检验标准]id") + private Long standardId; + /** + * 目标值 + */ + @Schema(description = "目标值") + private Long targetValue; + /** + * 上限值 + */ + @Schema(description = "上限值") + private Long maxValue; + /** + * 下限值 + */ + @Schema(description = "下限值") + private Long minValue; + /** + * 标准值 + */ + @Schema(description = "标准值") + private Long standardValue; + /** + * 计量单位 + */ + @Schema(description = "计量单位") + private String unit; + /** + * 检验方法描述 + */ + @Schema(description = "检验方法描述") + private String methodDesc; + /** + * 是否关键 + */ + @Schema(description = "是否关键") + private Long isCrucial; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * [检验标准参数]id + */ + @Schema(description = "[检验标准参数]id") + private Long standardParamId; + /** + * [工序]代码 + */ + @Schema(description = "[工序]代码") + private String processCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java new file mode 100644 index 000000000..bf4f1cbe0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java @@ -0,0 +1,112 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [检验结果] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_INSPECTION_RESULT") +@Schema(description = "InspectionResult Entity对象") +@EqualsAndHashCode(callSuper = true) +public class InspectionResult extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long inspectionResultType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long inspectionTaskId; + /** + * [检验项目]id + */ + @Schema(description = "[检验项目]id") + private Long inspectionItemId; + /** + * [缺陷]id + */ + @Schema(description = "[缺陷]id") + private Long ngId; + /** + * 质检员[用户]id + */ + @Schema(description = "质检员[用户]id") + private Long testUserId; + /** + * 测量值 + */ + @Schema(description = "测量值") + private Long testValue; + /** + * 检测文本描述 + */ + @Schema(description = "检测文本描述") + private Long testDesc; + /** + * 检测结果 + */ + @Schema(description = "检测结果") + private Long result; + /** + * 是否缺陷 + */ + @Schema(description = "是否缺陷") + private Long isNg; + /** + * [缺陷]代码 + */ + @Schema(description = "[缺陷]代码") + private String ngCode; + /** + * [缺陷]描述 + */ + @Schema(description = "[缺陷]描述") + private String ngDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 检验时间 + */ + @Schema(description = "检验时间") + private LocalDateTime testDate; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java new file mode 100644 index 000000000..73d7e025c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -0,0 +1,136 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [检验任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_INSPECTION_TASK") +@Schema(description = "InspectionTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class InspectionTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [检验任务]编码 + */ + @Schema(description = "[检验任务]编码") + private String code; + /** + * [检验任务]类型 + */ + @Schema(description = "[检验任务]类型") + private Long inspectionTaskType; + /** + * [检验任务] + */ + @Schema(description = "[检验任务]") + private String name; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private Long workOrderId; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private Long productId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long processId; + /** + * 质检员[用户]id + */ + @Schema(description = "质检员[用户]id") + private Long testUserId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private Long productCode; + /** + * [制品]序列号 + */ + @Schema(description = "[制品]序列号") + private Long productSn; + /** + * 生产批次号 + */ + @Schema(description = "生产批次号") + private Long batchNumber; + /** + * [工单]编码 + */ + @Schema(description = "[工单]编码") + private String workOrderCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 计划开始时间 + */ + @Schema(description = "计划开始时间") + private LocalDateTime plannedStartDate; + /** + * 计划结束时间 + */ + @Schema(description = "计划结束时间") + private LocalDateTime plannedEndDate; + /** + * 实际开始时间 + */ + @Schema(description = "实际开始时间") + private LocalDateTime actualStartDate; + /** + * 实际结束时间 + */ + @Schema(description = "实际结束时间") + private LocalDateTime actualEndDate; + /** + * 检验样本数量 + */ + @Schema(description = "检验样本数量") + private Long simpleCount; + /** + * 缺陷数量 + */ + @Schema(description = "缺陷数量") + private Long ngCount; + /** + * 检验结果 + */ + @Schema(description = "检验结果") + private Long result; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java new file mode 100644 index 000000000..3580aaea8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java @@ -0,0 +1,124 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [IOT硬度] 实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@TableName("QA_IOT_HARDNESS") +@Schema(description = "IotHardness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class IotHardness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 使用标记位 + */ + public static final String COL_FLAG_USE = "FLAG_USE"; + /** + * 读取标记位 + */ + public static final String COL_FLAG_READ = "FLAG_READ"; + /** + * 设备号 + */ + public static final String COL_EQUIPMENT_CODE = "EQUIPMENT_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * 检测内容 + */ + public static final String COL_DATA = "DATA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 数据上传时间 + */ + public static final String COL_UPLOAD_DATE = "UPLOAD_DATE"; + /** + * [设备]id + */ + public static final String COL_EQUIPMENT_ID = "EQUIPMENT_ID"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 使用标记位 + */ + @Schema(description = "使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @Schema(description = "读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @Schema(description = "设备号") + private String equipmentCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 检测内容 + */ + @Schema(description = "检测内容") + private String data; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 数据上传时间 + */ + @Schema(description = "数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @Schema(description = "[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java new file mode 100644 index 000000000..4367c0298 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [IOT硬度] 实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@TableName("QA_IOT_THICKNESS") +@Schema(description = "IotThickness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class IotThickness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 使用标记位 + */ + public static final String COL_FLAG_USE = "FLAG_USE"; + /** + * 读取标记位 + */ + public static final String COL_FLAG_READ = "FLAG_READ"; + /** + * 设备号 + */ + public static final String COL_EQUIPMENT_CODE = "EQUIPMENT_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * 检测内容 + */ + public static final String COL_DATA = "DATA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 数据上传时间 + */ + public static final String COL_UPLOAD_DATE = "UPLOAD_DATE"; + /** + * [设备]id + */ + public static final String COL_EQUIPMENT_ID = "EQUIPMENT_ID"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 使用标记位 + */ + @Schema(description = "使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @Schema(description = "读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @Schema(description = "设备号") + private String equipmentCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 检测内容 + */ + @Schema(description = "检测内容") + private String data; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 数据上传时间 + */ + @Schema(description = "数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @Schema(description = "[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java new file mode 100644 index 000000000..c21477cb3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java @@ -0,0 +1,432 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [槽液] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("QA_LIQUID_TANK") +@Schema(description = "LiquidTank Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LiquidTank extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务前缀 + */ + public static final String COL_TASK_PREFIX = "TASK_PREFIX"; + /** + * [作业中心]id + */ + public static final String COL_WORK_CENTER_ID = "WORK_CENTER_ID"; + /** + * 槽液编码/槽号 + */ + public static final String COL_CODE = "CODE"; + /** + * 待测成分 + */ + public static final String COL_TEST_ELEMENT = "TEST_ELEMENT"; + /** + * 药品名称 + */ + public static final String COL_DRUG_NAME = "DRUG_NAME"; + /** + * 药品[物料]id + */ + public static final String COL_DRUG_MATERIAL_ID = "DRUG_MATERIAL_ID"; + /** + * 药品[物料]编码 + */ + public static final String COL_DRUG_MATERIAL_CODE = "DRUG_MATERIAL_CODE"; + /** + * 药品物料名称 + */ + public static final String COL_DRUG_MATERIAL_NAME = "DRUG_MATERIAL_NAME"; + /** + * 工艺含量 + */ + public static final String COL_PROCESS_CONTENT = "PROCESS_CONTENT"; + /** + * 目标值 + */ + public static final String COL_TARGET_VALUE = "TARGET_VALUE"; + /** + * 添加点 + */ + public static final String COL_FILLING_LOCATION = "FILLING_LOCATION"; + /** + * 体积 + */ + public static final String COL_VOLUME = "VOLUME"; + /** + * 测量值计量单位 + */ + public static final String COL_TEST_UNIT = "TEST_UNIT"; + /** + * 分析周期 + */ + public static final String COL_ANALYSIS_CYCLE = "ANALYSIS_CYCLE"; + /** + * 有效期 + */ + public static final String COL_VALID_DATE = "VALID_DATE"; + /** + * 上次化验日期 + */ + public static final String COL_LAST_TEST = "LAST_TEST"; + /** + * 槽液到期日期 + */ + public static final String COL_EXPIRY_DATE = "EXPIRY_DATE"; + /** + * 化验人[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 实测温度 + */ + public static final String COL_TEMPERATURE_ACTUAL = "TEMPERATURE_ACTUAL"; + /** + * 实测ph值 + */ + public static final String COL_PH_ACTUAL = "PH_ACTUAL"; + /** + * 目标上限 + */ + public static final String COL_TARGET_VALUE_MAX = "TARGET_VALUE_MAX"; + /** + * 目标下限 + */ + public static final String COL_TARGET_VALUE_MIN = "TARGET_VALUE_MIN"; + /** + * 药品批次号 + */ + public static final String COL_DRUG_BAT_NUM = "DRUG_BAT_NUM"; + /** + * 加药后化验值 + */ + public static final String COL_POST_TEST_VALUE = "POST_TEST_VALUE"; + /** + * 是否合格 + */ + public static final String COL_QUALIFIED = "QUALIFIED"; + /** + * 测量值[计量单位]id + */ + public static final String COL_TEST_UNIT_ID = "TEST_UNIT_ID"; + /** + * [作业槽]id + */ + public static final String COL_WORK_TANK_ID = "WORK_TANK_ID"; + /** + * 添加值[计量单位] + */ + public static final String COL_ADD_UNIT = "ADD_UNIT"; + /** + * 添加值[计量单位]id + */ + public static final String COL_ADD_UNIT_ID = "ADD_UNIT_ID"; + /** + * 加药量[计算公式]id + */ + public static final String COL_ADD_DRUG_FORMULA_ID = "ADD_DRUG_FORMULA_ID"; + /** + * 添加后理论值[计算公式]id + */ + public static final String COL_AFTER_THEORY_FORMULA_ID = "AFTER_THEORY_FORMULA_ID"; + /** + * 温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围; + */ + public static final String COL_TEMPERATURE_TYPE = "TEMPERATURE_TYPE"; + /** + * PH范围类型:[1]:无;[2]:PH值范围; + */ + public static final String COL_PH_TYPE = "PH_TYPE"; + /** + * PH范围LEFT + */ + public static final String COL_PH_RANGE_LEFT = "PH_RANGE_LEFT"; + /** + * PH范围RIGHT + */ + public static final String COL_PH_RANGE_RIGHT = "PH_RANGE_RIGHT"; + /** + * 生成周期类型:[1]:每周;[2]:每月;[3]:每年; + */ + public static final String COL_GEN_CYCLE_TYPE = "GEN_CYCLE_TYPE"; + /** + * 生成任务CRON表达式 + */ + public static final String COL_CRON_GEN_TASK = "CRON_GEN_TASK"; + /** + * 温度范围LEFT + */ + public static final String COL_TEMPERATURE_RANGE_LEFT = "TEMPERATURE_RANGE_LEFT"; + /** + * 温度范围RIGHT + */ + public static final String COL_TEMPERATURE_RANGE_RIGHT = "TEMPERATURE_RANGE_RIGHT"; + /** + * 室内温度 + */ + public static final String COL_TEMPERATURE_IN_ROOM = "TEMPERATURE_IN_ROOM"; + /** + * 环境温度 + */ + public static final String COL_TEMPERATURE_ENV = "TEMPERATURE_ENV"; + /** + * 班组 + */ + public static final String COL_TEAM_ID = "TEAM_ID"; + + /** + * 任务前缀 + */ + @Schema(description = "任务前缀") + private String taskPrefix; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + @NotNull + private Long workCenterId; + /** + * 槽液编码/槽号 + */ + @Schema(description = "槽液编码/槽号") + private String code; + /** + * 待测成分 + */ + @Schema(description = "待测成分") + @NotNull + private String testElement; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品[物料]id + */ + @Schema(description = "药品[物料]id") + private Long drugMaterialId; + /** + * 药品[物料]编码 + */ + @NotNull + @Schema(description = "药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @Schema(description = "药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @Schema(description = "工艺含量") + @NotNull + private String processContent; + /** + * 目标值 + */ + @Schema(description = "目标值") + @NotNull + private Long targetValue; + /** + * 添加点 + */ + @Schema(description = "添加点") + private Long fillingLocation; + /** + * 体积 + */ + @Schema(description = "体积") + private Long volume; + /** + * 测量值计量单位 + */ + @NotNull + @Schema(description = "测量值计量单位") + private String testUnit; + /** + * 分析周期 + */ + @Schema(description = "分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @Schema(description = "有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @Schema(description = "上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @Schema(description = "槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @Schema(description = "化验人[用户]id") + @NotNull + private Long testUserId; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + @NotNull + private Long processUserId; + /** + * 实测温度 + */ + @Schema(description = "实测温度") + private String temperatureActual; + /** + * 实测ph值 + */ + @Schema(description = "实测ph值") + private String phActual; + /** + * 目标上限 + */ + @Schema(description = "目标上限") + private String targetValueMax; + /** + * 目标下限 + */ + @Schema(description = "目标下限") + private String targetValueMin; + /** + * 药品批次号 + */ + @Schema(description = "药品批次号") + private String drugBatNum; + /** + * 加药后化验值 + */ + @Schema(description = "加药后化验值") + private String postTestValue; + /** + * 是否合格 + */ + @Schema(description = "是否合格") + private Long qualified; + /** + * 测量值[计量单位]id + */ + @Schema(description = "测量值[计量单位]id") + private Long testUnitId; + /** + * [作业槽]id + */ + @Schema(description = "[作业槽]id") + @NotNull + private Long workTankId; + /** + * 添加值[计量单位] + */ + @NotNull + @Schema(description = "添加值[计量单位]") + private String addUnit; + /** + * 添加值[计量单位]id + */ + @Schema(description = "添加值[计量单位]id") + private Long addUnitId; + /** + * 加药量[计算公式]id + */ + @Schema(description = "加药量[计算公式]id") + @NotNull + private Long addDrugFormulaId; + /** + * 添加后理论值[计算公式]id + */ + @Schema(description = "添加后理论值[计算公式]id") + @NotNull + private Long afterTheoryFormulaId; + /** + * 温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围; + */ + @Schema(description = "温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围;") + private Long temperatureType; + /** + * PH范围类型:[1]:无;[2]:PH值范围; + */ + @Schema(description = "PH范围类型:[1]:无;[2]:PH值范围;") + private Long phType; + /** + * PH范围LEFT + */ + @Schema(description = "PH范围LEFT") + private Long phRangeLeft; + /** + * PH范围RIGHT + */ + @Schema(description = "PH范围RIGHT") + private Long phRangeRight; + /** + * 生成周期类型:[1]:每周;[2]:每月;[3]:每年; + */ + @Schema(description = "生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON") + private Integer genCycleType; + /** + * 生成任务CRON表达式 + */ + @Schema(description = "生成任务CRON表达式") + private String cronGenTask; + /** + * 温度范围LEFT + */ + @Schema(description = "温度范围LEFT") + private Long temperatureRangeLeft; + /** + * 温度范围RIGHT + */ + @Schema(description = "温度范围RIGHT") + private Long temperatureRangeRight; + /** + * 室内温度 + */ + @Schema(description = "室内温度") + private Long temperatureInRoom; + /** + * 环境温度 + */ + @Schema(description = "环境温度") + private Long temperatureEnv; + /** + * 班组 + */ + @Schema(description = "班组") + @NotNull + private Long teamId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java new file mode 100644 index 000000000..2e92ae11f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -0,0 +1,428 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [槽液检测任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("QA_LIQUID_TANK_TASK") +@Schema(description = "LiquidTankTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [槽液检测任务]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_LIQUID_TANK_TASK_TYPE = "LIQUID_TANK_TASK_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [槽液]id + */ + public static final String COL_LIQUID_TANK_ID = "LIQUID_TANK_ID"; + /** + * [作业中心]id + */ + public static final String COL_WORK_CENTER_ID = "WORK_CENTER_ID"; + /** + * 药品[物料]id + */ + public static final String COL_DRUG_MATERIAL_ID = "DRUG_MATERIAL_ID"; + /** + * [槽液]编号 + */ + public static final String COL_LIQUID_TANK_CODE = "LIQUID_TANK_CODE"; + /** + * 待测成分 + */ + public static final String COL_TEST_ELEMENT = "TEST_ELEMENT"; + /** + * 药品名称 + */ + public static final String COL_DRUG_NAME = "DRUG_NAME"; + /** + * 药品[物料]编码 + */ + public static final String COL_DRUG_MATERIAL_CODE = "DRUG_MATERIAL_CODE"; + /** + * 药品物料名称 + */ + public static final String COL_DRUG_MATERIAL_NAME = "DRUG_MATERIAL_NAME"; + /** + * 工艺含量 + */ + public static final String COL_PROCESS_CONTENT = "PROCESS_CONTENT"; + /** + * 目标值 + */ + public static final String COL_TARGET_VALUE = "TARGET_VALUE"; + /** + * 目标上下限 + */ + public static final String COL_BOUND = "BOUND"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 添加点 + */ + public static final String COL_FILLING_LOCATION = "FILLING_LOCATION"; + /** + * 电导率测量值 + */ + public static final String COL_CONDUCTIVITY_TEST_VALUE = "CONDUCTIVITY_TEST_VALUE"; + /** + * 体积 + */ + public static final String COL_VOLUME = "VOLUME"; + /** + * 单位 + */ + public static final String COL_UNIT = "UNIT"; + /** + * [计量单位]id + */ + public static final String COL_UNIT_ID = "UNIT_ID"; + /** + * 加药量单位 + */ + public static final String COL_ADD_UNIT = "ADD_UNIT"; + /** + * 加药量[计量单位]id + */ + public static final String COL_ADD_UNIT_ID = "ADD_UNIT_ID"; + /** + * 分析周期 + */ + public static final String COL_ANALYSIS_CYCLE = "ANALYSIS_CYCLE"; + /** + * 有效期 + */ + public static final String COL_VALID_DATE = "VALID_DATE"; + /** + * 上次化验日期 + */ + public static final String COL_LAST_TEST = "LAST_TEST"; + /** + * 槽液到期日期 + */ + public static final String COL_EXPIRY_DATE = "EXPIRY_DATE"; + /** + * 化验人[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 测量值 + */ + public static final String COL_TEST_VALUE = "TEST_VALUE"; + /** + * 需添加量 + */ + public static final String COL_NEED_ADD_VALUE = "NEED_ADD_VALUE"; + /** + * 实际添加量 + */ + public static final String COL_ACTUAL_ADD_VALUE = "ACTUAL_ADD_VALUE"; + /** + * 加药后含量 + */ + public static final String COL_AFTER_ADD_VALUE = "AFTER_ADD_VALUE"; + /** + * [班组]id + */ + public static final String COL_TEAM_ID = "TEAM_ID"; + /** + * 参数录入时间 + */ + public static final String COL_ENTRY_DATE = "ENTRY_DATE"; + /** + * 确认时间 + */ + public static final String COL_CONFIRM_DATE = "CONFIRM_DATE"; + /** + * 送出[用户]id + */ + public static final String COL_SEND_USER_ID = "SEND_USER_ID"; + /** + * 送出时间 + */ + public static final String COL_SEND_DATE = "SEND_DATE"; + /** + * 接收[用户]id + */ + public static final String COL_RECEIVE_USER_ID = "RECEIVE_USER_ID"; + /** + * 接收时间 + */ + public static final String COL_RECEIVE_DATE = "RECEIVE_DATE"; + /** + * 处理[用户]id + */ + public static final String COL_HANDLE_USER_ID = "HANDLE_USER_ID"; + /** + * 处理时间 + */ + public static final String COL_HANDLE_DATE = "HANDLE_DATE"; + /** + * 来源类型:[1]:手动;[2]:周期自动生成;[3]:计算自动生成; + */ + public static final String COL_FROM_TYPE = "FROM_TYPE"; + /** + * 结束原因 + */ + public static final String COL_FINISH_REASON = "FINISH_REASON"; + + /** + * [槽液检测任务]编码 + */ + @Schema(description = "[槽液检测任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long liquidTankTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [槽液]id + */ + @Schema(description = "[槽液]id") + private Long liquidTankId; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long workCenterId; + /** + * 药品[物料]id + */ + @Schema(description = "药品[物料]id") + private Long drugMaterialId; + /** + * [槽液]编号 + */ + @Schema(description = "[槽液]编号") + private String liquidTankCode; + /** + * 待测成分 + */ + @Schema(description = "待测成分") + private String testElement; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品[物料]编码 + */ + @Schema(description = "药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @Schema(description = "药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @Schema(description = "工艺含量") + private String processContent; + /** + * 目标值 + */ + @Schema(description = "目标值") + private Long targetValue; + /** + * 目标上下限 + */ + @Schema(description = "目标上下限") + private String bound; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 添加点 + */ + @Schema(description = "添加点") + private Long fillingLocation; + /** + * 电导率测量值 + */ + @Schema(description = "电导率测量值") + private Long conductivityTestValue; + /** + * 体积 + */ + @Schema(description = "体积") + private Long volume; + /** + * 单位 + */ + @Schema(description = "单位") + private Long unit; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private Long unitId; + /** + * 加药量单位 + */ + @Schema(description = "加药量单位") + private String addUnit; + /** + * 加药量[计量单位]id + */ + @Schema(description = "加药量[计量单位]id") + private Long addUnitId; + /** + * 分析周期 + */ + @Schema(description = "分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @Schema(description = "有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @Schema(description = "上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @Schema(description = "槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @Schema(description = "化验人[用户]id") + private Long testUserId; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private Long processUserId; + /** + * 测量值 + */ + @Schema(description = "测量值") + private Long testValue; + /** + * 需添加量 + */ + @Schema(description = "需添加量") + private Long needAddValue; + /** + * 实际添加量 + */ + @Schema(description = "实际添加量") + private Long actualAddValue; + /** + * 加药后含量 + */ + @Schema(description = "加药后含量") + private Long afterAddValue; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamId; + /** + * 参数录入时间 + */ + @Schema(description = "参数录入时间") + private LocalDateTime entryDate; + /** + * 确认时间 + */ + @Schema(description = "确认时间") + private LocalDateTime confirmDate; + /** + * 送出[用户]id + */ + @Schema(description = "送出[用户]id") + private Long sendUserId; + /** + * 送出时间 + */ + @Schema(description = "送出时间") + private LocalDateTime sendDate; + /** + * 接收[用户]id + */ + @Schema(description = "接收[用户]id") + private Long receiveUserId; + /** + * 接收时间 + */ + @Schema(description = "接收时间") + private LocalDateTime receiveDate; + /** + * 处理[用户]id + */ + @Schema(description = "处理[用户]id") + private Long handleUserId; + /** + * 处理时间 + */ + @Schema(description = "处理时间") + private LocalDateTime handleDate; + /** + * 来源类型:[1]:手动;[2]:周期自动生成;[3]:计算自动生成; + */ + @Schema(description = "来源类型:[1]:手动;[2]:周期自动生成;[3]:计算自动生成;") + private Integer fromType; + /** + * 结束原因 + */ + @Schema(description = "结束原因") + private String finishReason; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 000000000..a20ec53e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,86 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [缺陷] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型1:故障特征 2:故障类别 3:问题大类 4:问题小类 + */ + @Schema(description = "类型1:故障特征 2:故障类别 3:问题大类 4:问题小类") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private Long parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private Long productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java new file mode 100644 index 000000000..d151e57f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java @@ -0,0 +1,107 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [质量标准] 实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@TableName("QA_STANDARD") +@Schema(description = "Standard Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Standard extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检验标准类型 + */ + @Schema(description = "检验标准类型") + private Long standardType; + /** + * 检验标准名称 + */ + @Schema(description = "检验标准名称") + private String name; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [物料]id + */ + @Schema(description = "[物料]id") + private BigDecimal materialId; + /** + * [附件]id + */ + @Schema(description = "[附件]id") + private BigDecimal attachId; + /** + * 检验标准版本 + */ + @Schema(description = "检验标准版本") + private Long ver; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + /** + * [物料]编码 + */ + @Schema(description = "[物料]编码") + private String materialCode; + /** + * 生效日期 + */ + @Schema(description = "生效日期") + private LocalDateTime effectiveDate; + /** + * 失效日期 + */ + @Schema(description = "失效日期") + private LocalDateTime expiryDate; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 检验标准编码 + */ + @Schema(description = "检验标准编码") + private String code; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java new file mode 100644 index 000000000..005f70b1c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java @@ -0,0 +1,146 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [质量标准参数] 实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@TableName("QA_STANDARD_PARAM") +@Schema(description = "StandardParam Entity对象") +@EqualsAndHashCode(callSuper = true) +public class StandardParam extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 质量标准参数类型 + */ + @Schema(description = "质量标准参数类型") + private Long standardParamType; + /** + * 参数名称 + */ + @Schema(description = "参数名称") + private String name; + /** + * [检验标准]id + */ + @Schema(description = "[检验标准]id") + private BigDecimal standardId; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private BigDecimal unitId; + /** + * 目标值 + */ + @Schema(description = "目标值") + private BigDecimal targetValue; + /** + * 合格下限 + */ + @Schema(description = "合格下限") + private BigDecimal okMin; + /** + * 合格上限 + */ + @Schema(description = "合格上限") + private Long okMax; + /** + * 是否关键参数 + */ + @Schema(description = "是否关键参数") + private Long isCritical; + /** + * [计量单位]编码 + */ + @Schema(description = "[计量单位]编码") + private String unitCode; + /** + * 检验方法描述 + */ + @Schema(description = "检验方法描述") + private String methodDesc; + /** + * 检验设备描述 + */ + @Schema(description = "检验设备描述") + private String equipmentDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 让步接收L1下限 + */ + @Schema(description = "让步接收L1下限") + private BigDecimal concessionL1Min; + /** + * 让步接收L1上限 + */ + @Schema(description = "让步接收L1上限") + private BigDecimal concessionL1Max; + /** + * 让步接收L2下限 + */ + @Schema(description = "让步接收L2下限") + private BigDecimal concessionL2Min; + /** + * 让步接收L2上限 + */ + @Schema(description = "让步接收L2上限") + private BigDecimal concessionL2Max; + /** + * 让步接收L3下限 + */ + @Schema(description = "让步接收L3下限") + private BigDecimal concessionL3Min; + /** + * 让步接收L3上限 + */ + @Schema(description = "让步接收L3上限") + private BigDecimal concessionL3Max; + /** + * 让步接收L4下限 + */ + @Schema(description = "让步接收L4下限") + private BigDecimal concessionL4Min; + /** + * 让步接收L4上限 + */ + @Schema(description = "让步接收L4上限") + private BigDecimal concessionL4Max; + /** + * 判断表达式 + */ + @Schema(description = "判断表达式") + private String expression; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java new file mode 100644 index 000000000..a53a53234 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java @@ -0,0 +1,159 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [追溯链条] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_CHAIN") +@Schema(description = "TraceChain Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceChain extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [追溯链条]类型 + */ + public static final String COL_TRACE_CHAIN_TYPE = "TRACE_CHAIN_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [工单]id + */ + public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * 追溯操作人[用户]id + */ + public static final String COL_TRACE_USER_ID = "TRACE_USER_ID"; + /** + * 制品序列号 + */ + public static final String COL_PRODUCT_SN = "PRODUCT_SN"; + /** + * 工单编号 + */ + public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE"; + /** + * 工序编号 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + /** + * 追溯时间 + */ + public static final String COL_TRACE_DATE = "TRACE_DATE"; + /** + * 追溯结果 + */ + public static final String COL_TRACE_RESULT = "TRACE_RESULT"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * [追溯链条]类型 + */ + @Schema(description = "[追溯链条]类型") + private Long traceChainType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private BigDecimal workOrderId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * 追溯操作人[用户]id + */ + @Schema(description = "追溯操作人[用户]id") + private BigDecimal traceUserId; + /** + * 制品序列号 + */ + @Schema(description = "制品序列号") + private Long productSn; + /** + * 工单编号 + */ + @Schema(description = "工单编号") + private Long workOrderCode; + /** + * 工序编号 + */ + @Schema(description = "工序编号") + private Long processCode; + /** + * 追溯时间 + */ + @Schema(description = "追溯时间") + private LocalDateTime traceDate; + /** + * 追溯结果 + */ + @Schema(description = "追溯结果") + private String traceResult; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java new file mode 100644 index 000000000..87ca83f60 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [追溯事件] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_EVENT") +@Schema(description = "TraceEvent Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceEvent extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [追溯事件]类型 + */ + public static final String COL_EVENT_TYPE = "EVENT_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [追溯链条]id + */ + public static final String COL_TRACE_CHAIN_ID = "TRACE_CHAIN_ID"; + /** + * 操作[用户]id + */ + public static final String COL_OPERATE_USER_ID = "OPERATE_USER_ID"; + /** + * 事件时间 + */ + public static final String COL_EVENT_DATE = "EVENT_DATE"; + /** + * 关联序列号 + */ + public static final String COL_RELATED_SN = "RELATED_SN"; + /** + * 事件描述 + */ + public static final String COL_EVENT_DESC = "EVENT_DESC"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * [追溯事件]类型 + */ + @Schema(description = "[追溯事件]类型") + private Long eventType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [追溯链条]id + */ + @Schema(description = "[追溯链条]id") + private BigDecimal traceChainId; + /** + * 操作[用户]id + */ + @Schema(description = "操作[用户]id") + private BigDecimal operateUserId; + /** + * 事件时间 + */ + @Schema(description = "事件时间") + private LocalDateTime eventDate; + /** + * 关联序列号 + */ + @Schema(description = "关联序列号") + private String relatedSn; + /** + * 事件描述 + */ + @Schema(description = "事件描述") + private String eventDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java new file mode 100644 index 000000000..1fa7eb14c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java @@ -0,0 +1,149 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [追溯明细] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_ITEM") +@Schema(description = "TraceItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_TRACE_ITEM_TYPE = "TRACE_ITEM_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [追溯链条]id + */ + public static final String COL_QA_TRACE_CHAIN_ID = "QA_TRACE_CHAIN_ID"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * 物料/半成品/成品序列号 + */ + public static final String COL_ITEM_SN = "ITEM_SN"; + /** + * 型号 + */ + public static final String COL_ITEM_MODEL = "ITEM_MODEL"; + /** + * 批次号 + */ + public static final String COL_ITEM_BATCH_CODE = "ITEM_BATCH_CODE"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + /** + * 使用数量 + */ + public static final String COL_USED_QUANTITY = "USED_QUANTITY"; + /** + * 父项序列号 + */ + public static final String COL_PARENT_ITEM_SN = "PARENT_ITEM_SN"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long traceItemType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [追溯链条]id + */ + @Schema(description = "[追溯链条]id") + private BigDecimal qaTraceChainId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * 物料/半成品/成品序列号 + */ + @Schema(description = "物料/半成品/成品序列号") + private Long itemSn; + /** + * 型号 + */ + @Schema(description = "型号") + private Long itemModel; + /** + * 批次号 + */ + @Schema(description = "批次号") + private Long itemBatchCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private Long processCode; + /** + * 使用数量 + */ + @Schema(description = "使用数量") + private Long usedQuantity; + /** + * 父项序列号 + */ + @Schema(description = "父项序列号") + private Long parentItemSn; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java new file mode 100644 index 000000000..1ee94ff63 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java @@ -0,0 +1,42 @@ +/** + * 质量管理 Entity + * 和一期系统对应关系。 + * v1 + * 故障类别 BsReviewSheetType + * + * 试验周期 QcTextCycle + * 试验项目 BsTextProject + * 测厚数据 QcThicknessIot + * + * + * + * + * PLANNED_START_DATE + * CONDITION + * + * + * SUPPLIER + * PLATE + * PROCESS_ENGINEER + * + * IOT_HARDNESS + * + * EQUIPMENT + * + * SIMPLE_SIZE + * + * RESULT + * + * + * + * FORMULA + * + * EXPRESSION + * + * SPECIAL + * SHIFT + * + * + * PRIORITY + */ +package org.springblade.desk.quality.pojo.entity; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java new file mode 100644 index 000000000..8fe093322 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class CycleTestTaskAccept { + + /** + * [周期试验任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java new file mode 100644 index 000000000..ff69f3bdf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class CycleTestTaskFillData { + + /** + * [周期试验任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java new file mode 100644 index 000000000..76a500df8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class CycleTestTaskIssue { + + /** + * [周期试验任务]id + */ + String ids; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java new file mode 100644 index 000000000..b71d91ceb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class CycleTestTaskIssueBat { + + /** + * [周期试验任务]id + */ + Long id; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java new file mode 100644 index 000000000..b52339715 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java @@ -0,0 +1,11 @@ +package org.springblade.desk.quality.pojo.request; + +public class CycleTestUpdateUserBat { + + /** + * + */ + String ids; + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java new file mode 100644 index 000000000..5e43bee65 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.pojo.request; + +import org.springblade.desk.quality.pojo.entity.InspectionResult; + +import java.util.List; + +public class InspectionTaskEditResult { + + /** + * + */ + String id; + + List resultList; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java new file mode 100644 index 000000000..333c4a1b2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskSearch extends InspectionTask { + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java new file mode 100644 index 000000000..9b97efef8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java @@ -0,0 +1,28 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class InspectionTaskStartNew { + + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private BigDecimal workOrderId; + + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java new file mode 100644 index 000000000..8d84bfd0c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.request; + +import org.springblade.desk.quality.pojo.entity.InspectionResult; + +import java.util.List; + +public class InspectionTaskSubmit { + + /** + * + */ + String id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java new file mode 100644 index 000000000..7b720a88c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java @@ -0,0 +1,35 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTank; + +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankSubmit extends LiquidTank { + + /** + * 周一,周二-传入"1,2" + * 周一,周五,周六-传入"1,5,6" + * 可变长度 + */ + private String genCycleType1Value; + + /** + * 每月1日-传入"01" + * 每月21日-传入"21" + * 长度:2 + */ + private String genCycleType2Value; + + /** + * 每年1月1日-传入"0101" + * 每年12月21日-传入"1221" + */ + private String genCycleType3Value; + + /** + * 自定义CRON表达式 + */ + private String genCycleType4Value; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java new file mode 100644 index 000000000..d552f3eb4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskAccept { + + /** + * [槽液检测任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java new file mode 100644 index 000000000..132cafe69 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java @@ -0,0 +1,20 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskApproval { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 审批 true:同意 false:驳回 + */ + Boolean flagApproval; + /** + * 审批意见 + */ + String remarkApproval; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java new file mode 100644 index 000000000..70e9b1121 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskClose { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 结束原因 + */ + String finishReason; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java new file mode 100644 index 000000000..7c3b552c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskCloseBat { + + /** + * [槽液检测任务]ids + */ + String ids; + /** + * 结束原因 + */ + String finishReason; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java new file mode 100644 index 000000000..f83b28d3c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskEditDrug { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 申请编辑的加药量 + */ + Long needAddValue; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java new file mode 100644 index 000000000..ef8ed21b5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java @@ -0,0 +1,9 @@ +package org.springblade.desk.quality.pojo.request; + +public class LiquidTankTaskException { + + /** + * [槽液检测任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java new file mode 100644 index 000000000..2f6e91cd3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java @@ -0,0 +1,20 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskFillData { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 测量值 + */ + Long testValue; + /** + * 1:首测 2:复测 + */ + Integer fillDataType; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java new file mode 100644 index 000000000..3279538d4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java @@ -0,0 +1,20 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskFillDataBat { + + /** + * [槽液检测任务]ids + */ + String ids; + /** + * 测量值 + */ + Long testValue; + /** + * 1:首测 2:复测 + */ + Integer fillDataType; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java new file mode 100644 index 000000000..1727737f4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java @@ -0,0 +1,27 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.Date; + +@Data +public class LiquidTankTaskGenManual { + + /** + * [槽液]id + */ + Long liquidTankId; + /** + * 检测员id + */ + Long testUserId; + /** + * 工艺员 + */ + Long processUserId; + /** + * 检测日期 + */ + Date testDate; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java new file mode 100644 index 000000000..3d801b762 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskIssue { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java new file mode 100644 index 000000000..e31c439dd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskIssueBat { + + /** + * [槽液检测任务]id + */ + String ids; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java new file mode 100644 index 000000000..9a782ce30 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskReceiveDrug { + + /** + * [槽液检测任务]id + */ + Long id; + /** + * 接收班组 + */ + Long teamId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java new file mode 100644 index 000000000..0bb27160c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskSendDrug { + + /** + * [槽液检测任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java new file mode 100644 index 000000000..97c077547 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskSubmit { + + /** + * [槽液检测任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java new file mode 100644 index 000000000..85888f350 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankUpdateBat { + + String ids; + + Long processUserId; + + Long teamId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java new file mode 100644 index 000000000..5a818ca16 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java @@ -0,0 +1,32 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class NgSearch { + + /** + * 类型1:故障特征 2:故障类别 3:问题大类 4:问题小类 + */ + @Schema(description = "类型1:故障特征 2:故障类别 3:问题大类 4:问题小类") + private Long ngType; + + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private Long parentId; + + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private Long productId; + + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long processId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java new file mode 100644 index 000000000..ab6f802eb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTest; + +import java.io.Serial; + +/** + * [周期试验] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenVO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java new file mode 100644 index 000000000..2f0996f33 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; + +import java.io.Serial; + +/** + * [周期试验项目] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenVO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java new file mode 100644 index 000000000..8ea6faf14 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; + +import java.io.Serial; + +/** + * [周期试验任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenVO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionItemGenVO.java new file mode 100644 index 000000000..b8b6adfb9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionItemGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionItem; + +import java.io.Serial; + +/** + * [检验项目] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionItemGenVO extends InspectionItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionResultGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionResultGenVO.java new file mode 100644 index 000000000..37054b88a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionResultGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionResult; + +import java.io.Serial; + +/** + * [检验结果] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionResultGenVO extends InspectionResult { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java new file mode 100644 index 000000000..f7d24d378 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskGenVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java new file mode 100644 index 000000000..be3cc64b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotHardness; + +import java.io.Serial; + +/** + * [IOT硬度] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotHardnessGenVO extends IotHardness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java new file mode 100644 index 000000000..483418884 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotThickness; + +import java.io.Serial; + +/** + * [IOT硬度] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotThicknessGenVO extends IotThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankGenVO.java new file mode 100644 index 000000000..d94e6a805 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankGenVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [槽液] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankGenVO extends LiquidTank { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java new file mode 100644 index 000000000..ced87c085 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; + +import java.io.Serial; + +/** + * [槽液检测任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTaskGenVO extends LiquidTankTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java new file mode 100644 index 000000000..de718c6ad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgGenVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardGenVO.java new file mode 100644 index 000000000..b36cf51f7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Standard; + +import java.io.Serial; + +/** + * [质量标准] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class StandardGenVO extends Standard { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardParamGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardParamGenVO.java new file mode 100644 index 000000000..3701db23c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/StandardParamGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.StandardParam; + +import java.io.Serial; + +/** + * [质量标准参数] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class StandardParamGenVO extends StandardParam { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java new file mode 100644 index 000000000..906d88ad5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceChain; + +import java.io.Serial; + +/** + * [追溯链条] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceChainGenVO extends TraceChain { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java new file mode 100644 index 000000000..336c09251 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceEvent; + +import java.io.Serial; + +/** + * [追溯事件] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceEventGenVO extends TraceEvent { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java new file mode 100644 index 000000000..2b49e0e87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceItem; + +import java.io.Serial; + +/** + * [追溯明细] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceItemGenVO extends TraceItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java new file mode 100644 index 000000000..33ff772bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java @@ -0,0 +1 @@ +package org.springblade.desk.quality.pojo.vo; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java new file mode 100644 index 000000000..716908ccc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java @@ -0,0 +1,21 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class CycleTestService { + + @Resource + private CycleTestGenMapper genMapper; + + public R updateUserBat() { + return null; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService.java new file mode 100644 index 000000000..7cdd8ef0b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService.java @@ -0,0 +1,99 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springblade.desk.quality.mapper.gen.CycleTestTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.job.feign.IJobExtClient; +import org.springblade.job.pojo.entity.JobInfo; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class CycleTestTaskService { + + @Resource + private CycleTestTaskGenMapper genMapper; + @Resource + private CycleTestGenMapper cycleTestGenMapper; + + /** + * 定时任务 生成任务 + * + * @param cycleTestId + * @return + */ + public Boolean generate(Long cycleTestId) { + CycleTest ct = cycleTestGenMapper.selectById(cycleTestId); + CycleTestTask task = new CycleTestTask(); + task.setCycleTestItemId(ct.getCycleTestItemId()); + // + + // 插入生成数据。 + genMapper.insert(task); + return true; + } + + /** + * 定时任务 临期提醒 + * + * @param id + * @return + */ + public Boolean plannedStartWarn(final Long id) { + return true; + } + + /** + * 定时任务 超时提醒 + * + * @param id + * @return + */ + public Boolean timeout(final Long id) { + return true; + } + + /** + * 下发任务 + * + * @param id 下发的任务 + * @param userId 指定检测员 + * @return + */ + public R issue(final Long id, final Long userId) { + return R.success(); + } + + /** + * 接收任务 + * + * @param id + * @return + */ + public R accept(final Long id) { + // 获取当前接收用户 + + return R.success(); + } + + public R fill(final Long id, String data) { + return R.success(); + } + + @Resource + private IJobExtClient jobExtClient; + + public void test() { + Long jobInfoId = 1988536028834586626L; + JobInfo info = jobExtClient.getJobInfoById(jobInfoId); + log.info("info = {}", info); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java new file mode 100644 index 000000000..403435b94 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java @@ -0,0 +1,131 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.constant.ColValue; +import org.springblade.desk.quality.mapper.gen.InspectionItemGenMapper; +import org.springblade.desk.quality.mapper.gen.InspectionResultGenMapper; +import org.springblade.desk.quality.mapper.gen.InspectionTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskEditResult; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; +import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; +import org.springblade.desk.quality.pojo.request.InspectionTaskSubmit; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class InspectionTaskService { + + @Resource + private InspectionTaskGenMapper genMapper; + @Resource + private InspectionItemGenMapper itemGenMapper; + @Resource + private InspectionResultGenMapper resultGenMapper; + + /** + * 超期提醒。 + * + * @param id + * @return + */ + public Boolean timeout(Long id) { + InspectionTask find = genMapper.selectById(id); + // todo: + if (null == find) { + return false; + } + return true; + } + + /** + * + * @param start + * @return + */ + public R startNew(InspectionTaskStartNew start) { + // todo:check工单有效性 + + // todo:check工序有效性 + + // todo:check制品有效性 + InspectionTask taskNew = new InspectionTask(); + genMapper.insert(taskNew); + // 查询工艺用到的，所有启用的检验项目。 + List itemList = itemGenMapper.selectList( + new QueryWrapper() + .eq(ColBase.STATUS, ColValue.STATE_ENABLE) + .eq("PROCESS_ID", start.getProcessId()) + .orderByAsc(ColBase.ID) + ); + if (itemList.isEmpty()) { + return R.fail("没有关联的检测项目!"); + } + // 创建关联的检验结果集合。 + for (InspectionItem item : itemList) { + InspectionResult result = new InspectionResult(); + result.setInspectionTaskId(taskNew.getId()); + result.setInspectionItemId(item.getId()); + resultGenMapper.insert(result); + } + // 最终返回R + R rFinal = R.success("成功生成检测任务！"); + rFinal.setData(taskNew); + return rFinal; + } + + public R> searchListPage(InspectionTaskSearch search) { + List list = genMapper.selectList( + new QueryWrapper() + .like("CODE", search.getCode()) + .eq("INSPECTION_TASK_TYPE", search.getInspectionTaskType()) + .orderByDesc(ColBase.ID) + ); + R> rFinal = R.success(""); + rFinal.setData(list); + return rFinal; + } + + /** + * 编辑检验任务结果。 + * + * @param editResult + * @return + */ + public R editResult(InspectionTaskEditResult editResult) { + + return null; + } + + /** + * 提交检验任务。 + * + * @param submit + * @return + */ + public R submit(InspectionTaskSubmit submit) { + + return null; + } + + /** + * + * + * @param search + * @return + */ + public R> search(InspectionTaskSearch search) { + + return null; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java new file mode 100644 index 000000000..51ae670a7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java @@ -0,0 +1,62 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@Data +@Slf4j +public class IotHardnessService { + + public static final Integer BATCH_SIZE = 1000; + + @Resource + private IotHardnessGenMapper genMapper; + @Resource + private IotHardnessSubService deleteService; + + /** + * 物理删除历史数据 + * + * @return + */ + public Integer deleteHistory() { + LocalDateTime day7ago = LocalDateTime.now().minusDays(7); + QueryWrapper qw = new QueryWrapper<>(); + qw.lt(ColBase.CREATE_TIME, day7ago); + qw.select(ColBase.ID); + List list = genMapper.selectList(qw); + if (list.isEmpty()) { + log.info("没有超过七天的删除数据。"); + return 0; + } + int totalDeleted = 0; + int currentPage = 1; + while (true) { + IPage page = new Page<>(currentPage, BATCH_SIZE); + IPage resultPage = genMapper.selectPage(page, qw); + List currentBatch = resultPage.getRecords(); + if (currentBatch.isEmpty()) { + break; + } + List ids = list.stream() + .map(IotHardness::getId) + .toList(); + int deletedCount = deleteService.deleteHistoryOneBatch(ids); + totalDeleted = totalDeleted + deletedCount; + currentPage = currentPage + 1; + } + return totalDeleted; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService.java new file mode 100644 index 000000000..2c591cd94 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService.java @@ -0,0 +1,29 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Data +@Slf4j +public class IotHardnessSubService { + @Resource + private IotHardnessGenMapper genMapper; + + /** + * 分批独立事务。 + * + * @param ids + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer deleteHistoryOneBatch(List ids) { + return genMapper.deleteByIds(ids); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java new file mode 100644 index 000000000..fae9f56a4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java @@ -0,0 +1,62 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@Data +@Slf4j +public class IotThicknessService { + + public static final Integer BATCH_SIZE = 1000; + + @Resource + private IotThicknessGenMapper genMapper; + @Resource + private IotThicknessSubService deleteService; + + /** + * 物理删除历史数据 + * + * @return + */ + public Integer deleteHistory() { + LocalDateTime day7ago = LocalDateTime.now().minusDays(7); + QueryWrapper qw = new QueryWrapper<>(); + qw.lt(ColBase.CREATE_TIME, day7ago); + qw.select(ColBase.ID); + List list = genMapper.selectList(qw); + if (list.isEmpty()) { + log.info("没有超过七天的删除数据。"); + return 0; + } + int totalDeleted = 0; + int currentPage = 1; + while (true) { + IPage page = new Page<>(currentPage, BATCH_SIZE); + IPage resultPage = genMapper.selectPage(page, qw); + List currentBatch = resultPage.getRecords(); + if (currentBatch.isEmpty()) { + break; + } + List ids = list.stream() + .map(IotThickness::getId) + .toList(); + int deletedCount = deleteService.deleteHistoryOneBatch(ids); + totalDeleted = totalDeleted + deletedCount; + currentPage = currentPage + 1; + } + return totalDeleted; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessSubService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessSubService.java new file mode 100644 index 000000000..ecf7b6dc5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessSubService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Data +@Slf4j +public class IotThicknessSubService { + + @Resource + private IotThicknessGenMapper genMapper; + + /** + * 分批独立事务。 + * + * @param ids + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer deleteHistoryOneBatch(List ids) { + return genMapper.deleteByIds(ids); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java new file mode 100644 index 000000000..cae64c513 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.service; + +/** + * 槽液报告 + */ +public class LiquidTankReportService { + + /** + * 生成报告 + */ + public void generateReport() { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java new file mode 100644 index 000000000..f83057a4f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java @@ -0,0 +1,140 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.LiquidTankConst; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.request.LiquidTankSubmit; +import org.springblade.desk.quality.pojo.request.LiquidTankUpdateBat; +import org.springblade.desk.quality.service.gen.ILiquidTankGenService; +import org.springblade.desk.quality.util.PowerJobUtil; +import org.springframework.stereotype.Service; + +import java.util.Objects; + +@Service +@Data +@Slf4j +public class LiquidTankService { + + /** + * type1 + * 0 0 * * 1,2 + */ + private static final String TYPE_1_CRON = "0 0 * * #"; + /** + * type2 + */ + private static final String TYPE_2_CRON = "0 0 0 # * ?"; + /** + * type3 + */ + private static final String TYPE_3_CRON = "0 0 0 # ?"; + /** + * search and replace + */ + private static final String TYPE_CRON_SEARCH = "#"; + @Resource + private LiquidTankGenMapper genMapper; + @Resource + private ILiquidTankGenService genService; + + /** + * 新增[槽液] + * + * @param lt + * @return + */ + public R save(LiquidTankSubmit lt) { + // 检查[作业槽]是否启用 +// WorkTank wt = lt.getWorkTankId(); + { + String cron = buildCron(lt); + // 验证CRON有效性 + // todo: + lt.setCronGenTask(cron); + } + boolean b = genService.save(lt); + // 处理PowerJoB中对应作业 + { + String name = PowerJobUtil.buildName(QAModuleConst.PREFIX, + LiquidTankService.class.getSimpleName(), + lt.getId() + "", + LiquidTankConst.JOB_TYPE_GEN_TASK); + // 新建定时任务 + } + return R.status(b); + } + + public R update(LiquidTankSubmit lt) { + + LiquidTank ltFind = genMapper.selectById(lt.getId()); + if ( + Objects.equals(lt.getGenCycleType(), ltFind.getGenCycleType()) + ) { + + } + return R.status(genService.updateById(lt)); + } + + /** + * 批量设置 + * + * @param lt + * @return + */ + public R updateBat(LiquidTankUpdateBat lt) { + return null; + } + + public R delete() { + return null; + } + + /** + * 处理CRON表达式 + * + * @param lt + * @return + */ + private String buildCron(LiquidTankSubmit lt) { + String cron = ""; + if (Objects.equals(lt.getGenCycleType(), LiquidTankConst.GEN_CYCLE_TYPE_1)) { // + cron = StringUtils.replace(TYPE_1_CRON, TYPE_CRON_SEARCH, lt.getGenCycleType1Value()); + } else if (Objects.equals(lt.getGenCycleType(), LiquidTankConst.GEN_CYCLE_TYPE_2)) { + // todo:check + // 月的第几日 + int day = Integer.parseInt(lt.getGenCycleType2Value()); + log.info("type 2,day={}", day); + cron = StringUtils.replace(TYPE_2_CRON, TYPE_CRON_SEARCH, day + ""); + } else if (Objects.equals(lt.getGenCycleType(), LiquidTankConst.GEN_CYCLE_TYPE_3)) {// + String value = lt.getGenCycleType3Value(); + // todo:check + // 月的第几日 + int day = Integer.parseInt(StringUtils.substring(value, 0, 2)); + // 年的第几月 + int month = Integer.parseInt(StringUtils.substring(value, 2, 4)); + log.info("type 3,month={},day={} ", month, day); + // 注意:中间有空格 + cron = StringUtils.replace(TYPE_3_CRON, TYPE_CRON_SEARCH, day + " " + month); + } else if (Objects.equals(lt.getGenCycleType(), LiquidTankConst.GEN_CYCLE_TYPE_4)) {// + cron = lt.getGenCycleType4Value(); + } + if (StringUtils.isBlank(cron)) { + R.fail("CRON表达式无效"); + } + log.info("check cron = {}", cron); + return cron; + } + + private void handleJob(LiquidTankSubmit lt) { + + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java new file mode 100644 index 000000000..3cdeee91a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java @@ -0,0 +1,384 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.constant.ColValue; +import org.springblade.desk.quality.constant.LiquidTankTaskConst; +import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springblade.desk.quality.mapper.gen.LiquidTankTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.request.*; +import org.springblade.desk.quality.util.IdUtil; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.UserInfo; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * [槽液检测任务] + */ +@Service +@Slf4j +@Data +public class LiquidTankTaskService { + + @Resource + private LiquidTankGenMapper liquidTankGenMapper; + @Resource + private LiquidTankTaskGenMapper genMapper; + + @Resource + private MsgService msgService; + + @Resource + private IUserClient userClient; + + + /** + * 定时运行:每天00:00 + * 周期性自动生成槽液任务。 + * + * @return 所有生成的任务 + */ + public List generateAuto() { + log.info("========generate========start"); + // 如果是节假日，则跳过生成。 + if (false) { + log.info("节假日，则跳过生成。"); + return null; + } + // 查询所有启用的槽液。 + List tankList = liquidTankGenMapper.selectList( + new QueryWrapper() + .eq(ColBase.STATUS, ColValue.STATE_ENABLE) + ); + // 遍历插入槽液任务。 + List rList = new ArrayList<>(); + for (LiquidTank lt : tankList) { + // 如果有未处理任务，则跳过不生成新任务。 + Long count = genMapper.selectCount( + new QueryWrapper() + .eq("LIQUID_TANK_ID", lt.getId()) + .eq(ColBase.STATUS, LiquidTankTaskConst.STATE_PENDING_ACCEPT) + ); + if (count >= 1) { + log.info("槽液{}存在未处理的槽液任务", lt.getId()); + continue; + } + LiquidTankTask task = new LiquidTankTask(); + task.setLiquidTankId(lt.getId()); + task.setName("name"); + task.setCode(""); + task.setRemark(""); + task.setTeamId(0L); + // 设置人员相关 + // 设置检测员 + task.setTestUserId(lt.getTestUserId()); + // 设置工艺员 + task.setProcessUserId(lt.getProcessUserId()); + // + task.setSendUserId(IdUtil.DEFAULT_0_ID); + task.setReceiveUserId(IdUtil.DEFAULT_0_ID); + // from type + task.setFromType(LiquidTankTaskConst.FROM_TYPE_PERIODIC); + // status + task.setStatus(LiquidTankTaskConst.STATE_PENDING_ACCEPT); + // 通用字段 + task.setCreateUser(AuthUtil.getUserId()); + task.setCreateTime(new Date()); + task.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); + genMapper.insert(task); + rList.add(task); + } + log.info("========generate========end"); + return rList; + } + + /** + * 定时运行:每天09:30 + * 槽液任务超时提醒。 + * + * @return 被提醒的任务列表 + */ + public List timeout() { + log.info("========timeout========start"); + // 查询出所有未处理的槽液任务 + List list = genMapper.selectList(new QueryWrapper() + .eq(ColBase.STATUS, LiquidTankTaskConst.STATE_PENDING_ACCEPT) + .orderByAsc(ColBase.ID) + ); + for (LiquidTankTask task : list) { + LiquidTank tank = liquidTankGenMapper.selectById(task.getLiquidTankId()); + // todo:对监测员进行提醒。 + // 按天运行，可以一直重复提醒。 + String msg = "槽液 " + tank.getCode() + "，未及时检验！请及时处理。"; + Long testUserId = tank.getTestUserId(); + msgService.sendMsg(testUserId, msg); + } + log.info("========timeout========end"); + return list; + } + + /** + * [槽液检测任务] 手动生成新增 + * + * @param req + * @return + */ + public R generateManual(LiquidTankTaskGenManual req) { + LiquidTank lt = liquidTankGenMapper.selectById(req.getLiquidTankId()); + if (Objects.isNull(lt)) { + R.fail("对应槽液信息为空。"); + } + // todo:检查当前角色 + UserInfo userInfo = userClient.userInfo(req.getTestUserId()).getData(); + // todo:检查角色 + + // todo:日期检查 + LiquidTankTask task = new LiquidTankTask(); + // 指定槽液 + task.setLiquidTankId(req.getLiquidTankId()); + // 指定人员 + if (IdUtil.isValid(req.getTestUserId())) { + task.setTestUserId(req.getTestUserId()); + } else { + task.setTestUserId(lt.getTestUserId()); + } + if (IdUtil.isValid(req.getProcessUserId())) { + task.setProcessUserId(req.getProcessUserId()); + } else { + task.setProcessUserId(lt.getProcessUserId()); + } + // from type + task.setFromType(LiquidTankTaskConst.FROM_TYPE_MANUAL); + // status + task.setStatus(LiquidTankTaskConst.STATE_PENDING_ACCEPT); + // 通用字段 + task.setCreateUser(AuthUtil.getUserId()); + task.setCreateTime(new Date()); + task.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); + // 插入 + genMapper.insert(task); + // final R + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("手动生成槽液任务成功"); + return r; + } + + /** + * [槽液检测任务] 手动下发 + * + * @param req + * @return + */ + public R issue(LiquidTankTaskIssue req) { + // todo:检查当前角色 + if (IdUtil.isAnyInvalid(new Long[]{req.getId(), req.getTestUserId()})) { + return R.fail("id错误"); + } + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_NOT_READY.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + // status + task.setStatus(LiquidTankTaskConst.STATE_PENDING_ACCEPT); + // 通用字段 + task.setUpdateUser(AuthUtil.getUserId()); + task.setUpdateTime(new Date()); + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("手动下发槽液任务成功"); + return r; + } + + /** + * [槽液检测任务] 接收任务 + * + * @param req + * @return + */ + public R accept(LiquidTankTaskAccept req) { + if (IdUtil.isInvalid(req.getId())) { + return R.fail("id错误"); + } + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_PENDING_ACCEPT.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + // check status + // status + task.setStatus(LiquidTankTaskConst.STATE_PENDING_TEST); + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("接收任务成功"); + return r; + } + + /** + * [槽液检测任务] 首次填报数据 + * + * @param req + * @return + */ + public R fillDataFirst(LiquidTankTaskFillData req) { + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_FILL_DATA_FIRST.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + R r = new R<>(); + // todo: 自动计算加药量 + r.setData(task); + r.setSuccess(true); + r.setMsg("填报数据成功"); + return r; + } + + /** + * [槽液检测任务] 编辑加药量 + * + * @param req + * @return + */ + public R editDrugQuantity(LiquidTankTaskEditDrug req) { + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_FILL_DATA_FIRST.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + R r = new R<>(); + // todo: 自动计算加药量 + r.setData(task); + r.setSuccess(true); + r.setMsg("编辑加药量成功"); + return r; + } + + /** + * [槽液检测任务] 提交加药量审核 + * + * @param req + * @return + */ + public R submitDrugQuantity(LiquidTankTaskSubmit req) { + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_PENDING_EDIT_DRUG.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + R r = new R<>(); + + // todo: 自动计算加药量 + r.setData(null); + r.setSuccess(true); + r.setMsg("提交加药量审核成功"); + return r; + } + + /** + * [槽液检测任务] 审批 同意/驳回 提交加药量 + * + * @param req + * @return + */ + public R approvalDrugQuantity(LiquidTankTaskApproval req) { + LiquidTankTask task = genMapper.selectById(req.getId()); + if (!LiquidTankTaskConst.STATE_PENDING_REVIEW.equals(task.getStatus())) { + return R.fail("任务状态不对应"); + } + R r = new R<>(); + + // todo: 自动计算加药量 + r.setData(null); + r.setSuccess(true); + r.setMsg("同意提交加药量成功"); // "驳回提交加药量成功" + return r; + } + + + /** + * [槽液检测任务] 药品发放确认 + * + * @param req + * @return + */ + public R sendDrug(LiquidTankTaskSendDrug req) { + R r = new R<>(); + + // todo: 自动计算加药量 + r.setData(null); + r.setSuccess(true); + r.setMsg("药品发放确认成功"); + return r; + } + + /** + * [槽液检测任务] 药品接收确认 + * + * @param req + * @return + */ + public R receiveDrug(LiquidTankTaskReceiveDrug req) { + R r = new R<>(); + + // todo: 自动计算加药量 + r.setData(null); + r.setSuccess(true); + r.setMsg("药品接收确认成功"); + return r; + } + + /** + * [槽液检测任务] 关闭 + * @param req + * @return + */ + public R close(LiquidTankTaskClose req) { + LiquidTankTask task = genMapper.selectById(req.getId()); + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("关闭槽液任务成功"); + return r; + } + + /** + * [槽液检测任务] 关闭 + * @param req + * @return + */ + public R closeBat(LiquidTankTaskCloseBat req) { + LiquidTankTask task = null; + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("关闭槽液任务成功"); + return null; + } + + /** + * 计算加药量 + * 根据历史填报 or 药品规格自动修正加药量 + */ + public void calDrug() { + // todo: + } + + /** + * 生产需求计算 + */ + public void calProductNeed() { + // todo:自动计算生产需求来生成槽液任务。 + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LquidTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LquidTankService.java new file mode 100644 index 000000000..628d95b00 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LquidTankService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class LquidTankService { + + @Resource + private LiquidTankGenMapper mapper; + + /** + * todo: 尚未确定具体实现。 + * 生产需求计算。 + * + * @return + */ + public Boolean productCal() { + return Boolean.TRUE; + } + + public void importExcel() { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/MsgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/MsgService.java new file mode 100644 index 000000000..cad02005e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/MsgService.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.service; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +@Data +public class MsgService { + + public void sendMsg(Long userId, String msg) { + // + log.info("userId = {},sendMsg = {}", userId, msg); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java new file mode 100644 index 000000000..60e8bab09 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java @@ -0,0 +1,35 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.constant.ColValue; +import org.springblade.desk.quality.mapper.gen.NgGenMapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.request.NgSearch; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +@Data +public class NgService { + + @Resource + private NgGenMapper genMapper; + + public List listByType(NgSearch search) { + return genMapper.selectList( + new QueryWrapper() + .eq(ColBase.STATUS, ColValue.STATE_ENABLE) + .eq("NG_TYPE", search.getNgType()) + .eq("PARENT_ID", search.getParentId()) + .eq("PRODUCT_ID", search.getProductId()) + .eq("PROCESS_ID", search.getProcessId()) + .orderByAsc(ColBase.SORT) + ); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAIotTraceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAIotTraceService.java new file mode 100644 index 000000000..fa19229cf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAIotTraceService.java @@ -0,0 +1,22 @@ +package org.springblade.desk.quality.service; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class QAIotTraceService { + + /** + * + * @return + */ + public Boolean getTraceData() { + // todo： + // 挂次号不为空，则代表是产线设备信息。 + // 更新修改 对应 生产追溯数据。 + return true; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java new file mode 100644 index 000000000..dd985656e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java @@ -0,0 +1,26 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.job.feign.IJobExtClient; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class QAStartService { + + @Resource + private IJobExtClient jobExtClient; + + /** + * 应用启动后执行。 + */ + @EventListener(ApplicationReadyEvent.class) + public void start() { + log.info("====QA质量模块启动成功!===="); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/TestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/TestService.java new file mode 100644 index 000000000..9edb65ed9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/TestService.java @@ -0,0 +1,45 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.JobInfoConst; +import org.springblade.job.feign.IJobExtClient; +import org.springblade.job.pojo.entity.JobInfo; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class TestService { + + @Resource + private IUserClient userClient; + + @Resource + private IJobExtClient jobExtClient; + + public R getOneUser(Long userId) { + return userClient.userInfoById(userId); + } + + public R test1() { +// Boolean b = jobExtClient.sync(); +// JobInfo j = new JobInfo(); +// j.setJobId(null); +// j.setJobName("job-test-" + System.currentTimeMillis()); +// j.setTimeExpressionType(JobInfoConst.TIME_EXPRESSION_TYPE_CRON); +// j.setTimeExpression("*/5 * * * * ?"); +// j.setExecuteType(JobInfoConst.EXECUTE_TYPE_1); +// j.setProcessorType(JobInfoConst.PROCESSOR_TYPE_1); +// j.setDispatchStrategy(JobInfoConst.DISPATCH_STRATEGY_1); +// j.setProcessorInfo("org.springblade.job.processor.ProcessorDemo"); +// jobExtClient.submitAndSync(j); + // 最后同步。 + jobExtClient.sync(); + return R.data(Boolean.TRUE); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/UserExService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/UserExService.java new file mode 100644 index 000000000..9ea44724f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/UserExService.java @@ -0,0 +1,26 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +@Data +public class UserExService { + + @Resource + private IUserClient userClient; + + public R test(Long userId) { + R rUser = userClient.userInfoById(userId); + if (rUser.isSuccess() && rUser.getData() != null) { + return R.data(rUser.getData()); + } + return null; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java new file mode 100644 index 000000000..32c160a40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.List; + +/** + * [周期试验] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ICycleTestGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return IPage + */ + IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java new file mode 100644 index 000000000..4c05a9c40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.List; + +/** + * [周期试验项目] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ICycleTestItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return IPage + */ + IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java new file mode 100644 index 000000000..3c0041890 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.List; + +/** + * [周期试验任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ICycleTestTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return IPage + */ + IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionItemGenService.java new file mode 100644 index 000000000..04705d884 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionItemGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.InspectionItemGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.vo.gen.InspectionItemGenVO; + +import java.util.List; + +/** + * [检验项目] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface IInspectionItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionItem 查询参数 + * @return IPage + */ + IPage selectInspectionItemPage(IPage page, InspectionItemGenVO inspectionItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionItem(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionResultGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionResultGenService.java new file mode 100644 index 000000000..b3e15c6eb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionResultGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.InspectionResultGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.vo.gen.InspectionResultGenVO; + +import java.util.List; + +/** + * [检验结果] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface IInspectionResultGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionResult 查询参数 + * @return IPage + */ + IPage selectInspectionResultPage(IPage page, InspectionResultGenVO inspectionResult); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionResult(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java new file mode 100644 index 000000000..54acdce14 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; + +import java.util.List; + +/** + * [检验任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface IInspectionTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return IPage + */ + IPage selectInspectionTaskPage(IPage page, InspectionTaskGenVO inspectionTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java new file mode 100644 index 000000000..2945d3e0e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.List; + +/** + * [IOT硬度] 服务类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IIotHardnessGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotHardness 查询参数 + * @return IPage + */ + IPage selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotHardness(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java new file mode 100644 index 000000000..4a6959a40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.List; + +/** + * [IOT硬度] 服务类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IIotThicknessGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotThickness 查询参数 + * @return IPage + */ + IPage selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotThickness(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankGenService.java new file mode 100644 index 000000000..ee45f046d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankGenVO; +import org.springblade.desk.quality.excel.gen.LiquidTankGenExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [槽液] 服务类 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +public interface ILiquidTankGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param liquidTank 查询参数 + * @return IPage + */ + IPage selectLiquidTankPage(IPage page, LiquidTankGenVO liquidTank); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLiquidTank(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankTaskGenService.java new file mode 100644 index 000000000..b5eb9dbfa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ILiquidTankTaskGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.LiquidTankTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; + +import java.util.List; + +/** + * [槽液检测任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ILiquidTankTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param liquidTankTask 查询参数 + * @return IPage + */ + IPage selectLiquidTankTaskPage(IPage page, LiquidTankTaskGenVO liquidTankTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLiquidTankTask(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java new file mode 100644 index 000000000..dc23d4929 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.NgGenExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; + +import java.util.List; + +/** + * [缺陷] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface INgGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return IPage + */ + IPage selectNgPage(IPage page, NgGenVO ng); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardGenService.java new file mode 100644 index 000000000..5f5cc156c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.StandardGenExcel; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.vo.gen.StandardGenVO; + +import java.util.List; + +/** + * [质量标准] 服务类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public interface IStandardGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param standard 查询参数 + * @return IPage + */ + IPage selectStandardPage(IPage page, StandardGenVO standard); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStandard(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardParamGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardParamGenService.java new file mode 100644 index 000000000..7456a8d5b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IStandardParamGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.StandardParamGenExcel; +import org.springblade.desk.quality.pojo.entity.StandardParam; +import org.springblade.desk.quality.pojo.vo.gen.StandardParamGenVO; + +import java.util.List; + +/** + * [质量标准参数] 服务类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public interface IStandardParamGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param standardParam 查询参数 + * @return IPage + */ + IPage selectStandardParamPage(IPage page, StandardParamGenVO standardParam); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStandardParam(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java new file mode 100644 index 000000000..d56e63c31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.List; + +/** + * [追溯链条] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceChainGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceChain 查询参数 + * @return IPage + */ + IPage selectTraceChainPage(IPage page, TraceChainGenVO traceChain); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceChain(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java new file mode 100644 index 000000000..d6045ecda --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.List; + +/** + * [追溯事件] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceEventGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceEvent 查询参数 + * @return IPage + */ + IPage selectTraceEventPage(IPage page, TraceEventGenVO traceEvent); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceEvent(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java new file mode 100644 index 000000000..bdfa1e900 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.List; + +/** + * [追溯明细] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceItem 查询参数 + * @return IPage + */ + IPage selectTraceItemPage(IPage page, TraceItemGenVO traceItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceItem(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java new file mode 100644 index 000000000..38cd674cf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class CycleTestGenServiceImpl extends BaseServiceImpl implements ICycleTestGenService { + + @Override + public IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest) { + return page.setRecords(baseMapper.selectCycleTestPage(page, cycleTest)); + } + + @Override + public List exportCycleTest(Wrapper queryWrapper) { + List cycleTestList = baseMapper.exportCycleTest(queryWrapper); + //cycleTestList.forEach(cycleTest -> { + // cycleTest.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTest.getType())); + //}); + return cycleTestList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java new file mode 100644 index 000000000..870000676 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestItemGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验项目] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class CycleTestItemGenServiceImpl extends BaseServiceImpl implements ICycleTestItemGenService { + + @Override + public IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem) { + return page.setRecords(baseMapper.selectCycleTestItemPage(page, cycleTestItem)); + } + + @Override + public List exportCycleTestItem(Wrapper queryWrapper) { + List cycleTestItemList = baseMapper.exportCycleTestItem(queryWrapper); + //cycleTestItemList.forEach(cycleTestItem -> { + // cycleTestItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestItem.getType())); + //}); + return cycleTestItemList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java new file mode 100644 index 000000000..485264dec --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验任务] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class CycleTestTaskGenServiceImpl extends BaseServiceImpl implements ICycleTestTaskGenService { + + @Override + public IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask) { + return page.setRecords(baseMapper.selectCycleTestTaskPage(page, cycleTestTask)); + } + + @Override + public List exportCycleTestTask(Wrapper queryWrapper) { + List cycleTestTaskList = baseMapper.exportCycleTestTask(queryWrapper); + //cycleTestTaskList.forEach(cycleTestTask -> { + // cycleTestTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestTask.getType())); + //}); + return cycleTestTaskList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionItemGenServiceImpl.java new file mode 100644 index 000000000..150f5a68c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionItemGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.InspectionItemGenExcel; +import org.springblade.desk.quality.mapper.gen.InspectionItemGenMapper; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.vo.gen.InspectionItemGenVO; +import org.springblade.desk.quality.service.gen.IInspectionItemGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [检验项目] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class InspectionItemGenServiceImpl extends BaseServiceImpl implements IInspectionItemGenService { + + @Override + public IPage selectInspectionItemPage(IPage page, InspectionItemGenVO inspectionItem) { + return page.setRecords(baseMapper.selectInspectionItemPage(page, inspectionItem)); + } + + @Override + public List exportInspectionItem(Wrapper queryWrapper) { + List inspectionItemList = baseMapper.exportInspectionItem(queryWrapper); + //inspectionItemList.forEach(inspectionItem -> { + // inspectionItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, InspectionItem.getType())); + //}); + return inspectionItemList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionResultGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionResultGenServiceImpl.java new file mode 100644 index 000000000..ec371781f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionResultGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.InspectionResultGenExcel; +import org.springblade.desk.quality.mapper.gen.InspectionResultGenMapper; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.vo.gen.InspectionResultGenVO; +import org.springblade.desk.quality.service.gen.IInspectionResultGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [检验结果] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class InspectionResultGenServiceImpl extends BaseServiceImpl implements IInspectionResultGenService { + + @Override + public IPage selectInspectionResultPage(IPage page, InspectionResultGenVO inspectionResult) { + return page.setRecords(baseMapper.selectInspectionResultPage(page, inspectionResult)); + } + + @Override + public List exportInspectionResult(Wrapper queryWrapper) { + List inspectionResultList = baseMapper.exportInspectionResult(queryWrapper); + //inspectionResultList.forEach(inspectionResult -> { + // inspectionResult.setTypeName(DictCache.getValue(DictEnum.YES_NO, InspectionResult.getType())); + //}); + return inspectionResultList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionTaskGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionTaskGenServiceImpl.java new file mode 100644 index 000000000..0f3135a85 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/InspectionTaskGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.mapper.gen.InspectionTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; +import org.springblade.desk.quality.service.gen.IInspectionTaskGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [检验任务] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class InspectionTaskGenServiceImpl extends BaseServiceImpl implements IInspectionTaskGenService { + + @Override + public IPage selectInspectionTaskPage(IPage page, InspectionTaskGenVO inspectionTask) { + return page.setRecords(baseMapper.selectInspectionTaskPage(page, inspectionTask)); + } + + @Override + public List exportInspectionTask(Wrapper queryWrapper) { + List inspectionTaskList = baseMapper.exportInspectionTask(queryWrapper); + //inspectionTaskList.forEach(inspectionTask -> { + // inspectionTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, InspectionTask.getType())); + //}); + return inspectionTaskList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java new file mode 100644 index 000000000..9eb92618c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; +import org.springblade.desk.quality.service.gen.IIotHardnessGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [IOT硬度] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Service +public class IotHardnessGenServiceImpl extends BaseServiceImpl implements IIotHardnessGenService { + + @Override + public IPage selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness) { + return page.setRecords(baseMapper.selectIotHardnessPage(page, iotHardness)); + } + + @Override + public List exportIotHardness(Wrapper queryWrapper) { + List iotHardnessList = baseMapper.exportIotHardness(queryWrapper); + //iotHardnessList.forEach(iotHardness -> { + // iotHardness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotHardness.getType())); + //}); + return iotHardnessList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java new file mode 100644 index 000000000..d19b6f9a6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; +import org.springblade.desk.quality.service.gen.IIotThicknessGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [IOT硬度] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Service +public class IotThicknessGenServiceImpl extends BaseServiceImpl implements IIotThicknessGenService { + + @Override + public IPage selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness) { + return page.setRecords(baseMapper.selectIotThicknessPage(page, iotThickness)); + } + + @Override + public List exportIotThickness(Wrapper queryWrapper) { + List iotThicknessList = baseMapper.exportIotThickness(queryWrapper); + //iotThicknessList.forEach(iotThickness -> { + // iotThickness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotThickness.getType())); + //}); + return iotThicknessList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankGenServiceImpl.java new file mode 100644 index 000000000..a7341e97f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankGenVO; +import org.springblade.desk.quality.excel.gen.LiquidTankGenExcel; +import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springblade.desk.quality.service.gen.ILiquidTankGenService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [槽液] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +@Service +public class LiquidTankGenServiceImpl extends BaseServiceImpl implements ILiquidTankGenService { + + @Override + public IPage selectLiquidTankPage(IPage page, LiquidTankGenVO liquidTank) { + return page.setRecords(baseMapper.selectLiquidTankPage(page, liquidTank)); + } + + @Override + public List exportLiquidTank(Wrapper queryWrapper) { + List liquidTankList = baseMapper.exportLiquidTank(queryWrapper); + //liquidTankList.forEach(liquidTank -> { + // liquidTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTank.getType())); + //}); + return liquidTankList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankTaskGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankTaskGenServiceImpl.java new file mode 100644 index 000000000..b8c963a3a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/LiquidTankTaskGenServiceImpl.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.LiquidTankTaskGenExcel; +import org.springblade.desk.quality.mapper.gen.LiquidTankTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; +import org.springblade.desk.quality.service.gen.ILiquidTankTaskGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [槽液检测任务] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class LiquidTankTaskGenServiceImpl extends BaseServiceImpl + implements ILiquidTankTaskGenService { + + @Override + public IPage selectLiquidTankTaskPage(IPage page, + LiquidTankTaskGenVO liquidTankTask) { + return page.setRecords(baseMapper.selectLiquidTankTaskPage(page, liquidTankTask)); + } + + @Override + public List exportLiquidTankTask(Wrapper queryWrapper) { + List liquidTankTaskList = baseMapper.exportLiquidTankTask(queryWrapper); + //liquidTankTaskList.forEach(liquidTankTask -> { + // liquidTankTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTankTask.getType())); + //}); + return liquidTankTaskList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java new file mode 100644 index 000000000..345fcbb4b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.NgGenExcel; +import org.springblade.desk.quality.mapper.gen.NgGenMapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; +import org.springblade.desk.quality.service.gen.INgGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [缺陷] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class NgGenServiceImpl extends BaseServiceImpl implements INgGenService { + + @Override + public IPage selectNgPage(IPage page, NgGenVO ng) { + return page.setRecords(baseMapper.selectNgPage(page, ng)); + } + + @Override + public List exportNg(Wrapper queryWrapper) { + List ngList = baseMapper.exportNg(queryWrapper); + //ngList.forEach(ng -> { + // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); + //}); + return ngList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardGenServiceImpl.java new file mode 100644 index 000000000..8d4e5ea4e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.StandardGenExcel; +import org.springblade.desk.quality.mapper.gen.StandardGenMapper; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.vo.gen.StandardGenVO; +import org.springblade.desk.quality.service.gen.IStandardGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [质量标准] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Service +public class StandardGenServiceImpl extends BaseServiceImpl implements IStandardGenService { + + @Override + public IPage selectStandardPage(IPage page, StandardGenVO standard) { + return page.setRecords(baseMapper.selectStandardPage(page, standard)); + } + + @Override + public List exportStandard(Wrapper queryWrapper) { + List standardList = baseMapper.exportStandard(queryWrapper); + //standardList.forEach(standard -> { + // standard.setTypeName(DictCache.getValue(DictEnum.YES_NO, Standard.getType())); + //}); + return standardList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardParamGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardParamGenServiceImpl.java new file mode 100644 index 000000000..918eedc1d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/StandardParamGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.StandardParamGenExcel; +import org.springblade.desk.quality.mapper.gen.StandardParamGenMapper; +import org.springblade.desk.quality.pojo.entity.StandardParam; +import org.springblade.desk.quality.pojo.vo.gen.StandardParamGenVO; +import org.springblade.desk.quality.service.gen.IStandardParamGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [质量标准参数] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +@Service +public class StandardParamGenServiceImpl extends BaseServiceImpl implements IStandardParamGenService { + + @Override + public IPage selectStandardParamPage(IPage page, StandardParamGenVO standardParam) { + return page.setRecords(baseMapper.selectStandardParamPage(page, standardParam)); + } + + @Override + public List exportStandardParam(Wrapper queryWrapper) { + List standardParamList = baseMapper.exportStandardParam(queryWrapper); + //standardParamList.forEach(standardParam -> { + // standardParam.setTypeName(DictCache.getValue(DictEnum.YES_NO, StandardParam.getType())); + //}); + return standardParamList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java new file mode 100644 index 000000000..a5b67541c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceChainGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; +import org.springblade.desk.quality.service.gen.ITraceChainGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯链条] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceChainGenServiceImpl extends BaseServiceImpl implements ITraceChainGenService { + + @Override + public IPage selectTraceChainPage(IPage page, TraceChainGenVO traceChain) { + return page.setRecords(baseMapper.selectTraceChainPage(page, traceChain)); + } + + @Override + public List exportTraceChain(Wrapper queryWrapper) { + List traceChainList = baseMapper.exportTraceChain(queryWrapper); + //traceChainList.forEach(traceChain -> { + // traceChain.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceChain.getType())); + //}); + return traceChainList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java new file mode 100644 index 000000000..8a9f68e7a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceEventGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; +import org.springblade.desk.quality.service.gen.ITraceEventGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯事件] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceEventGenServiceImpl extends BaseServiceImpl implements ITraceEventGenService { + + @Override + public IPage selectTraceEventPage(IPage page, TraceEventGenVO traceEvent) { + return page.setRecords(baseMapper.selectTraceEventPage(page, traceEvent)); + } + + @Override + public List exportTraceEvent(Wrapper queryWrapper) { + List traceEventList = baseMapper.exportTraceEvent(queryWrapper); + //traceEventList.forEach(traceEvent -> { + // traceEvent.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceEvent.getType())); + //}); + return traceEventList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java new file mode 100644 index 000000000..2e8a63ee9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceItemGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; +import org.springblade.desk.quality.service.gen.ITraceItemGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯明细] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceItemGenServiceImpl extends BaseServiceImpl implements ITraceItemGenService { + + @Override + public IPage selectTraceItemPage(IPage page, TraceItemGenVO traceItem) { + return page.setRecords(baseMapper.selectTraceItemPage(page, traceItem)); + } + + @Override + public List exportTraceItem(Wrapper queryWrapper) { + List traceItemList = baseMapper.exportTraceItem(queryWrapper); + //traceItemList.forEach(traceItem -> { + // traceItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceItem.getType())); + //}); + return traceItemList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/package-info.java new file mode 100644 index 000000000..b94539299 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/package-info.java @@ -0,0 +1,4 @@ +/** + * 质量管理 Service + */ +package org.springblade.desk.quality.service; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/BaseEntityUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/BaseEntityUtil.java new file mode 100644 index 000000000..5fdd312ba --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/BaseEntityUtil.java @@ -0,0 +1,69 @@ +package org.springblade.desk.quality.util; + +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.secure.utils.AuthUtil; +import org.springframework.beans.BeanWrapper; +import org.springframework.beans.BeanWrapperImpl; + +import java.beans.PropertyDescriptor; +import java.util.Date; +import java.util.Objects; + +public class BaseEntityUtil { + + /** + * for insert. + * + * @param e + * @return + */ + public static BaseEntity setColValueInsert(BaseEntity e) { + if (Objects.isNull(e)) { + return e; + } + // Id + e.setId(null); + // CreateUser + e.setCreateUser(AuthUtil.getUserId()); + // CreateDept + if (StringUtils.isNotBlank(AuthUtil.getDeptId())) { + e.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); + } + // CreateTime + e.setCreateTime(new Date()); + // UpdateUser + e.setUpdateUser(IdUtil.DEFAULT_0_ID); + // UpdateTime + e.setUpdateTime(new Date()); + // 所有字段,String类型值为空,这设置成"" + if (false) { + BeanWrapper beanWrapper = new BeanWrapperImpl(e); + PropertyDescriptor[] pdArray = beanWrapper.getPropertyDescriptors(); + for (PropertyDescriptor pd : pdArray) { + Class propertyType = beanWrapper.getPropertyType(pd.getName()); + if (propertyType != null && propertyType.equals(String.class)) { + if (pd.getValue(pd.getName()) == null) { + pd.setValue(pd.getName(), ""); + } + } + } + } + return e; + } + + /** + * for update. + * + * @param e + * @return + */ + public static BaseEntity setDefaultColValueUpdate(BaseEntity e) { + if (Objects.isNull(e)) { + return null; + } + e.setUpdateUser(AuthUtil.getUserId()); + e.setUpdateTime(new Date()); + return e; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/IdUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/IdUtil.java new file mode 100644 index 000000000..e9a232547 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/IdUtil.java @@ -0,0 +1,51 @@ +package org.springblade.desk.quality.util; + +/** + * 雪花 long id工具类。 + */ +public class IdUtil { + + /** + * eg: 1123598821738675203 + */ + public static final int ID_LENGTH = 19; + public static final Long DEFAULT_0_ID = 0L; + + /** + * id有效 + * + * @param id + * @return + */ + public static Boolean isValid(Long id) { + return !isInvalid(id); + } + + /** + * id无效 + * + * @param id + * @return + */ + public static Boolean isInvalid(Long id) { + // + if (id == null || id == 0L || id < 0L || String.valueOf(id).length() != ID_LENGTH) { + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + public static Boolean isAllValid(Long[] ids) { + for (Long id : ids) { + if (isInvalid(id)) { + return Boolean.FALSE; + } + } + return Boolean.TRUE; + } + + public static Boolean isAnyInvalid(Long[] ids) { + return isAllValid(ids); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java new file mode 100644 index 000000000..9889a92fd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java @@ -0,0 +1,25 @@ +package org.springblade.desk.quality.util; + +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; + +public class PowerJobUtil { + + /** + * 自动生成的Job拼接name。 + * + * @param module 模块名称 + * @param service 服务类 + * @param id 服务类对应数据id + * @param type 定时类型 + * @return 放入数据库的Job名称。 + */ + public static String buildName(final String module, final String service, + final String id, final String type) { + if (StringUtils.isAnyBlank(module, service, id, type)) { + throw new IllegalArgumentException("拼接参数错误！"); + } + return module + "-" + service + "-" + id + "-" + type; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java new file mode 100644 index 000000000..e56d367b7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java @@ -0,0 +1,21 @@ +package org.springblade.desk.quality.util; + +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.secure.utils.AuthUtil; + +public class RoleUtil { + + + /** + * API权限 + * todo: + * @param roleAlias + * @return + */ + public static Boolean hasRole(String roleAlias) { + if (StringUtils.isBlank(roleAlias)) { + throw new IllegalArgumentException("roleAlias参数错误"); + } + return false; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java new file mode 100644 index 000000000..7e6ec9f81 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.Objects; + +/** + * [周期试验] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class CycleTestGenWrapper extends BaseEntityWrapper { + + public static CycleTestGenWrapper build() { + return new CycleTestGenWrapper(); + } + + @Override + public CycleTestGenVO entityVO(CycleTest cycleTest) { + CycleTestGenVO cycleTestVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTest, CycleTestGenVO.class)); + + //User createUser = UserCache.getUser(cycleTest.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTest.getUpdateUser()); + //cycleTestVO.setCreateUserName(createUser.getName()); + //cycleTestVO.setUpdateUserName(updateUser.getName()); + + return cycleTestVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java new file mode 100644 index 000000000..6555ff35d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.Objects; + +/** + * [周期试验项目] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class CycleTestItemGenWrapper extends BaseEntityWrapper { + + public static CycleTestItemGenWrapper build() { + return new CycleTestItemGenWrapper(); + } + + @Override + public CycleTestItemGenVO entityVO(CycleTestItem cycleTestItem) { + CycleTestItemGenVO cycleTestItemVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestItem, CycleTestItemGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestItem.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestItem.getUpdateUser()); + //cycleTestItemVO.setCreateUserName(createUser.getName()); + //cycleTestItemVO.setUpdateUserName(updateUser.getName()); + + return cycleTestItemVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java new file mode 100644 index 000000000..7847f8d64 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.Objects; + +/** + * [周期试验任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class CycleTestTaskGenWrapper extends BaseEntityWrapper { + + public static CycleTestTaskGenWrapper build() { + return new CycleTestTaskGenWrapper(); + } + + @Override + public CycleTestTaskGenVO entityVO(CycleTestTask cycleTestTask) { + CycleTestTaskGenVO cycleTestTaskVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestTask, CycleTestTaskGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestTask.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestTask.getUpdateUser()); + //cycleTestTaskVO.setCreateUserName(createUser.getName()); + //cycleTestTaskVO.setUpdateUserName(updateUser.getName()); + + return cycleTestTaskVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionItemGenWrapper.java new file mode 100644 index 000000000..c4627c7c1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionItemGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.vo.gen.InspectionItemGenVO; + +import java.util.Objects; + +/** + * [检验项目] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class InspectionItemGenWrapper extends BaseEntityWrapper { + + public static InspectionItemGenWrapper build() { + return new InspectionItemGenWrapper(); + } + + @Override + public InspectionItemGenVO entityVO(InspectionItem inspectionItem) { + InspectionItemGenVO inspectionItemVO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionItem, InspectionItemGenVO.class)); + + //User createUser = UserCache.getUser(inspectionItem.getCreateUser()); + //User updateUser = UserCache.getUser(inspectionItem.getUpdateUser()); + //inspectionItemVO.setCreateUserName(createUser.getName()); + //inspectionItemVO.setUpdateUserName(updateUser.getName()); + + return inspectionItemVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionResultGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionResultGenWrapper.java new file mode 100644 index 000000000..9c737fcee --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionResultGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.InspectionResult; +import org.springblade.desk.quality.pojo.vo.gen.InspectionResultGenVO; + +import java.util.Objects; + +/** + * [检验结果] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class InspectionResultGenWrapper extends BaseEntityWrapper { + + public static InspectionResultGenWrapper build() { + return new InspectionResultGenWrapper(); + } + + @Override + public InspectionResultGenVO entityVO(InspectionResult inspectionResult) { + InspectionResultGenVO inspectionResultVO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionResult, InspectionResultGenVO.class)); + + //User createUser = UserCache.getUser(inspectionResult.getCreateUser()); + //User updateUser = UserCache.getUser(inspectionResult.getUpdateUser()); + //inspectionResultVO.setCreateUserName(createUser.getName()); + //inspectionResultVO.setUpdateUserName(updateUser.getName()); + + return inspectionResultVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionTaskGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionTaskGenWrapper.java new file mode 100644 index 000000000..a3e3c5549 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/InspectionTaskGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; + +import java.util.Objects; + +/** + * [检验任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class InspectionTaskGenWrapper extends BaseEntityWrapper { + + public static InspectionTaskGenWrapper build() { + return new InspectionTaskGenWrapper(); + } + + @Override + public InspectionTaskGenVO entityVO(InspectionTask inspectionTask) { + InspectionTaskGenVO inspectionTaskVO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskGenVO.class)); + + //User createUser = UserCache.getUser(inspectionTask.getCreateUser()); + //User updateUser = UserCache.getUser(inspectionTask.getUpdateUser()); + //inspectionTaskVO.setCreateUserName(createUser.getName()); + //inspectionTaskVO.setUpdateUserName(updateUser.getName()); + + return inspectionTaskVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java new file mode 100644 index 000000000..6cebb72cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.Objects; + +/** + * [IOT硬度] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public class IotHardnessGenWrapper extends BaseEntityWrapper { + + public static IotHardnessGenWrapper build() { + return new IotHardnessGenWrapper(); + } + + @Override + public IotHardnessGenVO entityVO(IotHardness iotHardness) { + IotHardnessGenVO iotHardnessVO = Objects.requireNonNull(BeanUtil.copyProperties(iotHardness, IotHardnessGenVO.class)); + + //User createUser = UserCache.getUser(iotHardness.getCreateUser()); + //User updateUser = UserCache.getUser(iotHardness.getUpdateUser()); + //iotHardnessVO.setCreateUserName(createUser.getName()); + //iotHardnessVO.setUpdateUserName(updateUser.getName()); + + return iotHardnessVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java new file mode 100644 index 000000000..589df8655 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.Objects; + +/** + * [IOT硬度] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public class IotThicknessGenWrapper extends BaseEntityWrapper { + + public static IotThicknessGenWrapper build() { + return new IotThicknessGenWrapper(); + } + + @Override + public IotThicknessGenVO entityVO(IotThickness iotThickness) { + IotThicknessGenVO iotThicknessVO = Objects.requireNonNull(BeanUtil.copyProperties(iotThickness, IotThicknessGenVO.class)); + + //User createUser = UserCache.getUser(iotThickness.getCreateUser()); + //User updateUser = UserCache.getUser(iotThickness.getUpdateUser()); + //iotThicknessVO.setCreateUserName(createUser.getName()); + //iotThicknessVO.setUpdateUserName(updateUser.getName()); + + return iotThicknessVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankGenWrapper.java new file mode 100644 index 000000000..ba442491e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankGenVO; +import java.util.Objects; + +/** + * [槽液] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-18 + */ +public class LiquidTankGenWrapper extends BaseEntityWrapper { + + public static LiquidTankGenWrapper build() { + return new LiquidTankGenWrapper(); + } + + @Override + public LiquidTankGenVO entityVO(LiquidTank liquidTank) { + LiquidTankGenVO liquidTankVO = Objects.requireNonNull(BeanUtil.copyProperties(liquidTank, LiquidTankGenVO.class)); + + //User createUser = UserCache.getUser(liquidTank.getCreateUser()); + //User updateUser = UserCache.getUser(liquidTank.getUpdateUser()); + //liquidTankVO.setCreateUserName(createUser.getName()); + //liquidTankVO.setUpdateUserName(updateUser.getName()); + + return liquidTankVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankTaskGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankTaskGenWrapper.java new file mode 100644 index 000000000..2f42f663d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/LiquidTankTaskGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; + +import java.util.Objects; + +/** + * [槽液检测任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class LiquidTankTaskGenWrapper extends BaseEntityWrapper { + + public static LiquidTankTaskGenWrapper build() { + return new LiquidTankTaskGenWrapper(); + } + + @Override + public LiquidTankTaskGenVO entityVO(LiquidTankTask liquidTankTask) { + LiquidTankTaskGenVO liquidTankTaskVO = Objects.requireNonNull(BeanUtil.copyProperties(liquidTankTask, LiquidTankTaskGenVO.class)); + + //User createUser = UserCache.getUser(liquidTankTask.getCreateUser()); + //User updateUser = UserCache.getUser(liquidTankTask.getUpdateUser()); + //liquidTankTaskVO.setCreateUserName(createUser.getName()); + //liquidTankTaskVO.setUpdateUserName(updateUser.getName()); + + return liquidTankTaskVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java new file mode 100644 index 000000000..8e161bf3c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; + +import java.util.Objects; + +/** + * [缺陷] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class NgGenWrapper extends BaseEntityWrapper { + + public static NgGenWrapper build() { + return new NgGenWrapper(); + } + + @Override + public NgGenVO entityVO(Ng ng) { + NgGenVO ngVO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgGenVO.class)); + + //User createUser = UserCache.getUser(ng.getCreateUser()); + //User updateUser = UserCache.getUser(ng.getUpdateUser()); + //ngVO.setCreateUserName(createUser.getName()); + //ngVO.setUpdateUserName(updateUser.getName()); + + return ngVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardGenWrapper.java new file mode 100644 index 000000000..17ba44840 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.vo.gen.StandardGenVO; + +import java.util.Objects; + +/** + * [质量标准] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public class StandardGenWrapper extends BaseEntityWrapper { + + public static StandardGenWrapper build() { + return new StandardGenWrapper(); + } + + @Override + public StandardGenVO entityVO(Standard standard) { + StandardGenVO standardVO = Objects.requireNonNull(BeanUtil.copyProperties(standard, StandardGenVO.class)); + + //User createUser = UserCache.getUser(standard.getCreateUser()); + //User updateUser = UserCache.getUser(standard.getUpdateUser()); + //standardVO.setCreateUserName(createUser.getName()); + //standardVO.setUpdateUserName(updateUser.getName()); + + return standardVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardParamGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardParamGenWrapper.java new file mode 100644 index 000000000..f26e6b014 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/StandardParamGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.StandardParam; +import org.springblade.desk.quality.pojo.vo.gen.StandardParamGenVO; + +import java.util.Objects; + +/** + * [质量标准参数] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-13 + */ +public class StandardParamGenWrapper extends BaseEntityWrapper { + + public static StandardParamGenWrapper build() { + return new StandardParamGenWrapper(); + } + + @Override + public StandardParamGenVO entityVO(StandardParam standardParam) { + StandardParamGenVO standardParamVO = Objects.requireNonNull(BeanUtil.copyProperties(standardParam, StandardParamGenVO.class)); + + //User createUser = UserCache.getUser(standardParam.getCreateUser()); + //User updateUser = UserCache.getUser(standardParam.getUpdateUser()); + //standardParamVO.setCreateUserName(createUser.getName()); + //standardParamVO.setUpdateUserName(updateUser.getName()); + + return standardParamVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java new file mode 100644 index 000000000..1f046701e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.Objects; + +/** + * [追溯链条] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceChainGenWrapper extends BaseEntityWrapper { + + public static TraceChainGenWrapper build() { + return new TraceChainGenWrapper(); + } + + @Override + public TraceChainGenVO entityVO(TraceChain traceChain) { + TraceChainGenVO traceChainVO = Objects.requireNonNull(BeanUtil.copyProperties(traceChain, TraceChainGenVO.class)); + + //User createUser = UserCache.getUser(traceChain.getCreateUser()); + //User updateUser = UserCache.getUser(traceChain.getUpdateUser()); + //traceChainVO.setCreateUserName(createUser.getName()); + //traceChainVO.setUpdateUserName(updateUser.getName()); + + return traceChainVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java new file mode 100644 index 000000000..51d0e4fc7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.Objects; + +/** + * [追溯事件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceEventGenWrapper extends BaseEntityWrapper { + + public static TraceEventGenWrapper build() { + return new TraceEventGenWrapper(); + } + + @Override + public TraceEventGenVO entityVO(TraceEvent traceEvent) { + TraceEventGenVO traceEventVO = Objects.requireNonNull(BeanUtil.copyProperties(traceEvent, TraceEventGenVO.class)); + + //User createUser = UserCache.getUser(traceEvent.getCreateUser()); + //User updateUser = UserCache.getUser(traceEvent.getUpdateUser()); + //traceEventVO.setCreateUserName(createUser.getName()); + //traceEventVO.setUpdateUserName(updateUser.getName()); + + return traceEventVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java new file mode 100644 index 000000000..603739147 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.Objects; + +/** + * [追溯明细] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceItemGenWrapper extends BaseEntityWrapper { + + public static TraceItemGenWrapper build() { + return new TraceItemGenWrapper(); + } + + @Override + public TraceItemGenVO entityVO(TraceItem traceItem) { + TraceItemGenVO traceItemVO = Objects.requireNonNull(BeanUtil.copyProperties(traceItem, TraceItemGenVO.class)); + + //User createUser = UserCache.getUser(traceItem.getCreateUser()); + //User updateUser = UserCache.getUser(traceItem.getUpdateUser()); + //traceItemVO.setCreateUserName(createUser.getName()); + //traceItemVO.setUpdateUserName(updateUser.getName()); + + return traceItemVO; + } + +} diff --git a/blade-service/blade-desk/src/test/java/org/springblade/desk/quality/service/LiquidTankTaskServiceTest.java b/blade-service/blade-desk/src/test/java/org/springblade/desk/quality/service/LiquidTankTaskServiceTest.java new file mode 100644 index 000000000..805e44e75 --- /dev/null +++ b/blade-service/blade-desk/src/test/java/org/springblade/desk/quality/service/LiquidTankTaskServiceTest.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +class LiquidTankTaskServiceTest { + + @Resource + private LiquidTankTaskService liquidTankTaskService; + + void contextLoads() { + + } +} diff --git a/blade-service/blade-desk/target/antrun/build-main.xml b/blade-service/blade-desk/target/antrun/build-main.xml deleted file mode 100644 index 164be7b76..000000000 --- a/blade-service/blade-desk/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/BomMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/BomMapper.xml deleted file mode 100644 index 9bea6b253..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/BomMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftAbilityMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftAbilityMapper.xml deleted file mode 100644 index 8f8100eb1..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftAbilityMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaDetailMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaDetailMapper.xml deleted file mode 100644 index 842d69604..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaDetailMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingMapper.xml deleted file mode 100644 index 91e431d54..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeAssignMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeAssignMapper.xml deleted file mode 100644 index 61f734e87..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeAssignMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeMapper.xml deleted file mode 100644 index cc205ae2c..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeSmallMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeSmallMapper.xml deleted file mode 100644 index 0ab8b6c9f..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PlatingTypeSmallMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProDetailMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProDetailMapper.xml deleted file mode 100644 index c9f86a4d1..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProDetailMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE DS_PRO_DETAIL - SET is_deleted = 1 - WHERE MODEL_ID IN - - #{id} - - - - - delete from DS_PRO_DETAIL where MODEL_ID =#{modelId}; - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProModelMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProModelMapper.xml deleted file mode 100644 index 1deae81a0..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProModelMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml deleted file mode 100644 index 5e52a910a..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMapper.xml deleted file mode 100644 index 371801bf0..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessSetMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessSetMapper.xml deleted file mode 100644 index 63ef941a4..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessSetMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessTeamMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessTeamMapper.xml deleted file mode 100644 index 24af909de..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessTeamMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - delete from BS_PROCESS_TEAM - where pps_id = #{pid}; - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TaskingMapper.xml deleted file mode 100644 index f5055e183..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TeamSetMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TeamSetMapper.xml deleted file mode 100644 index c0b1e8130..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/TeamSetMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/LeaveMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/LeaveMapper.xml deleted file mode 100644 index 8b48a69ff..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/LeaveMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/NoticeMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/NoticeMapper.xml deleted file mode 100644 index 6383cfd48..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/notice/mapper/NoticeMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/maven-archiver/pom.properties b/blade-service/blade-desk/target/maven-archiver/pom.properties deleted file mode 100644 index 4c320e306..000000000 --- a/blade-service/blade-desk/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Nov 12 11:17:17 CST 2025 -groupId=org.springblade -artifactId=blade-desk -version=4.6.0.RELEASE diff --git a/blade-service/blade-erpdata/Dockerfile b/blade-service/blade-erpdata/Dockerfile new file mode 100644 index 000000000..1f292371c --- /dev/null +++ b/blade-service/blade-erpdata/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk17_cn_slim + +LABEL maintainer="bladejava@qq.com" + +RUN mkdir -p /blade/erp + +WORKDIR /blade/erp + +EXPOSE 8105 + +COPY ./target/blade-erp.jar ./app.jar + +ENTRYPOINT ["java", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/blade-service/blade-erpdata/README.md b/blade-service/blade-erpdata/README.md new file mode 100644 index 000000000..f0e109258 --- /dev/null +++ b/blade-service/blade-erpdata/README.md @@ -0,0 +1,6 @@ +## 系统说明 + +ERP数据模块，配置ERP数据库 + +1. 从ERP数据库中查询视图，用于同步ERP数据 +2. 更新数据到ERP数据库 \ No newline at end of file diff --git a/blade-service/blade-erpdata/pom.xml b/blade-service/blade-erpdata/pom.xml new file mode 100644 index 000000000..9e3523417 --- /dev/null +++ b/blade-service/blade-erpdata/pom.xml @@ -0,0 +1,57 @@ + + + + + org.springblade + blade-service + ${revision} + + + 4.0.0 + blade-erpdata + ${project.artifactId} + jar + + + + org.springblade + blade-core-boot + + + org.springblade + blade-starter-swagger + + + + org.springblade + blade-job-api + 4.6.0.RELEASE + compile + + + + cn.hutool + hutool-all + 5.8.16 + + + + + + + io.fabric8 + docker-maven-plugin + + ${docker.fabric.skip} + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java new file mode 100644 index 000000000..174805ceb --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java @@ -0,0 +1,25 @@ +package org.springblade.erpdata; + +import org.springblade.core.cloud.client.BladeCloudApplication; +import org.springblade.core.launch.BladeApplication; +import org.springblade.core.launch.constant.AppConstant; + +/** + * Desk启动器 + * + * @author Chill + */ +@BladeCloudApplication +public class ErpDataApplication { + + public static void main(String[] args) { + BladeApplication.run(AppConstant.APPLICATION_DESK_NAME, ErpDataApplication.class, args); + System.out.println("==================="); + System.out.println("==================="); + System.out.println("=======启动成功！===="); + System.out.println("==================="); + System.out.println("==================="); + } + +} + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/constant/FormulaConst.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/constant/FormulaConst.java new file mode 100644 index 000000000..a5d01ff2f --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/constant/FormulaConst.java @@ -0,0 +1,13 @@ +package org.springblade.erpdata.basic.constant; + +public interface FormulaConst { + + /** + * + */ + final Integer TYPE_1 = 1; + /** + * + */ + final Integer TYPE_2 = 2; +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.java new file mode 100644 index 000000000..28c65f2a6 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.java @@ -0,0 +1,12 @@ +package org.springblade.erpdata.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.Mapper; + +/** + * Mapper 接口 + * + * @author lqk + */ +public interface ErpDataSearchMapper extends Mapper { + +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.xml new file mode 100644 index 000000000..09e3b90d9 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/mapper/ErpDataSearchMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/IErpDataSearchService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/IErpDataSearchService.java new file mode 100644 index 000000000..2771b245a --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/IErpDataSearchService.java @@ -0,0 +1,10 @@ +package org.springblade.erpdata.basic.service; + +/** + * ERP数据查询service + * + * @author lqk + */ +public interface IErpDataSearchService { + +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/impl/ErpDataSearchServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/impl/ErpDataSearchServiceImpl.java new file mode 100644 index 000000000..52d5c1110 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/basic/service/impl/ErpDataSearchServiceImpl.java @@ -0,0 +1,14 @@ +package org.springblade.erpdata.basic.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.springblade.erpdata.basic.service.IErpDataSearchService; +import org.springframework.stereotype.Service; + +/** + * @author lqk + * @date 2025-11-26 9:39 + */ +@Slf4j +@Service +public class ErpDataSearchServiceImpl implements IErpDataSearchService { +} diff --git a/blade-service/blade-desk/target/classes/application-dev.yml b/blade-service/blade-erpdata/src/main/resources/application-dev.yml similarity index 100% rename from blade-service/blade-desk/target/classes/application-dev.yml rename to blade-service/blade-erpdata/src/main/resources/application-dev.yml diff --git a/blade-service/blade-desk/target/classes/application-prod.yml b/blade-service/blade-erpdata/src/main/resources/application-prod.yml similarity index 100% rename from blade-service/blade-desk/target/classes/application-prod.yml rename to blade-service/blade-erpdata/src/main/resources/application-prod.yml diff --git a/blade-service/blade-desk/target/classes/application-test.yml b/blade-service/blade-erpdata/src/main/resources/application-test.yml similarity index 100% rename from blade-service/blade-desk/target/classes/application-test.yml rename to blade-service/blade-erpdata/src/main/resources/application-test.yml diff --git a/blade-service/blade-monitor/.gitignore b/blade-service/blade-monitor/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service/blade-monitor/.gitignore +++ b/blade-service/blade-monitor/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service/blade-monitor/blade-monitor.iml b/blade-service/blade-monitor/blade-monitor.iml deleted file mode 100644 index 309cb675e..000000000 --- a/blade-service/blade-monitor/blade-monitor.iml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service/blade-scheduling/.flattened-pom.xml b/blade-service/blade-scheduling/.flattened-pom.xml deleted file mode 100644 index a786a7bc9..000000000 --- a/blade-service/blade-scheduling/.flattened-pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - 4.0.0 - org.springblade - blade-scheduling - 4.6.0.RELEASE - blade-scheduling - BladeX 微服务集合 - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-desk-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-user-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-scheduling-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-api-crypto - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-record-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-scope-api - 4.6.0.RELEASE - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service/blade-scheduling/.gitignore b/blade-service/blade-scheduling/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service/blade-scheduling/.gitignore +++ b/blade-service/blade-scheduling/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service/blade-scheduling/blade-scheduling.iml b/blade-service/blade-scheduling/blade-scheduling.iml deleted file mode 100644 index 239f545f8..000000000 --- a/blade-service/blade-scheduling/blade-scheduling.iml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service/blade-scheduling/target/blade-scheduling.jar.original b/blade-service/blade-scheduling/target/blade-scheduling.jar.original deleted file mode 100644 index e935bb247..000000000 Binary files a/blade-service/blade-scheduling/target/blade-scheduling.jar.original and /dev/null differ diff --git a/blade-service/blade-scheduling/target/classes/application-dev.yml b/blade-service/blade-scheduling/target/classes/application-dev.yml deleted file mode 100644 index 732fb6735..000000000 --- a/blade-service/blade-scheduling/target/classes/application-dev.yml +++ /dev/null @@ -1,11 +0,0 @@ -#服务器端口 -server: - port: 8107 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} - diff --git a/blade-service/blade-scheduling/target/classes/application-prod.yml b/blade-service/blade-scheduling/target/classes/application-prod.yml deleted file mode 100644 index 54a5e2af8..000000000 --- a/blade-service/blade-scheduling/target/classes/application-prod.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8107 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} diff --git a/blade-service/blade-scheduling/target/classes/application-test.yml b/blade-service/blade-scheduling/target/classes/application-test.yml deleted file mode 100644 index ebd6d7703..000000000 --- a/blade-service/blade-scheduling/target/classes/application-test.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8107 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-service/blade-scheduling/target/maven-archiver/pom.properties b/blade-service/blade-scheduling/target/maven-archiver/pom.properties deleted file mode 100644 index fd9def165..000000000 --- a/blade-service/blade-scheduling/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Nov 10 17:04:08 CST 2025 -groupId=org.springblade -artifactId=blade-scheduling -version=4.6.0.RELEASE diff --git a/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 476d50e7a..000000000 --- a/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -org\springblade\scheduling\SchedulingApplication.class diff --git a/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 0b37950a9..000000000 --- a/blade-service/blade-scheduling/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-scheduling\src\main\java\org\springblade\scheduling\SchedulingApplication.java diff --git a/blade-service/blade-service.iml b/blade-service/blade-service.iml deleted file mode 100644 index d0bd51baf..000000000 --- a/blade-service/blade-service.iml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service/blade-system/.flattened-pom.xml b/blade-service/blade-system/.flattened-pom.xml deleted file mode 100644 index 128b77126..000000000 --- a/blade-service/blade-system/.flattened-pom.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - 4.0.0 - org.springblade - blade-system - 4.6.0.RELEASE - blade-system - BladeX 微服务集合 - - - org.springblade - blade-core-boot - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-excel - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-swagger - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-literule - 4.6.0.RELEASE - compile - - - org.springblade - blade-system-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-user-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-common - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-metrics - 4.6.0.RELEASE - compile - - - org.springblade - blade-starter-api-crypto - 4.6.0.RELEASE - compile - - - org.springblade - blade-dict-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-record-api - 4.6.0.RELEASE - compile - - - org.springblade - blade-scope-api - 4.6.0.RELEASE - compile - - - io.swagger.core.v3 - swagger-annotations - 2.2.19 - compile - - - org.springblade - blade-starter-tenant - 4.6.0.RELEASE - compile - - - com.oracle.database.jdbc - ojdbc8 - 21.5.0.0 - compile - - - com.oracle.database.nls - orai18n - 19.15.0.0 - compile - - - org.projectlombok - lombok - 1.18.36 - provided - - - diff --git a/blade-service/blade-system/.gitignore b/blade-service/blade-system/.gitignore index f364341cd..a70db8f70 100644 --- a/blade-service/blade-system/.gitignore +++ b/blade-service/blade-system/.gitignore @@ -1,9 +1,39 @@ -###################################################################### -# Build Tools +# maven # +target +logs +!.mvn/wrapper/maven-wrapper.jar +# gradle .gradle /build/ !gradle/wrapper/gradle-wrapper.jar -target/ -!.mvn/wrapper/maven-wrapper.jar \ No newline at end of file +# windows # +Thumbs.db + +# Mac # +.DS_Store + +# eclipse # +.settings +.project +.classpath +.log +*.class + +# vscode # +.vscode + +# idea # +.idea +*.iml + +# Package Files # +*.jar +*.war +*.ear +/target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-service/blade-system/blade-system.iml b/blade-service/blade-system/blade-system.iml deleted file mode 100644 index 4c84a69a6..000000000 --- a/blade-service/blade-system/blade-system.iml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blade-service/blade-system/target/antrun/build-main.xml b/blade-service/blade-system/target/antrun/build-main.xml deleted file mode 100644 index 30998ec1a..000000000 --- a/blade-service/blade-system/target/antrun/build-main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/blade-service/blade-system/target/blade-system.jar.original b/blade-service/blade-system/target/blade-system.jar.original deleted file mode 100644 index de8473460..000000000 Binary files a/blade-service/blade-system/target/blade-system.jar.original and /dev/null differ diff --git a/blade-service/blade-system/target/classes/application-dev.yml b/blade-service/blade-system/target/classes/application-dev.yml deleted file mode 100644 index 216bd1983..000000000 --- a/blade-service/blade-system/target/classes/application-dev.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8106 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} \ No newline at end of file diff --git a/blade-service/blade-system/target/classes/application-prod.yml b/blade-service/blade-system/target/classes/application-prod.yml deleted file mode 100644 index 25635bc41..000000000 --- a/blade-service/blade-system/target/classes/application-prod.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8106 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} diff --git a/blade-service/blade-system/target/classes/application-test.yml b/blade-service/blade-system/target/classes/application-test.yml deleted file mode 100644 index fb5cd8f73..000000000 --- a/blade-service/blade-system/target/classes/application-test.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8106 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} diff --git a/blade-service/blade-system/target/classes/liteflow/tenant.el.png b/blade-service/blade-system/target/classes/liteflow/tenant.el.png deleted file mode 100644 index a54c31cce..000000000 Binary files a/blade-service/blade-system/target/classes/liteflow/tenant.el.png and /dev/null differ diff --git a/blade-service/blade-system/target/classes/liteflow/tenant.el.xml b/blade-service/blade-system/target/classes/liteflow/tenant.el.xml deleted file mode 100644 index 4b4383cbe..000000000 --- a/blade-service/blade-system/target/classes/liteflow/tenant.el.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - THEN( - tenantRule, - WHEN( - tenantRoleRule, - tenantRoleMenuRule, - tenantDeptRule, - tenantPostRule, - tenantDictBizRule, - tenantUserRule - ) - ); - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/ApiScopeMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/ApiScopeMapper.xml deleted file mode 100644 index 5d62dc082..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/ApiScopeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/AuthClientMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/AuthClientMapper.xml deleted file mode 100644 index b07515555..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/AuthClientMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DataScopeMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/DataScopeMapper.xml deleted file mode 100644 index cbb465949..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DataScopeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/DeptMapper.xml deleted file mode 100644 index 9f825fac3..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DeptMapper.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictBizMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictBizMapper.xml deleted file mode 100644 index 0e29f2427..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictBizMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictMapper.xml deleted file mode 100644 index 3034cfd1e..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/DictMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/MenuMapper.xml deleted file mode 100644 index 43069eeb4..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/MenuMapper.xml +++ /dev/null @@ -1,478 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/ParamMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/ParamMapper.xml deleted file mode 100644 index fb17268dc..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/ParamMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/PostMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/PostMapper.xml deleted file mode 100644 index 0016ad429..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/PostMapper.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RecordDataMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/RecordDataMapper.xml deleted file mode 100644 index 96a98daaf..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RecordDataMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RegionMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/RegionMapper.xml deleted file mode 100644 index 7d83a3b14..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RegionMapper.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMapper.xml deleted file mode 100644 index ea5dd263f..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMenuMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMenuMapper.xml deleted file mode 100644 index 23c2d4433..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleMenuMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleScopeMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleScopeMapper.xml deleted file mode 100644 index 546183df7..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/RoleScopeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantDatasourceMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantDatasourceMapper.xml deleted file mode 100644 index fbef346d2..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantDatasourceMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantMapper.xml deleted file mode 100644 index d75b38f82..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantPackageMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantPackageMapper.xml deleted file mode 100644 index 245dbb652..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TenantPackageMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuMapper.xml deleted file mode 100644 index 42cdc9c9f..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuSettingMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuSettingMapper.xml deleted file mode 100644 index 5de98e4cf..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/TopMenuSettingMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserAppMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserAppMapper.xml deleted file mode 100644 index 33243afb6..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserAppMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserDeptMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserDeptMapper.xml deleted file mode 100644 index 843e0838d..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserDeptMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserMapper.xml deleted file mode 100644 index 894059a90..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOauthMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOauthMapper.xml deleted file mode 100644 index f07facee1..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOauthMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOtherMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOtherMapper.xml deleted file mode 100644 index 6507b8f46..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserOtherMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserWebMapper.xml b/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserWebMapper.xml deleted file mode 100644 index 8dcd33cf9..000000000 --- a/blade-service/blade-system/target/classes/org/springblade/system/mapper/UserWebMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/blade-service/blade-system/target/maven-archiver/pom.properties b/blade-service/blade-system/target/maven-archiver/pom.properties deleted file mode 100644 index d25944c3f..000000000 --- a/blade-service/blade-system/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Fri Nov 07 14:05:38 CST 2025 -groupId=org.springblade -artifactId=blade-system -version=4.6.0.RELEASE diff --git a/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 284ede991..000000000 --- a/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,125 +0,0 @@ -org\springblade\system\feign\DataRecordClient.class -org\springblade\system\service\IRoleMenuService.class -org\springblade\system\wrapper\UserWrapper.class -org\springblade\system\service\impl\UserDeptServiceImpl.class -org\springblade\system\feign\ApiScopeClient.class -org\springblade\system\feign\UserClient.class -org\springblade\system\service\ITopMenuSettingService.class -org\springblade\system\service\impl\TenantDatasourceServiceImpl.class -org\springblade\system\controller\PostController.class -org\springblade\system\rule\tenant\TenantRoleRule.class -org\springblade\system\service\impl\ParamServiceImpl.class -org\springblade\system\mapper\DeptMapper.class -org\springblade\system\service\impl\RoleScopeServiceImpl.class -org\springblade\system\service\IRoleService.class -org\springblade\system\mapper\TopMenuSettingMapper.class -org\springblade\system\wrapper\TenantWrapper.class -org\springblade\system\service\IUserOauthService.class -org\springblade\system\service\IDeptService.class -org\springblade\system\mapper\DataScopeMapper.class -org\springblade\system\wrapper\DeptWrapper.class -org\springblade\system\controller\SearchController.class -org\springblade\system\mapper\PostMapper.class -org\springblade\system\mapper\ApiScopeMapper.class -org\springblade\system\service\impl\DeptServiceImpl.class -org\springblade\system\mapper\UserOauthMapper.class -org\springblade\system\service\impl\UserOauthServiceImpl.class -org\springblade\system\controller\ApiScopeController.class -org\springblade\system\wrapper\DataScopeWrapper.class -org\springblade\system\mapper\DictBizMapper.class -org\springblade\system\rule\tenant\TenantUserRule.class -org\springblade\system\wrapper\DictBizWrapper.class -org\springblade\system\service\impl\RegionServiceImpl.class -org\springblade\system\service\ITenantService.class -org\springblade\system\service\impl\RoleServiceImpl.class -org\springblade\system\service\impl\UserSearchServiceImpl.class -org\springblade\system\feign\DataScopeClient.class -org\springblade\system\service\IUserSearchService.class -org\springblade\system\excel\RegionExcel.class -org\springblade\system\mapper\RegionMapper.class -org\springblade\system\controller\UserController.class -org\springblade\system\rule\context\TenantContext$TenantContextBuilder.class -org\springblade\system\feign\SysClient.class -org\springblade\system\service\impl\TopMenuSettingServiceImpl.class -org\springblade\system\wrapper\DictWrapper.class -org\springblade\system\feign\DictClient.class -org\springblade\system\service\IApiScopeService.class -org\springblade\system\rule\tenant\TenantRule.class -org\springblade\system\service\IUserDeptService.class -org\springblade\system\controller\DeptController.class -org\springblade\system\controller\RecordDataController.class -org\springblade\system\feign\UserSearchClient.class -org\springblade\system\service\impl\DictBizServiceImpl.class -org\springblade\system\mapper\UserDeptMapper.class -org\springblade\system\mapper\UserMapper.class -org\springblade\system\wrapper\MenuWrapper.class -org\springblade\system\rule\constant\TenantRuleConstant.class -org\springblade\system\controller\TenantController.class -org\springblade\system\mapper\AuthClientMapper.class -org\springblade\system\controller\RoleController.class -org\springblade\system\service\impl\ApiScopeServiceImpl.class -org\springblade\system\service\impl\UserServiceImpl.class -org\springblade\system\mapper\TenantDatasourceMapper.class -org\springblade\system\service\impl\RecordDataServiceImpl.class -org\springblade\system\controller\MenuController.class -org\springblade\system\controller\ParamController.class -org\springblade\system\controller\DataScopeController.class -org\springblade\system\service\impl\DataScopeServiceImpl.class -org\springblade\system\service\ITenantPackageService.class -org\springblade\system\rule\tenant\TenantRoleMenuRule.class -org\springblade\system\service\IRegionService.class -org\springblade\system\service\impl\AuthClientServiceImpl.class -org\springblade\system\service\IPostService.class -org\springblade\system\service\impl\DictServiceImpl.class -org\springblade\system\mapper\TenantMapper.class -org\springblade\system\wrapper\RegionWrapper.class -org\springblade\system\controller\AuthClientController.class -org\springblade\system\service\ITenantDatasourceService.class -org\springblade\system\wrapper\RecordDataWrapper.class -org\springblade\system\mapper\RoleScopeMapper.class -org\springblade\system\service\impl\PostServiceImpl.class -org\springblade\system\wrapper\ApiScopeWrapper.class -org\springblade\system\mapper\TenantPackageMapper.class -org\springblade\system\rule\context\TenantContext.class -org\springblade\system\service\impl\TenantPackageServiceImpl.class -org\springblade\system\excel\UserExcel.class -org\springblade\system\mapper\RoleMapper.class -org\springblade\system\service\IRecordDataService.class -org\springblade\system\service\ITopMenuService.class -org\springblade\system\mapper\DictMapper.class -org\springblade\system\SystemApplication.class -org\springblade\system\wrapper\RoleWrapper.class -org\springblade\system\controller\TenantPackageController.class -org\springblade\system\service\impl\RoleMenuServiceImpl.class -org\springblade\system\mapper\ParamMapper.class -org\springblade\system\service\IUserService.class -org\springblade\system\controller\DictController.class -org\springblade\system\rule\tenant\TenantDeptRule.class -org\springblade\system\rule\tenant\TenantPostRule.class -org\springblade\system\service\impl\TopMenuServiceImpl.class -org\springblade\system\controller\TenantDatasourceController.class -org\springblade\system\mapper\MenuMapper.class -org\springblade\system\service\IRoleScopeService.class -org\springblade\system\mapper\RecordDataMapper.class -org\springblade\system\mapper\UserWebMapper.class -org\springblade\system\service\IMenuService.class -org\springblade\system\mapper\TopMenuMapper.class -org\springblade\system\service\IParamService.class -org\springblade\system\excel\RegionImporter.class -org\springblade\system\controller\RegionController.class -org\springblade\system\service\IDataScopeService.class -org\springblade\system\service\IDictService.class -org\springblade\system\mapper\UserAppMapper.class -org\springblade\system\service\IAuthClientService.class -org\springblade\system\service\impl\TenantServiceImpl.class -org\springblade\system\mapper\RoleMenuMapper.class -org\springblade\system\rule\tenant\TenantDictBizRule.class -org\springblade\system\controller\TopMenuController.class -org\springblade\system\feign\DictBizClient.class -org\springblade\system\controller\DictBizController.class -org\springblade\system\excel\UserImporter.class -org\springblade\system\service\impl\MenuServiceImpl.class -org\springblade\system\mapper\UserOtherMapper.class -org\springblade\system\wrapper\PostWrapper.class -org\springblade\system\rule\builder\TenantRuleBuilder.class -org\springblade\system\service\IDictBizService.class diff --git a/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 9da9d8bdf..000000000 --- a/blade-service/blade-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,124 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\TopMenuSettingMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\excel\UserImporter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\ParamMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IUserDeptService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\TenantPackageController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\RecordDataServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\MenuController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\ApiScopeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\RecordDataWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IRoleService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserOauthMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\excel\UserExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\DataScopeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\DictServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\PostMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\ApiScopeWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\DictBizController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\context\TenantContext.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\TenantPackageServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\PostController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantDeptRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\RegionController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IMenuService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IRecordDataService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\ITenantService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IUserSearchService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\SystemApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\DictWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\RoleWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\DeptServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\UserServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\RecordDataController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\MenuWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\DictBizWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\RecordDataMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantRoleMenuRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\UserOauthServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantRoleRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\RegionMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantUserRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\ITenantDatasourceService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\SysClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IDictBizService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\TenantPackageMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\TopMenuMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\RoleMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\ParamServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\TopMenuController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\DictClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\DataScopeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\TenantDatasourceMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\ApiScopeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\RegionServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IParamService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\RoleController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\TenantController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\DictBizClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\DictBizMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\UserSearchServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\TenantDatasourceServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IDictService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\UserClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\UserController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\SearchController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserAppMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserDeptMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\DeptWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\excel\RegionExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\ITopMenuSettingService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IUserOauthService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\DeptController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\RegionWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\ApiScopeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\DataRecordClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\ApiScopeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\RoleScopeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\AuthClientMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantDictBizRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\TopMenuServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\TenantServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IRoleScopeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\ITopMenuService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\PostWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\DataScopeWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\AuthClientController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IDeptService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\UserDeptServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\DictMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\RoleMenuServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\TenantDatasourceController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IRegionService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\excel\RegionImporter.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IDataScopeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\RoleMenuMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\AuthClientServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserOtherMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\DictBizServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IApiScopeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\ITenantPackageService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IUserService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\DataScopeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\RoleServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\MenuMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\MenuServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\TenantMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\TenantWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\DictController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\PostServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IPostService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\wrapper\UserWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\controller\ParamController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\DeptMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\TopMenuSettingServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\constant\TenantRuleConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\RoleScopeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IAuthClientService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\feign\UserSearchClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\builder\TenantRuleBuilder.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\impl\DataScopeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\service\IRoleMenuService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\rule\tenant\TenantPostRule.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-system\src\main\java\org\springblade\system\mapper\UserWebMapper.java diff --git a/blade-service/pom.xml b/blade-service/pom.xml index cb2ab4b8f..3e6f6256a 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -21,6 +21,7 @@ blade-system blade-scheduling blade-monitor + blade-erpdata diff --git a/doc/sql/mes/order.sql b/doc/sql/mes/order.sql new file mode 100644 index 000000000..429edd028 --- /dev/null +++ b/doc/sql/mes/order.sql @@ -0,0 +1,647 @@ +-- 生产计划 +CREATE TABLE mes_yield_plan +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + yp_code NVARCHAR2(255) NOT NULL ENABLE, + part_code NVARCHAR2(255) NOT NULL ENABLE, + product_type NVARCHAR2(255), + part_name NVARCHAR2(255) NOT NULL ENABLE, + plate NVARCHAR2(255), + product_ident NVARCHAR2(255), + use_dept NVARCHAR2(255), + yp_qty NUMBER NOT NULL ENABLE, + yp_area NUMBER(20, 10) NOT NULL ENABLE, + demand_date DATE, + plan_user NVARCHAR2(255), + release_date DATE, + roam_no NVARCHAR2(255), + delivery_qty NUMBER NOT NULL ENABLE, + already_branch_qty NUMBER NOT NULL ENABLE, + cur_status NUMBER DEFAULT 0 NOT NULL ENABLE, + primary_craft NVARCHAR2(900), + sync_time DATE NOT NULL ENABLE, + dominant_dept NVARCHAR2(255), + memo NVARCHAR2(255), + route_no NVARCHAR2(255), + custodian NVARCHAR2(255), + bps_id NUMBER(18, 0), + priority NUMBER DEFAULT 1, + plan_type NUMBER DEFAULT 1 NOT NULL ENABLE, + sure_type NUMBER, + close_man NUMBER(18, 0), + close_time DATE, + product_line NVARCHAR2(255), + CONSTRAINT mes_yield_plan_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_yield_plan IS '生产计划'; +COMMENT ON COLUMN mes_yield_plan.id IS '主键'; +COMMENT ON COLUMN mes_yield_plan.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_yield_plan.create_user IS '创建人'; +COMMENT ON COLUMN mes_yield_plan.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_yield_plan.create_time IS '创建时间'; +COMMENT ON COLUMN mes_yield_plan.update_user IS '修改人'; +COMMENT ON COLUMN mes_yield_plan.update_time IS '修改时间'; +COMMENT ON COLUMN mes_yield_plan.status IS '状态'; +COMMENT ON COLUMN mes_yield_plan.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_yield_plan.yp_code IS '订单单号'; +COMMENT ON COLUMN mes_yield_plan.part_code IS '零件号'; +COMMENT ON COLUMN mes_yield_plan.product_type IS '产品型号'; +COMMENT ON COLUMN mes_yield_plan.part_name IS '名称'; +COMMENT ON COLUMN mes_yield_plan.plate IS '镀种'; +COMMENT ON COLUMN mes_yield_plan.product_ident IS '生产标识'; +COMMENT ON COLUMN mes_yield_plan.use_dept IS '使用部门'; +COMMENT ON COLUMN mes_yield_plan.yp_qty IS '数量'; +COMMENT ON COLUMN mes_yield_plan.yp_area IS '面积（㎡）'; +COMMENT ON COLUMN mes_yield_plan.demand_date IS '需求交期'; +COMMENT ON COLUMN mes_yield_plan.plan_user IS '计划员'; +COMMENT ON COLUMN mes_yield_plan.release_date IS '计划下达时间'; +COMMENT ON COLUMN mes_yield_plan.roam_no IS '当前B号'; +COMMENT ON COLUMN mes_yield_plan.delivery_qty IS '已交件数量'; +COMMENT ON COLUMN mes_yield_plan.already_branch_qty IS '已分批数量'; +COMMENT ON COLUMN mes_yield_plan.cur_status IS '状态;1.正常，2.已退回，3.已派工，4，加工中，20已完工，21已作废'; +COMMENT ON COLUMN mes_yield_plan.primary_craft IS '一级工艺线路'; +COMMENT ON COLUMN mes_yield_plan.sync_time IS '同步日期'; +COMMENT ON COLUMN mes_yield_plan.dominant_dept IS '主制部门'; +COMMENT ON COLUMN mes_yield_plan.memo IS '备注'; +COMMENT ON COLUMN mes_yield_plan.bps_id IS '镀种小类'; +COMMENT ON COLUMN mes_yield_plan.priority IS '优先级;1.正常，2.项目要求日期急件，3.合同急件，4.绩效零件，5.调度标注急件'; +COMMENT ON COLUMN mes_yield_plan.sure_type IS '是否确认;是否确认(烧结计划专用，默认为空，1是代表确认，烧结计划不显示)'; +COMMENT ON COLUMN mes_yield_plan.close_man IS '关闭人'; +COMMENT ON COLUMN mes_yield_plan.close_time IS '关闭时间'; +COMMENT ON COLUMN mes_yield_plan.product_line IS '产品系列'; + +-- 生产订单 +CREATE TABLE mes_yield_order +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + yo_code NVARCHAR2(255) NOT NULL ENABLE, + yp_code NVARCHAR2(255), + part_code NVARCHAR2(255) NOT NULL ENABLE, + product_type NVARCHAR2(255), + part_name NVARCHAR2(255), + plate NVARCHAR2(255), + product_ident NVARCHAR2(255) NOT NULL ENABLE, + use_dept NVARCHAR2(255), + yp_area NUMBER(20, 10) NOT NULL ENABLE, + demand_date DATE, + plan_user NVARCHAR2(255), + release_date DATE, + memo NVARCHAR2(255), + card_no NVARCHAR2(255) NOT NULL ENABLE, + batch_no NVARCHAR2(255) NOT NULL ENABLE, + site_work CHAR(1) NOT NULL ENABLE, + yp_qty NUMBER NOT NULL ENABLE, + sync_time DATE NOT NULL ENABLE, + cur_status NUMBER NOT NULL ENABLE, + roam_no NVARCHAR2(255), + primary_craft NVARCHAR2(900), + next_roam NVARCHAR2(255), + pdm_url NVARCHAR2(255), + priority NUMBER, + custodian NVARCHAR2(255), + rework_code NVARCHAR2(255), + rework_no NUMBER, + entrust_dept NVARCHAR2(255), + rework_memo NVARCHAR2(900), + failure_memo NVARCHAR2(900), + business_type NUMBER DEFAULT -1 NOT NULL ENABLE, + failure_man NUMBER(18, 0), + failure_time DATE, + recseq_no NVARCHAR2(255), + cart_id NUMBER(18, 0), + manual_increase CHAR(1) DEFAULT 0, + yield_type NUMBER DEFAULT 1 NOT NULL ENABLE, + father_yo_id NUMBER(18, 0), + newlev_flag NVARCHAR2(255), + produce_bool CHAR(1) DEFAULT 0, + use_dept_code NVARCHAR2(255), + yp_product_line NVARCHAR2(255), + yp_memo NVARCHAR2(255), + sj_mold_preparation NUMBER(18, 0), + sj_kit_preparation NUMBER(18, 0), + pk_username NVARCHAR2(255), + pk_date DATE, + kit_preparation_man NVARCHAR2(255), + kit_preparation_time DATE, + CONSTRAINT mes_yield_order_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_yield_order IS '生产订单'; +COMMENT ON COLUMN mes_yield_order.id IS '主键'; +COMMENT ON COLUMN mes_yield_order.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_yield_order.create_user IS '创建人'; +COMMENT ON COLUMN mes_yield_order.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_yield_order.create_time IS '创建时间'; +COMMENT ON COLUMN mes_yield_order.update_user IS '修改人'; +COMMENT ON COLUMN mes_yield_order.update_time IS '修改时间'; +COMMENT ON COLUMN mes_yield_order.status IS '状态'; +COMMENT ON COLUMN mes_yield_order.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_yield_order.yo_code IS '生产单号'; +COMMENT ON COLUMN mes_yield_order.yp_code IS '计划单号'; +COMMENT ON COLUMN mes_yield_order.part_code IS '零件号'; +COMMENT ON COLUMN mes_yield_order.product_type IS '产品型号'; +COMMENT ON COLUMN mes_yield_order.part_name IS '名称'; +COMMENT ON COLUMN mes_yield_order.plate IS '镀种'; +COMMENT ON COLUMN mes_yield_order.product_ident IS '生产标识'; +COMMENT ON COLUMN mes_yield_order.use_dept IS '使用部门'; +COMMENT ON COLUMN mes_yield_order.yp_area IS '面积（㎡）'; +COMMENT ON COLUMN mes_yield_order.demand_date IS '需求交期'; +COMMENT ON COLUMN mes_yield_order.plan_user IS '计划员'; +COMMENT ON COLUMN mes_yield_order.release_date IS '计划下达时间'; +COMMENT ON COLUMN mes_yield_order.memo IS '备注'; +COMMENT ON COLUMN mes_yield_order.card_no IS '路线卡号'; +COMMENT ON COLUMN mes_yield_order.batch_no IS '批次号'; +COMMENT ON COLUMN mes_yield_order.site_work IS '场内生产'; +COMMENT ON COLUMN mes_yield_order.yp_qty IS '生产数量'; +COMMENT ON COLUMN mes_yield_order.sync_time IS '同步日期'; +COMMENT ON COLUMN mes_yield_order.cur_status IS '状态'; +COMMENT ON COLUMN mes_yield_order.roam_no IS 'B号'; +COMMENT ON COLUMN mes_yield_order.primary_craft IS '一级路线'; +COMMENT ON COLUMN mes_yield_order.next_roam IS '下级B号'; +COMMENT ON COLUMN mes_yield_order.custodian IS '保管员'; +COMMENT ON COLUMN mes_yield_order.rework_code IS '返工单号'; +COMMENT ON COLUMN mes_yield_order.rework_no IS '返工顺序'; +COMMENT ON COLUMN mes_yield_order.rework_memo IS '返工意见'; +COMMENT ON COLUMN mes_yield_order.failure_memo IS '失败原因'; +COMMENT ON COLUMN mes_yield_order.business_type IS '业务类型'; +COMMENT ON COLUMN mes_yield_order.failure_man IS '分派失败人员'; +COMMENT ON COLUMN mes_yield_order.failure_time IS '接收时间'; +COMMENT ON COLUMN mes_yield_order.manual_increase IS '手动增加'; +COMMENT ON COLUMN mes_yield_order.father_yo_id IS '父级订单Id'; +COMMENT ON COLUMN mes_yield_order.produce_bool IS '是否可生产;0:否 1：是'; +COMMENT ON COLUMN mes_yield_order.use_dept_code IS '使用部门代码'; +COMMENT ON COLUMN mes_yield_order.yp_product_line IS '产品系列（mes_yield_plan.PRODUCT_line）'; +COMMENT ON COLUMN mes_yield_order.yp_memo IS '工作订单备注（mes_yield_plan.memo）'; +COMMENT ON COLUMN mes_yield_order.sj_mold_preparation IS '烧结石墨模准备状态'; +COMMENT ON COLUMN mes_yield_order.sj_kit_preparation IS '烧结齐套流转状态'; +COMMENT ON COLUMN mes_yield_order.pk_username IS '配套人'; +COMMENT ON COLUMN mes_yield_order.pk_date IS '配套时间'; +COMMENT ON COLUMN mes_yield_order.kit_preparation_man IS '流转人'; +COMMENT ON COLUMN mes_yield_order.kit_preparation_time IS '流转时间'; + +-- 生产订单工艺 +CREATE TABLE mes_yield_order_craft +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + yo_id NVARCHAR2(255) NOT NULL ENABLE, + craft_no NVARCHAR2(255), + process_no NVARCHAR2(255) NOT NULL ENABLE, + pps_id NUMBER(18, 0) NOT NULL ENABLE, + make_memo NVARCHAR2(900), + hour_quota NUMBER(18, 12) NOT NULL ENABLE, + pid NUMBER(18, 0), + start_time DATE, + end_time DATE, + make_team NUMBER(18, 0), + oc_id NUMBER(18, 0), + ca_id NUMBER(18, 0), + rp_id NUMBER(18, 0), + CONSTRAINT mes_yield_order_craft_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_yield_order_craft IS '生产订单工艺'; +COMMENT ON COLUMN mes_yield_order_craft.id IS '主键'; +COMMENT ON COLUMN mes_yield_order_craft.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_yield_order_craft.create_user IS '创建人'; +COMMENT ON COLUMN mes_yield_order_craft.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_yield_order_craft.create_time IS '创建时间'; +COMMENT ON COLUMN mes_yield_order_craft.update_user IS '修改人'; +COMMENT ON COLUMN mes_yield_order_craft.update_time IS '修改时间'; +COMMENT ON COLUMN mes_yield_order_craft.status IS '状态'; +COMMENT ON COLUMN mes_yield_order_craft.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_yield_order_craft.yo_id IS '生产订单'; +COMMENT ON COLUMN mes_yield_order_craft.craft_no IS 'C号'; +COMMENT ON COLUMN mes_yield_order_craft.process_no IS '序号'; +COMMENT ON COLUMN mes_yield_order_craft.pps_id IS '工序'; +COMMENT ON COLUMN mes_yield_order_craft.make_memo IS '工艺描述'; +COMMENT ON COLUMN mes_yield_order_craft.make_team IS '加工班组'; +COMMENT ON COLUMN mes_yield_order_craft.oc_id IS '外协商'; +COMMENT ON COLUMN mes_yield_order_craft.ca_id IS '工艺能力;外键（工艺能力）'; +COMMENT ON COLUMN mes_yield_order_craft.rp_id IS '返工工序id'; + +-- 异常订单 +CREATE TABLE mes_yield_error +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + yp_id NUMBER(20, 0), + yo_id NUMBER(20, 0), + ex_type NUMBER(11, 0) NOT NULL ENABLE, + ex_memo NVARCHAR2(255) NOT NULL ENABLE, + CONSTRAINT mes_yield_error_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_yield_error IS '异常订单'; +COMMENT ON COLUMN mes_yield_error.id IS '主键'; +COMMENT ON COLUMN mes_yield_error.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_yield_error.create_user IS '创建人'; +COMMENT ON COLUMN mes_yield_error.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_yield_error.create_time IS '创建时间'; +COMMENT ON COLUMN mes_yield_error.update_user IS '修改人'; +COMMENT ON COLUMN mes_yield_error.update_time IS '修改时间'; +COMMENT ON COLUMN mes_yield_error.status IS '状态'; +COMMENT ON COLUMN mes_yield_error.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_yield_error.yp_id IS '生产计划ID'; +COMMENT ON COLUMN mes_yield_error.yo_id IS '生产订单ID'; +COMMENT ON COLUMN mes_yield_error.ex_type IS '异常类型，1：数据缺失，2：工艺缺失，3：资源缺失，2：交期冲突'; +COMMENT ON COLUMN mes_yield_error.ex_memo IS '异常原因'; + +-- 镀层物料需求申报 +CREATE TABLE mes_plate_goods_record +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + wc_id NUMBER(18, 0) NOT NULL ENABLE, + plate_goods_code NVARCHAR2(255) NOT NULL ENABLE, + goods_demand NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + silver_potassium NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + coefficient NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + approval_man NUMBER(20, 0), + approval_time DATE, + approval_status NUMBER(18, 0), + approval_memo NVARCHAR2(255), + declared_quota NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + declared_silver NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + declared_status NUMBER DEFAULT 0 NOT NULL ENABLE, + goods_bo_id NUMBER(18, 0), + coefficient_bo_id NUMBER(18, 0), + pgr_code NVARCHAR2(255), + surplus NUMBER(20, 10) DEFAULT 0, + silver_potassium_residue NUMBER(20, 10) DEFAULT 0, + CONSTRAINT mes_plate_goods_record_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_plate_goods_record IS '镀层物料额外需求上报'; +COMMENT ON COLUMN mes_plate_goods_record.id IS '主键'; +COMMENT ON COLUMN mes_plate_goods_record.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_plate_goods_record.create_user IS '创建人'; +COMMENT ON COLUMN mes_plate_goods_record.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_plate_goods_record.create_time IS '创建时间'; +COMMENT ON COLUMN mes_plate_goods_record.update_user IS '修改人'; +COMMENT ON COLUMN mes_plate_goods_record.update_time IS '修改时间'; +COMMENT ON COLUMN mes_plate_goods_record.status IS '状态'; +COMMENT ON COLUMN mes_plate_goods_record.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_plate_goods_record.wc_id IS '作业中心'; +COMMENT ON COLUMN mes_plate_goods_record.plate_goods_code IS '镀层物料'; +COMMENT ON COLUMN mes_plate_goods_record.goods_demand IS '物料需求定额'; +COMMENT ON COLUMN mes_plate_goods_record.silver_potassium IS '上报银钾'; +COMMENT ON COLUMN mes_plate_goods_record.coefficient IS '银钾系数'; +COMMENT ON COLUMN mes_plate_goods_record.approval_man IS '审批人'; +COMMENT ON COLUMN mes_plate_goods_record.approval_time IS '审批时间'; +COMMENT ON COLUMN mes_plate_goods_record.approval_status IS '审批状态'; +COMMENT ON COLUMN mes_plate_goods_record.approval_memo IS '审批结果'; +COMMENT ON COLUMN mes_plate_goods_record.declared_quota IS '已申报定额'; +COMMENT ON COLUMN mes_plate_goods_record.declared_silver IS '已申报银钾'; +COMMENT ON COLUMN mes_plate_goods_record.declared_status IS '申报状态'; +COMMENT ON COLUMN mes_plate_goods_record.goods_bo_id IS '物料采购id'; +COMMENT ON COLUMN mes_plate_goods_record.coefficient_bo_id IS '银钾采购id'; +COMMENT ON COLUMN mes_plate_goods_record.surplus IS '剩余量'; +COMMENT ON COLUMN mes_plate_goods_record.silver_potassium_residue IS '上报银钾剩余量'; + + +-- 镀层物料需求申报明细 +CREATE TABLE mes_plate_goods_record_detail +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + pgrd_id NUMBER(18, 0) NOT NULL ENABLE, + yo_id NVARCHAR2(255) NOT NULL ENABLE, + CONSTRAINT mes_plate_goods_record_detail_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_plate_goods_record_detail IS '镀层物料需求申报明细'; +COMMENT ON COLUMN mes_plate_goods_record_detail.id IS '主键'; +COMMENT ON COLUMN mes_plate_goods_record_detail.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_plate_goods_record_detail.create_user IS '创建人'; +COMMENT ON COLUMN mes_plate_goods_record_detail.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_plate_goods_record_detail.create_time IS '创建时间'; +COMMENT ON COLUMN mes_plate_goods_record_detail.update_user IS '修改人'; +COMMENT ON COLUMN mes_plate_goods_record_detail.update_time IS '修改时间'; +COMMENT ON COLUMN mes_plate_goods_record_detail.status IS '状态'; +COMMENT ON COLUMN mes_plate_goods_record_detail.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_plate_goods_record_detail.pgrd_id IS '申报ID'; +COMMENT ON COLUMN mes_plate_goods_record_detail.yo_id IS '生产订单ID'; + +-- 镀层物料添加量申报 +CREATE TABLE mes_plate_goods_apply +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + goods_code NVARCHAR2(255) NOT NULL ENABLE, + goods_demand NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + approval_status NUMBER DEFAULT -1 NOT NULL ENABLE, + bo_id NUMBER(18, 0), + br_id NUMBER(18, 0), + ac_id NUMBER(18, 0), + pgr_id NUMBER(18, 0), + wc_id NUMBER(18, 0), + involve_code NVARCHAR2(255), + code_num NVARCHAR2(255), + CONSTRAINT mes_plate_goods_apply_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_plate_goods_apply IS '镀层物料申报添加量'; +COMMENT ON COLUMN mes_plate_goods_apply.id IS '主键'; +COMMENT ON COLUMN mes_plate_goods_apply.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_plate_goods_apply.create_user IS '创建人'; +COMMENT ON COLUMN mes_plate_goods_apply.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_plate_goods_apply.create_time IS '创建时间'; +COMMENT ON COLUMN mes_plate_goods_apply.update_user IS '修改人'; +COMMENT ON COLUMN mes_plate_goods_apply.update_time IS '修改时间'; +COMMENT ON COLUMN mes_plate_goods_apply.status IS '状态'; +COMMENT ON COLUMN mes_plate_goods_apply.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_plate_goods_apply.goods_code IS '镀层物料号'; +COMMENT ON COLUMN mes_plate_goods_apply.goods_demand IS '申报镀层'; +COMMENT ON COLUMN mes_plate_goods_apply.approval_status IS '审批状态'; +COMMENT ON COLUMN mes_plate_goods_apply.bo_id IS '采购Id'; +COMMENT ON COLUMN mes_plate_goods_apply.br_id IS '领料单Id'; +COMMENT ON COLUMN mes_plate_goods_apply.involve_code IS '涉及单号'; +COMMENT ON COLUMN mes_plate_goods_apply.code_num IS '涉及单号及数量'; + + +-- 镀层物料添加量申报明细 +CREATE TABLE mes_plate_goods_apply_detail +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + goods_code NVARCHAR2(255) NOT NULL ENABLE, + goods_demand NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + approval_status NUMBER DEFAULT -1 NOT NULL ENABLE, + pgad_id NUMBER(20, 0), + involve_code NVARCHAR2(255), + CONSTRAINT mes_plate_goods_apply_detail_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_plate_goods_apply_detail IS '镀层物料添加量申报明细'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.id IS '主键'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.create_user IS '创建人'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.create_time IS '创建时间'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.update_user IS '修改人'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.update_time IS '修改时间'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.status IS '状态'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.pgad_id IS '添加量申报ID'; +COMMENT ON COLUMN mes_plate_goods_apply_detail.involve_code IS '涉及单号'; + +-- 化验含量 +CREATE TABLE mes_assay_content +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + wc_id NUMBER(18, 0) NOT NULL ENABLE, + assay_man NUMBER(18, 0) NOT NULL ENABLE, + assay_time DATE NOT NULL ENABLE, + apply_status NUMBER DEFAULT 0 NOT NULL ENABLE, + gold_potassium NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + silver_potassium NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + silver_plate NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + CONSTRAINT mes_assay_content_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_assay_content IS '化验含量'; +COMMENT ON COLUMN mes_assay_content.id IS '主键'; +COMMENT ON COLUMN mes_assay_content.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_assay_content.create_user IS '创建人'; +COMMENT ON COLUMN mes_assay_content.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_assay_content.create_time IS '创建时间'; +COMMENT ON COLUMN mes_assay_content.update_user IS '修改人'; +COMMENT ON COLUMN mes_assay_content.update_time IS '修改时间'; +COMMENT ON COLUMN mes_assay_content.status IS '状态'; +COMMENT ON COLUMN mes_assay_content.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_assay_content.wc_id IS '作业中心'; +COMMENT ON COLUMN mes_assay_content.assay_man IS '化验人'; +COMMENT ON COLUMN mes_assay_content.assay_time IS '化验时间'; +COMMENT ON COLUMN mes_assay_content.apply_status IS '申报状态'; +COMMENT ON COLUMN mes_assay_content.gold_potassium IS '金钾申报量'; +COMMENT ON COLUMN mes_assay_content.silver_potassium IS '银钾申报量'; +COMMENT ON COLUMN mes_assay_content.silver_plate IS '银板申报量'; + +-- 化验含量明细 +CREATE TABLE mes_assay_content_detail +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + ac_id NUMBER(18, 0) NOT NULL ENABLE, + slot NVARCHAR2(255) NOT NULL ENABLE, + test_val NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + save_gold_val NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + save_silver_val NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + save_board_val NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + actual_val NUMBER(20, 10) DEFAULT 0 NOT NULL ENABLE, + CONSTRAINT mes_assay_content_detail_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_assay_content_detail IS '化验含量明细'; +COMMENT ON COLUMN mes_assay_content_detail.id IS '主键'; +COMMENT ON COLUMN mes_assay_content_detail.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_assay_content_detail.create_user IS '创建人'; +COMMENT ON COLUMN mes_assay_content_detail.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_assay_content_detail.create_time IS '创建时间'; +COMMENT ON COLUMN mes_assay_content_detail.update_user IS '修改人'; +COMMENT ON COLUMN mes_assay_content_detail.update_time IS '修改时间'; +COMMENT ON COLUMN mes_assay_content_detail.status IS '状态'; +COMMENT ON COLUMN mes_assay_content_detail.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_assay_content_detail.ac_id IS '化验记录'; +COMMENT ON COLUMN mes_assay_content_detail.slot IS '槽号'; +COMMENT ON COLUMN mes_assay_content_detail.test_val IS '化验值'; +COMMENT ON COLUMN mes_assay_content_detail.save_gold_val IS '申报添加金钾'; +COMMENT ON COLUMN mes_assay_content_detail.save_silver_val IS '申报添加银钾'; +COMMENT ON COLUMN mes_assay_content_detail.save_board_val IS '申报添加银板'; +COMMENT ON COLUMN mes_assay_content_detail.actual_val IS '实际值'; + +-- 烧结模具计划 +CREATE TABLE mes_mold_plan +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + mo_code NVARCHAR2(255), + mo_name NVARCHAR2(255), + quantity NUMBER NOT NULL ENABLE, + erp_id NUMBER(18, 0), + yp_id NUMBER(18, 0), + erp_wo_code NVARCHAR2(255), + maf_status NUMBER DEFAULT 1 NOT NULL ENABLE, + plan_type NVARCHAR2(255), + need_date DATE, + keeper NUMBER(18, 0), + releaser NUMBER(18, 0), + qua_level NVARCHAR2(255), + plan_type_name NVARCHAR2(255), + part_code NVARCHAR2(255), + part_name NVARCHAR2(255), + memo NVARCHAR2(900), + maf_type NUMBER DEFAULT 1 NOT NULL ENABLE, + urgent_type NVARCHAR2(255) DEFAULT 0 NOT NULL ENABLE, + CONSTRAINT mes_mold_plan_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_mold_plan IS '烧结模具计划'; +COMMENT ON COLUMN mes_mold_plan.id IS '主键'; +COMMENT ON COLUMN mes_mold_plan.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_mold_plan.create_user IS '创建人'; +COMMENT ON COLUMN mes_mold_plan.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_mold_plan.create_time IS '创建时间'; +COMMENT ON COLUMN mes_mold_plan.update_user IS '修改人'; +COMMENT ON COLUMN mes_mold_plan.update_time IS '修改时间'; +COMMENT ON COLUMN mes_mold_plan.status IS '状态'; +COMMENT ON COLUMN mes_mold_plan.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_mold_plan.mo_code IS '模具编码'; +COMMENT ON COLUMN mes_mold_plan.mo_name IS '模具名称'; +COMMENT ON COLUMN mes_mold_plan.quantity IS '数量'; +COMMENT ON COLUMN mes_mold_plan.erp_id IS 'erpId'; +COMMENT ON COLUMN mes_mold_plan.yp_id IS '生产计划id'; +COMMENT ON COLUMN mes_mold_plan.maf_status IS '状态;1、新建，2、已下发，3、已完成'; +COMMENT ON COLUMN mes_mold_plan.plan_type IS '计划类型名称'; +COMMENT ON COLUMN mes_mold_plan.need_date IS '需求日期'; +COMMENT ON COLUMN mes_mold_plan.keeper IS '保管员'; +COMMENT ON COLUMN mes_mold_plan.releaser IS '下达人'; +COMMENT ON COLUMN mes_mold_plan.qua_level IS '生产标识'; +COMMENT ON COLUMN mes_mold_plan.part_code IS '零件编码'; +COMMENT ON COLUMN mes_mold_plan.part_name IS '零件名称'; +COMMENT ON COLUMN mes_mold_plan.memo IS '备注'; +COMMENT ON COLUMN mes_mold_plan.maf_type IS '类型;1、热表，烧结，2、仓库'; +COMMENT ON COLUMN mes_mold_plan.urgent_type IS '紧急状态'; + + +-- 烧结模具计划-工装关联表 +CREATE TABLE mes_mold_plan_tool +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + mp_id NUMBER(20, 0), + tool_id NUMBER(20, 0), + CONSTRAINT mes_mold_plan_tool_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_mold_plan_tool IS '烧结模具计划-工装关联表'; +COMMENT ON COLUMN mes_mold_plan_tool.id IS '主键'; +COMMENT ON COLUMN mes_mold_plan_tool.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_mold_plan_tool.create_user IS '创建人'; +COMMENT ON COLUMN mes_mold_plan_tool.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_mold_plan_tool.create_time IS '创建时间'; +COMMENT ON COLUMN mes_mold_plan_tool.update_user IS '修改人'; +COMMENT ON COLUMN mes_mold_plan_tool.update_time IS '修改时间'; +COMMENT ON COLUMN mes_mold_plan_tool.status IS '状态'; +COMMENT ON COLUMN mes_mold_plan_tool.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_mold_plan_tool.mp_id IS '烧结模具计划ID'; +COMMENT ON COLUMN mes_mold_plan_tool.tool_id IS '工装id'; + +-- 烧结模具计划-订单关联表 +CREATE TABLE mes_mold_plan_order +( + id NUMBER(20, 0) NOT NULL ENABLE, + tenant_id NVARCHAR2(12) DEFAULT '000000', + create_user NUMBER(20, 0), + create_dept NUMBER(20, 0), + create_time DATE DEFAULT SYSDATE, + update_user NUMBER(20, 0), + update_time DATE DEFAULT SYSDATE, + status NUMBER(11, 0) DEFAULT 1, + is_deleted NUMBER(11, 0) DEFAULT 0, + mp_id NUMBER(20, 0), + yo_id NUMBER(20, 0), + CONSTRAINT mes_mold_plan_order_pk PRIMARY KEY (id) +) TABLESPACE JONHON_MES_DATA; + +COMMENT ON TABLE mes_mold_plan_order IS '烧结模具计划-订单关联表'; +COMMENT ON COLUMN mes_mold_plan_order.id IS '主键'; +COMMENT ON COLUMN mes_mold_plan_order.tenant_id IS '租户ID'; +COMMENT ON COLUMN mes_mold_plan_order.create_user IS '创建人'; +COMMENT ON COLUMN mes_mold_plan_order.create_dept IS '创建部门'; +COMMENT ON COLUMN mes_mold_plan_order.create_time IS '创建时间'; +COMMENT ON COLUMN mes_mold_plan_order.update_user IS '修改人'; +COMMENT ON COLUMN mes_mold_plan_order.update_time IS '修改时间'; +COMMENT ON COLUMN mes_mold_plan_order.status IS '状态'; +COMMENT ON COLUMN mes_mold_plan_order.is_deleted IS '是否已删除'; +COMMENT ON COLUMN mes_mold_plan_tool.mp_id IS '烧结模具计划ID'; +COMMENT ON COLUMN mes_mold_plan_tool.tool_id IS '生产订单id'; diff --git a/pom.xml b/pom.xml index f06aea3c5..8c947935b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,6 @@ blade-gateway blade-ops blade-ops-api - blade-plugin - blade-plugin-api blade-service blade-service-api