Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

昨天 1724f77c35022b643c28dd3e5547679a5edc2d49

Merge branch 'springboot3.5_cs' into spring3.5

 pom.xml

@@ -12,7 +12,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.5.3</version>
        <version>3.5.10</version>
        <relativePath/>
    </parent>

@@ -25,12 +25,11 @@
    </modules>

    <properties>
        <java.version>17</java.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <spring-cloud.version>2020.0.5</spring-cloud.version>
        <spring-boot.version>2.5.3</spring-boot.version>
        <spring-cloud.version>2025.0.0</spring-cloud.version>
        <jedis.version>2.9.0</jedis.version>
        <snakeyaml.version>1.33</snakeyaml.version>
    </properties>

    <dependencies>
@@ -40,8 +39,8 @@
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
            <version>1.2.21</version>
            <artifactId>druid-spring-boot-3-starter</artifactId>
            <version>1.2.27</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
@@ -54,13 +53,6 @@
    <dependencyManagement>
        <dependencies>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-dependencies</artifactId>
                <version>${spring-boot.version}</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dependencies</artifactId>
                <version>${spring-cloud.version}</version>
@@ -72,12 +64,36 @@
                <artifactId>jedis</artifactId>
                <version>${jedis.version}</version>
            </dependency>
            <dependency>
                <groupId>org.yaml</groupId>
                <artifactId>snakeyaml</artifactId>
                <version>${snakeyaml.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>

    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-compiler-plugin</artifactId>
                    <configuration>
                        <release>${java.version}</release>
                        <encoding>UTF-8</encoding>
                        <parameters>true</parameters>
                        <annotationProcessorPaths>
                            <path>
                                <groupId>org.projectlombok</groupId>
                                <artifactId>lombok</artifactId>
                                <version>${lombok.version}</version>
                            </path>
                        </annotationProcessorPaths>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>

</project>

 rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java

@@ -1,9 +1,9 @@
package com.vincent.rsf.ai.gateway;

import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.SpringApplication;

@SpringBootApplication(exclude = {
        DataSourceAutoConfiguration.class,

 rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java

@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.charset.StandardCharsets;

 rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java

@@ -9,7 +9,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;

 rsf-common/pom.xml

@@ -18,7 +18,6 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <gson.version>2.11.0</gson.version>
        <fastjson.version>1.2.58</fastjson.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
    </properties>

    <dependencies>
@@ -46,8 +45,8 @@
            <artifactId>jedis</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.validation</groupId>
            <artifactId>validation-api</artifactId>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ibeetl</groupId>
@@ -56,21 +55,25 @@
        </dependency>

        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <version>${mysql-driver.version}</version>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
        </dependency>

        <!-- mybatis-plus -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.1</version>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>3.5.12</version>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generator</artifactId>
            <version>3.4.1</version>
            <version>3.5.12</version>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-jsqlparser</artifactId>
            <version>3.5.12</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
@@ -113,16 +116,10 @@
            <artifactId>aspectjweaver</artifactId>
            <version>1.9.19</version>  <!-- 用于织入切面 -->
        </dependency>
        <!-- swagger -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-boot-starter</artifactId>
            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-spring-boot-starter</artifactId>
            <version>3.0.2</version>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
            <version>2.8.16</version>
        </dependency>
        <!-- jjwt -->
        <dependency>
@@ -160,8 +157,8 @@
        <!-- druid -->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
            <version>1.2.6</version>
            <artifactId>druid-spring-boot-3-starter</artifactId>
            <version>1.2.27</version>
        </dependency>
    </dependencies>


 rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java

@@ -4,9 +4,9 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;

import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validator;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import java.util.List;
import java.util.Map;
import java.util.Set;

 rsf-framework/pom.xml

@@ -13,20 +13,14 @@
        <version>1.0.0</version>
    </parent>

    <properties>
        <spring-framework.version>6.1.14</spring-framework.version>
    </properties>

    <dependencies>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
            <version>${spring-framework.version}</version>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <version>5.1.46</version>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>

 rsf-framework/src/main/java/com/vincent/rsf/framework/generators/BetterGenerator.java

@@ -395,7 +395,7 @@
            }

            // swagger
            sb.append("    @ApiModelProperty(value= \"")
            sb.append("    @Schema(description = \"")
                    .append(column.getWholeComment())
                    .append("\")\n");


 rsf-framework/src/main/java/com/vincent/rsf/framework/generators/CoolGenerator.java

@@ -383,7 +383,7 @@
            }

            // swagger
            sb.append("    @ApiModelProperty(value= \"")
            sb.append("    @Schema(description = \"")
                    .append(column.getWholeComment())
                    .append("\")\n");


 rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java

@@ -258,7 +258,7 @@
        }
        switch (this.sqlOsType) {
            case MYSQL:
                Class.forName("com.mysql.jdbc.Driver").newInstance();
                Class.forName("com.mysql.cj.jdbc.Driver").newInstance();
                conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
                this.columns = getMysqlColumns(conn, table, true, sqlOsType);
                break;
@@ -406,7 +406,7 @@
            }

            // swagger
            sb.append("    @ApiModelProperty(value= \"")
            sb.append("    @Schema(description = \"")
                    .append(column.getWholeComment())
                    .append("\")\n");


 rsf-framework/src/main/resources/templates/layui/Entity.txt

@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import Cools;
import SpringUtils;

 rsf-framework/src/main/resources/templates/react-admin/Controller.txt

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-framework/src/main/resources/templates/react-admin/Entity.txt

@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;

 rsf-framework/src/main/resources/templates/react-antd/Controller.txt

@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

 rsf-framework/src/main/resources/templates/react-antd/Entity.txt

@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import Cools;
import SpringUtils;

 rsf-open-api/pom.xml

@@ -43,7 +43,7 @@
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
            <version>4.5.13</version>
            <version>4.5.14</version>
        </dependency>
        <!-- OpenFeign依赖 -->
        <dependency>
@@ -96,4 +96,4 @@
        </plugins>
    </build>

</project>
</project>

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java

@@ -20,9 +20,9 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.rmi.NoSuchObjectException;
import java.util.*;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java

@@ -5,7 +5,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

/**
 * API安全配置类

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java

@@ -13,8 +13,8 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

/**
 * WebMvc配置, 拦截器、资源映射等都在此配置

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java

@@ -12,7 +12,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

/**
 * App认证控制器
@@ -29,9 +29,13 @@
public class AuthController {

    // 开启模拟数据
    @Value("${foreign.api.data.simulated}")
    public static String SIMULATED_DATA_ENABLE = "0";

    @Value("${foreign.api.data.simulated:0}")
    public void setSimulatedDataEnable(String simulatedDataEnable) {
        SIMULATED_DATA_ENABLE = simulatedDataEnable;
    }

    @Resource
    private AppAuthService appAuthService;


 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java

@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;


 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java

@@ -9,7 +9,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

/**
 * App认证使用示例控制器

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java

@@ -11,8 +11,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;


 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java

@@ -18,8 +18,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java

@@ -19,7 +19,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@Accessors(chain = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.List;

@Data

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.List;

@Data

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java

@@ -8,8 +8,8 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;

/**

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java

@@ -7,8 +7,8 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;

/**
 * 托盘信息同步请求

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.List;

@Data

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java

@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java

@@ -9,11 +9,11 @@
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;

import javax.annotation.Resource;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;


 rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java

@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

/**
 * App认证服务

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java

@@ -3,7 +3,7 @@
import com.vincent.rsf.openApi.entity.constant.Constants;
import com.vincent.rsf.openApi.entity.app.App;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

/**
 * 认证工具类

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java

@@ -9,7 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import javax.crypto.SecretKey;
import java.util.Date;
import java.util.Map;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java

@@ -34,8 +34,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java

@@ -23,8 +23,8 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java

@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.openApi.entity.constant.Constants;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;

/**

 rsf-open-api/src/main/resources/application-dev.yml

@@ -86,3 +86,9 @@
    host: http://www.itsdg.cn
    #端口
    port: 3741

springdoc:
  api-docs:
    enabled: true
  swagger-ui:
    enabled: true

 rsf-open-api/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@
  mvc:
    static-path-pattern: /**
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: xltys1995
@@ -67,6 +67,12 @@
stock:
  flagAvailable: true

springdoc:
  api-docs:
    enabled: false
  swagger-ui:
    enabled: false

  #平台接口信息配置(如：ERP, QMS, WCS等)
  platform:
    #RCS链接
@@ -84,4 +90,4 @@
      #链接
      host: http://www.itsdg.cn
      #端口
      port: 3741
      port: 3741

 rsf-open-api/src/main/resources/application.yml

@@ -1,6 +1,8 @@
spring:
  profiles:
    active: dev
  main:
    allow-circular-references: true

mybatis-plus:
  mapper-locations: classpath:mapper/*/*.xml

 rsf-open-api/src/main/resources/logback-spring.xml

@@ -52,12 +52,10 @@
            <charset>UTF-8</charset> <!-- 设置字符集 -->
        </encoder>
        <!-- 指定日志记录器的拆分归档策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!-- 日志归档 -->
            <fileNamePattern>${logback.logdir}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>100MB</maxFileSize>
            <!--日志文件保留天数-->
            <maxHistory>15</maxHistory>
        </rollingPolicy>
@@ -82,12 +80,10 @@
            <charset>UTF-8</charset>
        </encoder>
        <!-- 指定日志记录器的拆分归档策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!-- 每天日志归档路径以及格式 -->
            <fileNamePattern>${logback.logdir}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>100MB</maxFileSize>
            <!--日志文件保留天数-->
            <maxHistory>15</maxHistory>
        </rollingPolicy>
@@ -112,11 +108,9 @@
            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
        </encoder>
        <!-- 指定日志记录器的拆分归档策略 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <fileNamePattern>${logback.logdir}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>100MB</maxFileSize>
            <!--日志文件保留天数-->
            <maxHistory>15</maxHistory>
        </rollingPolicy>
@@ -142,11 +136,9 @@
            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
        </encoder>
        <!--指定日志记录器的拆分归档策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <fileNamePattern>${logback.logdir}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>100MB</maxFileSize>
            <!--日志文件保留天数-->
            <maxHistory>15</maxHistory>
        </rollingPolicy>
@@ -212,4 +204,4 @@
    <!--</root>-->
    <!--</springProfile>-->

</configuration>
</configuration>

 rsf-server/src/main/java/com/vincent/rsf/server/ServerBoot.java

@@ -2,8 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;

@SpringBootApplication
@SpringBootApplication(exclude = UserDetailsServiceAutoConfiguration.class)
public class ServerBoot {

    public static void main(String[] args) {

 rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java

@@ -2,8 +2,8 @@

import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java

@@ -25,7 +25,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java

@@ -6,7 +6,7 @@
import com.vincent.rsf.server.ai.dto.GatewayChatRequest;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java

@@ -7,7 +7,7 @@
import lombok.Data;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashSet;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java

@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.service.AiPromptTemplateService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java

@@ -6,7 +6,7 @@
import lombok.Data;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java

@@ -4,7 +4,7 @@
import com.vincent.rsf.server.ai.dto.GatewayChatRequest;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

@Service
public class AiTextCompletionService {

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java

@@ -18,7 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.util.ArrayList;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java

@@ -15,7 +15,7 @@
import com.vincent.rsf.server.ai.service.mcp.AiMcpRegistryService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java

@@ -14,7 +14,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosisPlanService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.InterruptedIOException;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java

@@ -6,7 +6,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.Date;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java

@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosisRecordService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.Date;

@Service

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java

@@ -11,7 +11,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosticToolConfigService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java

@@ -9,8 +9,8 @@
import com.vincent.rsf.server.ai.service.AiSessionService;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java

@@ -8,7 +8,7 @@
import com.vincent.rsf.server.system.entity.AiMcpMount;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java

@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.entity.AiMcpMount;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java

@@ -8,7 +8,7 @@
import com.vincent.rsf.server.ai.model.AiPromptContext;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java

@@ -13,7 +13,7 @@
import com.vincent.rsf.server.system.service.AiMcpMountService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java

@@ -10,7 +10,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java

@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.AiCallLogService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java

@@ -7,7 +7,7 @@
import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java

@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.OperationRecordService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java

@@ -9,7 +9,7 @@
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.*;

@Service

 rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java

@@ -9,7 +9,7 @@
import com.vincent.rsf.server.manager.mapper.LocMapper;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;


 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java

@@ -19,8 +19,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java

@@ -7,7 +7,7 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java

@@ -9,8 +9,8 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.Valid;
import javax.validation.constraints.*;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java

@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.math.BigDecimal;


 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java

@@ -10,7 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
@RestController
@RequestMapping("/ai/mcp")
public class AiMcpProtocolController extends BaseController {

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java

@@ -25,7 +25,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Date;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java

@@ -16,7 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

@Api(tags = "PDA入库操作接口")
@RequestMapping("/pda")

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java

@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.Objects;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

@@ -29,7 +29,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java

@@ -13,7 +13,7 @@
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.User;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;


 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -38,8 +38,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java

@@ -24,7 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java

@@ -160,7 +160,7 @@
            //ASN明细单据分组
            Map<Long, List<WkOrderItem>> asnIds = wkOrderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId));
            ids.forEach(id -> {
                int count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
                long count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
                if (count == asnIds.get(id).size()) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1))) {
                        throw new CoolException("ASN主单状态修改失败！！");

 rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java

@@ -16,7 +16,7 @@
import org.springframework.stereotype.Component;


import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java

@@ -18,9 +18,9 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Date;

 rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java

@@ -1,105 +1,36 @@
package com.vincent.rsf.server.common.config;

import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.Api;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanPostProcessor;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ReflectionUtils;
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.oas.annotations.EnableOpenApi;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
import java.lang.reflect.Field;
import java.util.List;
import java.util.stream.Collectors;


@Configuration
@EnableKnife4j
@EnableOpenApi
public class SwaggerConfig {

    @Value("${spring.profiles.active}")
    private String active;

    @Bean
    public Docket docket() {
        Docket docket = new Docket(DocumentationType.OAS_30)
                .apiInfo(apiInfo())
                .enable("dev".equals(active))
                .groupName("测试分组")
                .select()
                //apis： 添加swagger接口提取范围
                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.any())
                .build();

        return docket;
    }

    @Bean
    public Docket erpDocket() {
        Docket docket = new Docket(DocumentationType.OAS_30)
                .apiInfo(apiInfo())
                .enable("dev".equals(active))
                .groupName("ERP接口对接")
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.api.controller.erp"))
                .paths(PathSelectors.any())
                .build();

        return docket;
    }

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
    public OpenAPI rsfOpenApi() {
        return new OpenAPI().info(new Info()
                .title("WMS标版1.0版本接口文档")
                .description("WMS标版1.0版本接口文档,技术栈主要包括：SpringBoot、React.js、MySQL5.7")
                .version("v1.0")
                .version("v1.0"));
    }

    @Bean
    public GroupedOpenApi defaultApi() {
        return GroupedOpenApi.builder()
                .group("测试分组")
                .pathsToMatch("/**")
                .pathsToExclude("/erp/**")
                .build();
    }

    @Bean
    public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
        return new BeanPostProcessor() {

            @Override
            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
                if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
                    customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
                }
                return bean;
            }

            private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
                List<T> copy = mappings.stream()
                        .filter(mapping -> mapping.getPatternParser() == null)
                        .collect(Collectors.toList());
                mappings.clear();
                mappings.addAll(copy);
            }

            @SuppressWarnings("unchecked")
            private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
                try {
                    Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
                    field.setAccessible(true);
                    return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
                } catch (IllegalArgumentException | IllegalAccessException e) {
                    throw new IllegalStateException(e);
                }
            }
        };
    public GroupedOpenApi erpApi() {
        return GroupedOpenApi.builder()
                .group("ERP接口对接")
                .pathsToMatch("/erp/**")
                .build();
    }

}


 rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java

@@ -10,8 +10,8 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

/**
 * WebMvc配置, 拦截器、资源映射等都在此配置

 rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java

@@ -1,7 +1,5 @@
package com.vincent.rsf.server.common.constant;

import io.swagger.models.auth.In;

/**
 * 系统常量
 * Created by vincent on 2019-10-29 15:55

 rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java

@@ -12,7 +12,7 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.*;
@@ -331,7 +331,7 @@
                        continue;
                    }
                    boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
                    orders.add(new OrderItem(column, asc));
                    orders.add((asc ? OrderItem.asc(column) : OrderItem.desc(column)));
                }
            }
        }

 rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java

@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.regex.Matcher;
import java.util.regex.Pattern;


 rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java

@@ -20,11 +20,11 @@
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;

import javax.annotation.Resource;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;

 rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java

@@ -2,26 +2,27 @@

import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.CommonUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import java.io.IOException;

/**
@@ -30,8 +31,8 @@
 */
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class SecurityConfig extends WebSecurityConfigurerAdapter {
@EnableMethodSecurity(prePostEnabled = true)
public class SecurityConfig {

    public static final String[] FILTER_PATH = new String[] {
            "/demo/**",
@@ -68,40 +69,28 @@
    @Resource
    private JwtAuthenticationFilter jwtAuthenticationFilter;

    @Override
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers(HttpMethod.OPTIONS, "/**")
                .permitAll()
                .antMatchers(HttpMethod.GET, "/file/**", "/captcha", "/")
                .permitAll()
                .antMatchers(FILTER_PATH)
                .permitAll()
                .anyRequest()
                .authenticated()
                .and()
                .sessionManagement()
                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                .and()
                .csrf()
                .disable()
                .cors()
                .and()
                .logout()
                .disable()
                .headers()
                .frameOptions()
                .disable()
                .and()
                .exceptionHandling()
                .accessDeniedHandler(jwtAccessDeniedHandler)
                .authenticationEntryPoint(jwtAuthenticationEntryPoint)
                .and()
    @Bean
    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
        http
                .authorizeHttpRequests(authorize -> authorize
                        .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                        .requestMatchers(HttpMethod.GET, "/file/**", "/captcha", "/").permitAll()
                        .requestMatchers(FILTER_PATH).permitAll()
                        .anyRequest().authenticated())
                .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                .csrf(AbstractHttpConfigurer::disable)
                .cors(Customizer.withDefaults())
                .logout(AbstractHttpConfigurer::disable)
                .headers(headers -> headers.frameOptions(frame -> frame.disable()))
                .exceptionHandling(exception -> exception
                        .accessDeniedHandler(jwtAccessDeniedHandler)
                        .authenticationEntryPoint(jwtAuthenticationEntryPoint))
                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
        return http.build();
    }

    @Bean
    public BCryptPasswordEncoder bCryptPasswordEncoder() {
    public static BCryptPasswordEncoder bCryptPasswordEncoder() {
        return new BCryptPasswordEncoder();
    }


 rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java

@@ -12,8 +12,8 @@
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;

import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java

@@ -4,7 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java

@@ -16,7 +16,7 @@
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java

@@ -5,8 +5,8 @@
import org.apache.tika.Tika;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URLEncoder;

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java

@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;

/**

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java

@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java

@@ -12,7 +12,7 @@
import io.jsonwebtoken.io.Encoders;
import io.jsonwebtoken.security.Keys;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.security.Key;
import java.util.Date;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java

@@ -19,7 +19,7 @@
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java

@@ -25,7 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java

@@ -28,7 +28,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java

@@ -21,7 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

/**

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "往来企业")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java

@@ -33,7 +33,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java

@@ -30,7 +30,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java

@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "逻辑分区")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java

@@ -21,7 +21,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库区物料关系绑定")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;



 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -25,8 +25,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java

@@ -27,7 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java

@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java

@@ -23,7 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api("库存调整单")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java

@@ -20,7 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库位类型")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java

@@ -39,8 +39,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java

@@ -27,7 +27,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java

@@ -39,7 +39,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java

@@ -29,7 +29,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "出库单明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java

@@ -25,7 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java

@@ -20,7 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java

@@ -27,7 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Slf4j

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java

@@ -23,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "质检明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api("库存调整历史")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "货主")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库存信息")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库存明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -27,7 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java

@@ -26,7 +26,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api("调拔单")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -26,7 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "组拖档明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "仓库库区")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java

@@ -20,7 +20,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库区库存明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java

@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "仓库")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java

@@ -32,7 +32,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java

@@ -36,7 +36,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java

@@ -33,8 +33,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java

@@ -4,8 +4,8 @@
import lombok.Data;
import lombok.experimental.Accessors;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java

@@ -114,7 +114,7 @@
     * 条码
     */
    @ApiModelProperty(value = "条码")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    @TableField(updateStrategy = FieldStrategy.ALWAYS)
    private String barcode;

    /**

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java

@@ -110,7 +110,7 @@
     * 条码
     */
    @ApiModelProperty(value = "条码")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    @TableField(updateStrategy = FieldStrategy.ALWAYS)
    private String barcode;

    /**

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java

@@ -3,7 +3,7 @@
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
import cn.afterturn.easypoi.excel.annotation.Excel;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import lombok.experimental.Accessors;
import lombok.Data;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java

@@ -22,7 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java

@@ -202,7 +202,7 @@
                }
                //查询终点是否需要补充此容器
                String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
                int count = locService.count(new LambdaQueryWrapper<Loc>()
                long count = locService.count(new LambdaQueryWrapper<Loc>()
                        .apply(barcodeType)
                        .in(Loc::getUseStatus, new ArrayList<>(Arrays.asList(
                                LocStsType.LOC_STS_TYPE_D.type,
@@ -212,8 +212,8 @@
                        .eq(Loc::getDeleted, 0)
                        .eq(Loc::getStatus, 1)
                        .orderByDesc(Loc::getId));
                if (!Cools.isEmpty(count) && count<autoOutCount){
                    CONTAINER_IDS.put(barcodeType, autoOutCount-count);
                if (!Cools.isEmpty(count) && count < autoOutCount){
                    CONTAINER_IDS.put(barcodeType, (int) (autoOutCount - count));
                }
            }
        } catch (Exception e){

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -29,7 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.text.DateFormat;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java

@@ -11,7 +11,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java

@@ -11,7 +11,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Map;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java

@@ -14,7 +14,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java

@@ -20,7 +20,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java

@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java

@@ -33,8 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;


 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java

@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "动态扩展字段")

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java

@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java

@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java

@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java

@@ -21,7 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java

@@ -20,7 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

/**

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java

@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java

@@ -24,7 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java

@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java

@@ -26,7 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.system.entity.UserLogin;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

public interface UserLoginService extends IService<UserLogin> {


 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java

@@ -6,9 +6,11 @@
import com.vincent.rsf.server.system.entity.AiDiagnosisPlan;
import com.vincent.rsf.server.system.mapper.AiDiagnosisPlanMapper;
import com.vincent.rsf.server.system.service.AiDiagnosisPlanService;
import org.springframework.scheduling.support.CronSequenceGenerator;
import org.springframework.scheduling.support.CronExpression;
import org.springframework.stereotype.Service;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;

@@ -42,7 +44,9 @@
        if (!validateCron(cronExpr)) {
            return null;
        }
        return new CronSequenceGenerator(cronExpr.trim()).next(after == null ? new Date() : after);
        ZonedDateTime start = ZonedDateTime.ofInstant((after == null ? new Date() : after).toInstant(), ZoneId.systemDefault());
        ZonedDateTime next = CronExpression.parse(cronExpr.trim()).next(start);
        return next == null ? null : Date.from(next.toInstant());
    }

    @Override
@@ -50,7 +54,7 @@
        if (cronExpr == null || cronExpr.trim().isEmpty()) {
            return false;
        }
        return CronSequenceGenerator.isValidExpression(cronExpr.trim());
        return CronExpression.isValidExpression(cronExpr.trim());
    }

    @Override

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java

@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.service.AiPromptTemplateService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.Date;
import java.util.List;


 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java

@@ -14,7 +14,7 @@
import com.vincent.rsf.server.system.service.ConfigService;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.Date;
import java.util.List;
import java.util.Map;

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java

@@ -8,7 +8,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

@Service("userLoginService")
public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin> implements UserLoginService {

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java

@@ -14,7 +14,7 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;

@Service("userService")

 rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java

@@ -22,7 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.Objects;

@Component

 rsf-server/src/main/resources/application-dev.yml

@@ -103,6 +103,12 @@
ai:
  gateway-base-url: http://127.0.0.1:8086

springdoc:
  api-docs:
    enabled: true
  swagger-ui:
    enabled: true

#仓库功能参数配置
stock:
  #是否允许打印货物标签， 默认允许打印，也可由供应商提供标签

 rsf-server/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@
  mvc:
    static-path-pattern: /**
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: xltys1995
@@ -107,3 +107,9 @@

ai:
  gateway-base-url: http://127.0.0.1:8086

springdoc:
  api-docs:
    enabled: true
  swagger-ui:
    enabled: false

 rsf-server/src/main/resources/application.yml

@@ -1,8 +1,10 @@
spring:

  profiles:

    active: dev



config:

spring:
  profiles:
    active: dev
  main:
    allow-circular-references: true

config:
  system-name: @pom.artifactId@

  system-version: @pom.version@

  system-mode: OFFLINE


 rsf-server/src/main/resources/logback-spring.xml

@@ -22,12 +22,10 @@
    <!--info级别-->
    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${LOG_PATH}/info.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <fileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <maxHistory>10</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>10MB</maxFileSize>
        </rollingPolicy>
        <encoder>
            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
@@ -41,12 +39,10 @@
            <level>ERROR</level>
        </filter>
        <file>${LOG_PATH}/error.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <fileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <maxHistory>10</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <maxFileSize>10MB</maxFileSize>
        </rollingPolicy>
        <encoder>
            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
@@ -59,4 +55,4 @@
        <appender-ref ref="INFO_FILE"/>
        <appender-ref ref="ERROR_FILE"/>
    </root>
</configuration>
</configuration>