From e7c3bfeda13375a700936ace192899c01db412d6 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 17 Nov 2025 16:52:34 +0800 Subject: [PATCH] =?UTF-8?q?PowerJob=E6=89=A9=E5=B1=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E3=80=82=E7=94=A8=E6=9D=A5=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-ops-api/blade-job-api/.gitattributes | 2 + blade-ops-api/blade-job-api/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + blade-ops-api/blade-job-api/mvnw | 295 ++++++++++++++++++ blade-ops-api/blade-job-api/mvnw.cmd | 189 +++++++++++ blade-ops-api/blade-job-api/pom.xml | 16 + .../springblade/job/feign/IJobExtClient.java | 59 ++++ .../springblade/job/pojo/entity/JobInfo.java | 174 +++++++++++ .../src/main/resources/application.properties | 1 + blade-ops-api/pom.xml | 1 + .../springblade/desk/zzzz/package-info.java | 2 +- blade-ops/blade-job/pom.xml | 7 + .../springblade/job/feign/JobExtClient.java | 52 +++ .../InspectionTaskTimeoutProcessor.java | 25 ++ .../quality/IotHardnessDeleteProcessor.java | 2 + .../LquidTankTaskTimeoutProcessor.java | 2 + .../job/service/JobExtService.java | 50 +++ .../quality/feign/ICycleTestTaskClient.java | 18 ++ .../quality/feign/IInspectionTaskClient.java | 18 ++ .../quality/feign/IIotHardnessClient.java | 2 +- .../desk/quality/feign/IQAIotTraceClient.java | 18 ++ blade-service/blade-desk/pom.xml | 7 + .../desk/quality/constant/QAConst.java | 3 + .../controller/CycleTestTaskController.java | 182 ++++++----- .../quality/feign/InspectionTaskClient.java | 19 ++ .../mapper/gen/CycleTestTaskGenMapper.xml | 2 +- .../desk/quality/pojo/entity/CycleTest.java | 18 +- .../quality/pojo/entity/CycleTestTask.java | 18 +- .../quality/service/CycleTestTaskService.java | 99 ++++++ .../service/InspectionTaskService.java | 23 +- .../quality/service/IotHardnessService.java | 3 +- .../service/IotHardnessSubService.java | 29 ++ .../quality/service/IotThicknessService.java | 3 +- .../service/IotThicknessSubService.java | 30 ++ .../service/LiquidTankTaskService.java | 1 + .../quality/service/QAIotTraceService.java | 22 ++ .../desk/quality/util/PowerJobUtil.java | 20 +- .../service/LiquidTankTaskServiceTest.java | 15 + 38 files changed, 1352 insertions(+), 111 deletions(-) create mode 100644 blade-ops-api/blade-job-api/.gitattributes create mode 100644 blade-ops-api/blade-job-api/.gitignore create mode 100644 blade-ops-api/blade-job-api/.mvn/wrapper/maven-wrapper.properties create mode 100644 blade-ops-api/blade-job-api/mvnw create mode 100644 blade-ops-api/blade-job-api/mvnw.cmd create mode 100644 blade-ops-api/blade-job-api/pom.xml create mode 100644 blade-ops-api/blade-job-api/src/main/java/org/springblade/job/feign/IJobExtClient.java create mode 100644 blade-ops-api/blade-job-api/src/main/java/org/springblade/job/pojo/entity/JobInfo.java create mode 100644 blade-ops-api/blade-job-api/src/main/resources/application.properties create mode 100644 blade-ops/blade-job/src/main/java/org/springblade/job/feign/JobExtClient.java create mode 100644 blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java create mode 100644 blade-ops/blade-job/src/main/java/org/springblade/job/service/JobExtService.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IInspectionTaskClient.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IQAIotTraceClient.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/InspectionTaskClient.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessSubService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAIotTraceService.java create mode 100644 blade-service/blade-desk/src/test/java/org/springblade/desk/quality/service/LiquidTankTaskServiceTest.java diff --git a/blade-ops-api/blade-job-api/.gitattributes b/blade-ops-api/blade-job-api/.gitattributes new file mode 100644 index 0000000..3b41682 --- /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 0000000..667aaef --- /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 0000000..c0bcafe --- /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 0000000..bd8896b --- /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 0000000..92450f9 --- /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-ops-api/blade-job-api/pom.xml b/blade-ops-api/blade-job-api/pom.xml new file mode 100644 index 0000000..b85a8b9 --- /dev/null +++ b/blade-ops-api/blade-job-api/pom.xml @@ -0,0 +1,16 @@ + + + + blade-ops-api + org.springblade + ${revision} + + 4.0.0 + + blade-job-api + ${project.artifactId} + 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 0000000..6d0f6ff --- /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 0000000..d0df290 --- /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 0000000..e839875 --- /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/pom.xml b/blade-ops-api/pom.xml index 6ac2fee..cf6310a 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/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 index eff725a..8979415 100644 --- 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 @@ -1 +1 @@ -package org.springblade.desk.zz; \ No newline at end of file +package org.springblade.desk.zzzz; \ No newline at end of file diff --git a/blade-ops/blade-job/pom.xml b/blade-ops/blade-job/pom.xml index 1d19e22..444800a 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 @@ -39,6 +40,12 @@ 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 0000000..bbc4f6b --- /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/InspectionTaskTimeoutProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java new file mode 100644 index 0000000..3febf06 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/InspectionTaskTimeoutProcessor.java @@ -0,0 +1,25 @@ +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; + +@Component +@Data +@Slf4j +public class InspectionTaskTimeoutProcessor implements BasicProcessor { + + private IInspectionTaskClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + 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 index 3650454..dcd1c8a 100644 --- 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 @@ -1,6 +1,7 @@ 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; @@ -10,6 +11,7 @@ import tech.powerjob.worker.core.processor.sdk.BasicProcessor; import tech.powerjob.worker.log.OmsLogger; @Component +@Data @Slf4j public class IotHardnessDeleteProcessor implements BasicProcessor { 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 index d9266ec..d38560b 100644 --- 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 @@ -1,6 +1,7 @@ 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; @@ -13,6 +14,7 @@ import tech.powerjob.worker.log.OmsLogger; import java.util.List; @Component +@Data @Slf4j public class LquidTankTaskTimeoutProcessor implements BasicProcessor { 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 0000000..0768556 --- /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-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 0000000..84f0cb3 --- /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 0000000..b5c2a1b --- /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 index f9844ab..644b460 100644 --- 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 @@ -13,6 +13,6 @@ public interface IIotHardnessClient { String DELETE_HISTORY = API_PREFIX + "/delete-history"; - @GetMapping("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/IQAIotTraceClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/IQAIotTraceClient.java new file mode 100644 index 0000000..8c033c3 --- /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/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 4b32ec2..9cdd378 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -66,6 +66,13 @@ org.springblade blade-starter-excel + + + org.springblade + blade-job-api + 4.6.0.RELEASE + compile + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAConst.java index 963fce2..05a5cc5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAConst.java @@ -5,5 +5,8 @@ package org.springblade.desk.quality.constant; */ public interface QAConst { + /** + * 模块前缀 + */ String MODULE_PREFIX = "QA"; } 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 index ba77eb4..04bd6cf 100644 --- 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 @@ -9,9 +9,11 @@ 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; @@ -24,6 +26,7 @@ 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.*; @@ -38,102 +41,113 @@ import java.util.Map; * @since 2025-11-17 */ @RestController +@Data @AllArgsConstructor -@RequestMapping("/cycleTestTask") +@RequestMapping("/qa/cycleTestTask") @Tag(name = "[周期试验任务]", description = "[周期试验任务]接口") public class CycleTestTaskController extends BladeController { - private final ICycleTestTaskGenService cycleTestTaskGenService; + @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("/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("/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); - } + /** + * [周期试验任务] 自定义分页 + */ + @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("/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("/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("/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))); - } + /** + * [周期试验任务] 删除 + */ + @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); - } + /** + * 导出数据 + */ + @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/feign/InspectionTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/InspectionTaskClient.java new file mode 100644 index 0000000..0741320 --- /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/mapper/gen/CycleTestTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml index 0a6ad90..5ca3700 100644 --- 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 @@ -15,7 +15,7 @@ - + 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 index 54adbf2..14fe175 100644 --- 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 @@ -144,32 +144,32 @@ public class CycleTest extends BaseEntity { * [班组]id */ @Schema(description = "[班组]id") - private BigDecimal teamId; + private Long teamId; /** * [供应商]id */ @Schema(description = "[供应商]id") - private BigDecimal supplierId; + private Long supplierId; /** * [周期试验项目]id */ @Schema(description = "[周期试验项目]id") - private BigDecimal cycleTestItemId; + private Long cycleTestItemId; /** * [试验件]id */ @Schema(description = "[试验件]id") - private BigDecimal testId; + private Long testId; /** * 工艺员[用户]id */ @Schema(description = "工艺员[用户]id") - private BigDecimal processEngineerUserId; + private Long processEngineerUserId; /** * 试验技术员[用户]id */ @Schema(description = "试验技术员[用户]id") - private BigDecimal testUserId; + private Long testUserId; /** * 镀种 */ @@ -234,16 +234,16 @@ public class CycleTest extends BaseEntity { * 生成任务PowerJobId */ @Schema(description = "生成任务PowerJobId") - private BigDecimal powerJobIdGenTask; + private Long powerJobIdGenTask; /** * 提醒PowerJobId */ @Schema(description = "提醒PowerJobId") - private BigDecimal powerJobIdRemind; + private Long powerJobIdRemind; /** * 开始PowerJobId */ @Schema(description = "开始PowerJobId") - private BigDecimal powerJobIdPlannedStart; + private Long powerJobIdPlannedStart; } 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 index 3887fd5..80e29b9 100644 --- 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 @@ -127,47 +127,47 @@ public class CycleTestTask extends BaseEntity { * 配置[班组]id */ @Schema(description = "配置[班组]id") - private BigDecimal configTeamId; + private Long configTeamId; /** * 配置[外协商]id */ @Schema(description = "配置[外协商]id") - private BigDecimal configOemId; + private Long configOemId; /** * [周期性试验项目]id */ @Schema(description = "[周期性试验项目]id") - private BigDecimal cycleTestItemId; + private Long cycleTestItemId; /** * [试验件]id */ @Schema(description = "[试验件]id") - private BigDecimal testId; + private Long testId; /** * 工艺员[用户]id */ @Schema(description = "工艺员[用户]id") - private BigDecimal processEngineerUserId; + private Long processEngineerUserId; /** * 试验技术员[用户]id */ @Schema(description = "试验技术员[用户]id") - private BigDecimal testUserId; + private Long testUserId; /** * 下发[班组]id */ @Schema(description = "下发[班组]id") - private BigDecimal sendTeamId; + private Long sendTeamId; /** * 下发[外协商]id */ @Schema(description = "下发[外协商]id") - private BigDecimal sendOmeId; + private Long sendOmeId; /** * 下发人员[用户]id */ @Schema(description = "下发人员[用户]id") - private BigDecimal snedUserId; + private Long sendUserId; /** * 数量 */ 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 0000000..7cdd8ef --- /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 index a8f2b29..9de2ec2 100644 --- 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 @@ -3,6 +3,7 @@ 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; @@ -20,6 +21,7 @@ import java.util.List; @Service @Data +@Slf4j public class InspectionTaskService { @Resource @@ -29,6 +31,26 @@ public class InspectionTaskService { @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 start(InspectionTaskStart start) { // todo:check工单有效性 @@ -71,5 +93,4 @@ public class InspectionTaskService { rFinal.setData(list); return rFinal; } - } 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 index ad09d9f..51ae670 100644 --- 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.mapper.gen.IotHardnessGenMapper; import org.springblade.desk.quality.pojo.entity.IotHardness; @@ -25,7 +24,7 @@ public class IotHardnessService { @Resource private IotHardnessGenMapper genMapper; @Resource - private IotHardnessDeleteService deleteService; + private IotHardnessSubService deleteService; /** * 物理删除历史数据 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 0000000..2c591cd --- /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 index 7457f5f..fae9f56 100644 --- 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.mapper.gen.IotThicknessGenMapper; import org.springblade.desk.quality.pojo.entity.IotThickness; @@ -25,7 +24,7 @@ public class IotThicknessService { @Resource private IotThicknessGenMapper genMapper; @Resource - private IotThicknessDeleteService deleteService; + private IotThicknessSubService deleteService; /** * 物理删除历史数据 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 0000000..ecf7b6d --- /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/LiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java index 3212313..e863d6d 100644 --- 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 @@ -12,6 +12,7 @@ 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.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.ArrayList; 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 0000000..fa19229 --- /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/util/PowerJobUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java index 58a453b..35d5e12 100644 --- 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 @@ -1,6 +1,24 @@ package org.springblade.desk.quality.util; -public class PowerJobUtil { +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 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/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 0000000..805e44e --- /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() { + + } +}