降级处理

economic-crime-api/economic-crime-admin/pom.xml

@@ -10,13 +10,20 @@
 
     <artifactId>economic-crime-admin</artifactId>
     <version>3.0.1</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <name>economic-crime</name>
     <description>economic-crime project</description>
 
     <dependencies>
 
+        <!-- 部署到金蝶AAS等外部Servlet容器时排除内嵌Tomcat -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>net.lab1024</groupId>
             <artifactId>economic-crime-base</artifactId>
@@ -26,7 +33,7 @@
         <!-- sa-admin 源码直接使用 MP / MyBatis / warm-flow 类型；显式加入编译 classpath，避免 IDEA 未展开 sa-base 传递依赖时报「程序包不存在」 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara.warm</groupId>
@@ -35,7 +42,7 @@
 
         <dependency>
             <groupId>org.dromara.warm</groupId>
-            <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
+            <artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara.warm</groupId>
@@ -45,6 +52,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java

@@ -7,6 +7,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -24,10 +26,16 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @ComponentScan(AdminApplication.COMPONENT_SCAN)
 @MapperScan(value = AdminApplication.COMPONENT_SCAN, annotationClass = Mapper.class)
 @SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
-public class AdminApplication {
+public class AdminApplication extends SpringBootServletInitializer {
 
     public static final String COMPONENT_SCAN = "net.lab1024.sa";
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(AdminApplication.class)
+                .listeners(new LogVariableListener(), new Ip2RegionListener());
+    }
+
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(AdminApplication.class);
         // 添加 日志监听器，使 log4j2-spring.xml 可以间接读取到配置文件的属性

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.config;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.interceptor.AdminInterceptor;
 import net.lab1024.sa.base.config.SwaggerConfig;
 import org.springframework.context.annotation.Configuration;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java

@@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.strategy.SaAnnotationStrategy;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
 import net.lab1024.sa.admin.module.system.login.service.LoginService;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/controller/AlarmReportController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.alarm.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.alarm.domain.form.AlarmAddForm;
 import net.lab1024.sa.admin.module.business.alarm.domain.form.AlarmAuditVoteForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.time.LocalDateTime;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAuditVoteForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewIdForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewOpinionForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewUploadForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidApplyForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/EvidenceAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.alarm.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.time.LocalDateTime;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmAuditSupport.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.alarm.service;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.alarm.constant.AlarmAuditConst;
 import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAuditVoteDao;
 import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmAuditVoteEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmNoAcceptReviewSupport.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.alarm.service;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.alarm.constant.AlarmNoAcceptReviewConst;
 import net.lab1024.sa.admin.module.business.alarm.constant.AlarmVoidConst;
 import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmReportEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmReportService.java

@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.alarm.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAttachmentDao;
 import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAuditVoteDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmVoidSupport.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.alarm.service;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.alarm.constant.AlarmSourceConst;
 import net.lab1024.sa.admin.module.business.alarm.constant.AlarmVoidConst;
 import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmReportEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/EvidenceMaterialService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.alarm.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.alarm.dao.EvidenceFileDao;
 import net.lab1024.sa.admin.module.business.alarm.dao.EvidenceMaterialDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.category.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.category.domain.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.category.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.category.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.category.manager;
 
 import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.constant.AdminCacheConst;
 import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java

@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.category.service;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO;
 import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.category.service;
 
 import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
 import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/controller/DossierController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.dossier.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.dossier.domain.form.*;
 import net.lab1024.sa.admin.module.business.dossier.domain.vo.*;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowApplyForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowConfirmForm.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowQueryForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.domain.PageParam;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyApplyForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyQueryForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.domain.PageParam;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierRegisterForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnApplyForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierTransferForm.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierVolumeForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.dossier.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/service/DossierService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.dossier.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.dossier.constant.*;
 import net.lab1024.sa.admin.module.business.dossier.dao.*;
 import net.lab1024.sa.admin.module.business.dossier.domain.entity.*;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/support/DossierNotifySupport.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.dossier.support;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.module.support.message.constant.MessageTypeEnum;
 import net.lab1024.sa.base.module.support.message.domain.MessageSendForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java

@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.goods.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
 import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java

@@ -2,9 +2,9 @@ package net.lab1024.sa.admin.module.business.goods.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.DecimalMin;
+import javax.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
 import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.goods.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java

@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.goods.service;
 import cn.idev.excel.FastExcel;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
 import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.oa.bank;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.bank;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
 import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.oa.bank.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.bank.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java

@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.oa.enterprise;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.enterprise;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
 import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java

@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import javax.validation.constraints.Pattern;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
 import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.domain.PageParam;
 import org.hibernate.validator.constraints.Length;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.oa.invoice;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.invoice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.oa.invoice.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.invoice.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/controller/LeaveController.java

@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 /**
  * OA 请假申请表 Controller

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.business.oa.leave.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Data;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveUpdateForm.java

@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.business.oa.leave.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Data;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/service/LeaveService.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 
 /**
  * OA 请假申请表 Service

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java

@@ -1,12 +1,12 @@
 package net.lab1024.sa.admin.module.business.oa.notice.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.form.*;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
@@ -119,7 +119,7 @@ public class NoticeController {
         return noticeEmployeeService.view(
                 SmartRequestUtil.getRequestUserId(),
                 noticeId,
-                JakartaServletUtil.getClientIP(request),
+                ServletUtil.getClientIP(request),
                 request.getHeader("User-Agent")
         );
     }

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java

@@ -2,9 +2,9 @@ package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
 import org.hibernate.validator.constraints.Length;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.domain.PageParam;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java

@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.oa.notice.manager;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.notice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
 import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.notice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
 import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.oa.notice.service;
 
 import cn.hutool.core.util.StrUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeTypeDao;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/controller/PropertyController.java

@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.property.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.property.domain.form.*;
 import net.lab1024.sa.admin.module.business.property.domain.vo.*;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyAddForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.time.LocalDateTime;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutSubmitForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyInvokeApplyForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnSubmitForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferAuditForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferConfirmForm.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferResubmitForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.business.property.domain.form;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyOmissionService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.property.constant.PropertyOmissionConst;
 import net.lab1024.sa.admin.module.business.property.constant.PropertyStatusConst;
 import net.lab1024.sa.admin.module.business.property.dao.CasePropertyItemDao;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.property.constant.PropertyCheckoutAuditConst;
 import net.lab1024.sa.admin.module.business.property.constant.PropertyOperationConst;
 import net.lab1024.sa.admin.module.business.property.constant.PropertyReturnAuditConst;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyUnregisteredService.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.business.property.constant.CaseSeizureMeasureConst;
 import net.lab1024.sa.admin.module.business.property.dao.CaseSeizureDocDao;
 import net.lab1024.sa.admin.module.business.property.domain.entity.CaseSeizureDocEntity;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/adapter/AbstractWarmFlowAdapter.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.flow.adapter;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
 import net.lab1024.sa.admin.module.system.role.domain.vo.RoleSelectedVO;
 import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/DefController.java

@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.flow.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionQueryForm;
 import net.lab1024.sa.admin.module.flow.domain.vo.FlowDefinitionVO;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/ExecuteController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.flow.domain.form.ApproveTaskInsForm;
 import net.lab1024.sa.admin.module.flow.domain.form.CompleteTaskForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/ApproveTaskInsForm.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.flow.domain.form;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.module.flow.domain.vo.FlowCopyVO;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/CompleteTaskForm.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.flow.domain.form;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.module.flow.domain.vo.FlowCopyVO;
 

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionAddForm.java

@@ -1,8 +1,8 @@
 package net.lab1024.sa.admin.module.flow.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionUpdateForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.flow.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/StartProcessForm.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.flow.domain.form;
 
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.flow.handler;
 
 import cn.hutool.core.util.ObjectUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.flow.annoation.ConditionalOnEnable;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/listener/WorkflowGlobalListener.java

@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.flow.listener;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.flow.annoation.ConditionalOnEnable;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/FlowDefinitionService.java

@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.flow.service;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.flow.dao.FlowDefinitionDao;
 import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionAddForm;
 import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionQueryForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/FlowTaskServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import net.lab1024.sa.admin.module.flow.domain.form.ApproveTaskInsForm;
 import net.lab1024.sa.admin.module.flow.domain.form.CompleteTaskForm;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HandlerSelectServiceImpl.java

@@ -1,6 +1,6 @@
 package net.lab1024.sa.admin.module.flow.service.impl;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.flow.enums.TaskAssigneeEnum;
 import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentQueryForm;
 import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;

economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HhDefServiceImpl.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.admin.module.flow.service.impl;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import net.lab1024.sa.admin.module.flow.adapter.WarmFlowAdapter;
 import net.lab1024.sa.admin.module.flow.service.HhDefService;
 import net.lab1024.sa.admin.module.flow.domain.vo.WarmFlowInteractiveTypeVO;