#3.5

zhou zhou

10 小时以前 cfe049492f81d2c650a2b17348593edbc5054498

#3.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>

@@ -27,10 +27,14 @@
    <properties>
        <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>
        <jedis.version>2.9.0</jedis.version>
        <snakeyaml.version>1.33</snakeyaml.version>
        <java.version>17</java.version>
        <spring-cloud.version>2025.0.0</spring-cloud.version>
        <spring-boot.version>3.5.10</spring-boot.version>
        <druid.version>1.2.27</druid.version>
        <springdoc.version>2.8.14</springdoc.version>
        <jjwt.version>0.11.5</jjwt.version>
        <jedis.version>5.2.0</jedis.version>
        <fastjson.version>1.2.83</fastjson.version>
    </properties>

    <dependencies>
@@ -39,9 +43,13 @@
            <artifactId>spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </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>${druid.version}</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
@@ -72,12 +80,27 @@
                <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>
                <configuration>
                    <release>${java.version}</release>
                    <parameters>true</parameters>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.projectlombok</groupId>
                            <artifactId>lombok</artifactId>
                            <version>${lombok.version}</version>
                        </path>
                    </annotationProcessorPaths>
                </configuration>
            </plugin>
        </plugins>
    </build>

</project>

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

@@ -1,6 +1,6 @@
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.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.SpringApplication;

 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

@@ -17,8 +17,6 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <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 +44,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 +54,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-jsqlparser</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.google.guava</groupId>
@@ -113,27 +115,29 @@
            <artifactId>aspectjweaver</artifactId>
            <version>1.9.19</version>  <!-- 用于织入切面 -->
        </dependency>
        <!-- swagger -->
        <!-- openapi -->
        <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>${springdoc.version}</version>
        </dependency>
        <!-- jjwt -->
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-api</artifactId>
            <version>${jjwt.version}</version>
        </dependency>
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-impl</artifactId>
            <version>0.11.2</version>
            <version>${jjwt.version}</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-jackson</artifactId>
            <version>0.11.2</version>
            <version>${jjwt.version}</version>
            <scope>runtime</scope>
        </dependency>

        <!-- 图形验证码 -->
@@ -160,8 +164,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>${druid.version}</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

@@ -24,9 +24,8 @@
            <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/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;

 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-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-open-api/pom.xml

@@ -26,18 +26,18 @@
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-api</artifactId>
            <version>0.11.5</version>
            <version>${jjwt.version}</version>
        </dependency>
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-impl</artifactId>
            <version>0.11.5</version>
            <version>${jjwt.version}</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt-jackson</artifactId>
            <version>0.11.5</version>
            <version>${jjwt.version}</version>
            <scope>runtime</scope>
        </dependency>
        <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认证控制器

 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-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

 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/pom.xml

@@ -17,7 +17,6 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <mysql-driver.version>5.1.47</mysql-driver.version>
    </properties>
    <dependencies>
        <dependency>

 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

@@ -21,9 +21,9 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.PurchaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -61,7 +61,7 @@
    @Autowired
    private RemotesInfoProperties remotesInfoProperties;
    @Autowired
    private AsnOrderService asnOrderService;
    private AsnOrderMapper asnOrderMapper;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
@@ -160,13 +160,13 @@
            //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 = Optional.ofNullable(asnOrderMapper.selectCount(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id))).orElse(0L);
                if (count == asnIds.get(id).size()) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1))) {
                    if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1)) <= 0) {
                        throw new CoolException("ASN主单状态修改失败！！");
                    }
                } else {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2))) {
                    if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2)) <= 0) {
                        throw new CoolException("ASN主单状态修改失败！！");
                    }
                }

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

@@ -27,6 +27,7 @@
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.LocItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -67,7 +68,7 @@
    @Autowired
    private LocServiceImpl locService;
    @Autowired
    private LocItemService locItemService;
    private LocItemMapper locItemMapper;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
@@ -694,7 +695,7 @@
        //入库靠近摆放
        if (ioType == 1 && deviceBind.getBeSimilar().equals("1") && !Cools.isEmpty(matnr) && Cools.isEmpty(orgLoc)) {
            if (nearRow != curRow) {
                List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getMatnrCode, matnr));
                List<LocItem> locItems = locItemMapper.selectList(new LambdaQueryWrapper<LocItem>().eq(LocItem::getMatnrCode, matnr));
                for (LocItem locItem : locItems) {
                    Loc loc1 = locService.getById(locItem.getLocId());
                    if (LocUtils.isShallowLoc(loc1.getCode())) {

 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;
    public OpenAPI openAPI() {
        return new OpenAPI()
                .info(new Info()
                        .title("WMS标版1.0版本接口文档")
                        .description("WMS标版1.0版本接口文档,技术栈主要包括：SpringBoot、React.js、MySQL5.7")
                        .version("v1.0"));
    }

    @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()
                .title("WMS标版1.0版本接口文档")
                .description("WMS标版1.0版本接口文档,技术栈主要包括：SpringBoot、React.js、MySQL5.7")
                .version("v1.0")
    public GroupedOpenApi defaultApi() {
        return GroupedOpenApi.builder()
                .group("测试分组")
                .pathsToMatch("/**")
                .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接口对接")
                .packagesToScan("com.vincent.rsf.server.api.controller.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/PasswordEncoderConfig.java

New file
@@ -0,0 +1,15 @@
package com.vincent.rsf.server.common.security;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;

@Configuration
public class PasswordEncoderConfig {

    @Bean
    public PasswordEncoder passwordEncoder() {
        return new BCryptPasswordEncoder();
    }
}

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

@@ -6,22 +6,20 @@
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.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
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 jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import java.io.IOException;

/**
@@ -30,8 +28,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,41 +66,26 @@
    @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()
                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
    }

    @Bean
    public BCryptPasswordEncoder bCryptPasswordEncoder() {
        return new BCryptPasswordEncoder();
    public SecurityFilterChain securityFilterChain(org.springframework.security.config.annotation.web.builders.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(csrf -> csrf.disable())
                .cors(cors -> {
                })
                .logout(logout -> logout.disable())
                .headers(headers -> headers.frameOptions(frameOptions -> frameOptions.disable()))
                .exceptionHandling(exceptionHandling -> exceptionHandling
                        .accessDeniedHandler(jwtAccessDeniedHandler)
                        .authenticationEntryPoint(jwtAuthenticationEntryPoint))
                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);

        return http.build();
    }

    // 没有访问权限异常处理
@@ -112,6 +95,9 @@
        @Override
        public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e)
                throws IOException, ServletException {
            if (response.isCommitted()) {
                return;
            }
            CommonUtil.responseError(response, Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG, e.getMessage());
        }

@@ -124,6 +110,9 @@
        @Override
        public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
                throws IOException, ServletException {
            if (response.isCommitted()) {
                return;
            }
            CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG,
                    e.getMessage());
        }

 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/service/RedisService.java

@@ -50,7 +50,7 @@
        try{
            Jedis jedis = this.getPool().getResource();

            if(this.index != jedis.getDB().intValue()) {
            if(this.index != jedis.getDB()) {
                jedis.select(this.index);
            }
            return jedis;

 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;
@@ -162,7 +162,14 @@
     * @param error    错误信息
     */
    public static void responseError(HttpServletResponse response, Integer code, String message, String error) {
        if (response.isCommitted()) {
            return;
        }
        response.resetBuffer();
        response.setStatus(code);
        response.setCharacterEncoding("UTF-8");
        response.setContentType("application/json;charset=UTF-8");
        addCrossHeaders(response);
        try {
            PrintWriter out = response.getWriter();
            out.write(JSON.toJSONString(R.parse(code + "-" + message)));

 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,
@@ -213,7 +213,7 @@
                        .eq(Loc::getStatus, 1)
                        .orderByDesc(Loc::getId));
                if (!Cools.isEmpty(count) && count<autoOutCount){
                    CONTAINER_IDS.put(barcodeType, autoOutCount-count);
                    CONTAINER_IDS.put(barcodeType, Math.toIntExact(autoOutCount - count));
                }
            }
        } catch (Exception e){

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

@@ -23,10 +23,10 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -50,7 +50,7 @@
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {

    @Autowired
    private AsnOrderService asnOrderMapper;
    private AsnOrderMapper asnOrderMapper;

    @Autowired
    private FieldsService fieldsService;
@@ -61,15 +61,10 @@
    private MatnrService matnrService;

    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Autowired
    private CompanysService companysService;

    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private AsnOrderService asnOrderService;

    @Override
    public R generateBarcode(List<Long> orders) {
@@ -109,7 +104,7 @@
                throw new CoolException("单号不能为空！！");
            }
            AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
            WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
            WkOrder order = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
            if (!Objects.isNull(order)) {
                sbFaild.append(template.getCode()).append(",已添加！！");
                throw new CoolException(sbFaild.toString());
@@ -138,7 +133,7 @@
                    .setCreateBy(loginUserId)
                    .setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()));
            if (!asnOrderMapper.save(order)) {
            if (asnOrderMapper.insert(order) <= 0) {
                throw new CoolException("单据保存失败！！");
            }
            List<WkOrderItem> items = new ArrayList<>();
@@ -200,17 +195,17 @@
                }
                items.add(orderItem);

                if (!asnOrderItemService.save(orderItem)) {
                if (!this.save(orderItem)) {
                    throw new CoolException("单据明细保存失败！！");
                }
            }
            if (!items.isEmpty()) {
//                double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
                double anfme = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
                if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>()
//                        .set(AsnOrder::getQty, qty)
                        .set(WkOrder::getAnfme, anfme)
                        .eq(WkOrder::getId, order.getId()))) {
                        .eq(WkOrder::getId, order.getId())) <= 0) {
                    throw new CoolException("单据数量修改失败！！");
                }
            }
@@ -252,7 +247,7 @@
        wkOrderItem.setId(originalId);
        wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());

        WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
        WkOrder wkOrder = asnOrderMapper.selectById(Long.parseLong(params.get("orderId").toString()));
        if (Objects.isNull(wkOrder)) {
            throw new CoolException("数据错误，单据不存在！！");
        }

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

@@ -7,13 +7,13 @@
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderLogMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private AsnOrderService asnOrderService;
    private AsnOrderMapper asnOrderMapper;
    /**
     * @author Ryan
     * @description 继续收货
@@ -52,12 +52,12 @@
                .setDeleted(0)
                .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);

        WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
        WkOrder wkOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
        if (!Objects.isNull(wkOrder)) {
            throw new CoolException("收货单据已添加，刷新后再操作！！");
        }

        if (!asnOrderService.saveOrUpdate(order)) {
        if (asnOrderMapper.insert(order) <= 0) {
            throw new CoolException("单据保存失败！！");
        }
        List<AsnOrderItemLog> itemLogs = asnOrderItemLogService

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

@@ -7,7 +7,6 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.controller.dto.DashboardDto;
@@ -18,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -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;
@@ -46,8 +46,6 @@
@Service("asnOrderService")
public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements AsnOrderService {

    @Autowired
    private ReceiveMsgService receiveMsgService;
    @Autowired
    private ReportMsgService reportMsgService;

@@ -66,9 +64,7 @@
    @Autowired
    private PurchaseItemService purchaseItemService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private TaskService taskService;
    private TaskMapper taskMapper;

    @Override
    public boolean notifyInspect(List<WkOrder> orders) {
@@ -426,7 +422,7 @@
        dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());

        //获取执行中任务数量
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
        List<Task> tasks = taskMapper.selectList(new LambdaQueryWrapper<>());
        if (!tasks.isEmpty()) {
            dto.setTaskQty(tasks.size());
        }

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

@@ -45,8 +45,6 @@
    private LocServiceImpl locService;
    @Autowired
    private TaskItemServiceImpl taskItemService;
    @Autowired
    private CheckOrderService checkOrderService;

    /**
     * @author Ryan

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

@@ -11,11 +11,11 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.DeliveryTemplate;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.DeliveryMapper;
import com.vincent.rsf.server.manager.mapper.DeliveryItemMapper;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.DeliveryService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -34,14 +34,11 @@
public class DeliveryItemServiceImpl extends ServiceImpl<DeliveryItemMapper, DeliveryItem> implements DeliveryItemService {

    @Autowired
    private DeliveryService deliveryService;
    private DeliveryMapper deliveryMapper;
    @Autowired
    private MatnrService matnrService;
    @Autowired
    private CompanysService companysService;
    @Autowired
    private DeliveryItemService deliveryItemService;

    /**
     * excel DO单导入
     *
@@ -65,7 +62,7 @@
                throw new CoolException("单号不能为空！！");
            }
            DeliveryTemplate template = listMap.get(key).stream().findFirst().get();
            Delivery order = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
            Delivery order = deliveryMapper.selectOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
            if (!Objects.isNull(order)) {
                sbFaild.append(template.getDoCode()).append(",已添加！！");
                throw new CoolException(sbFaild.toString());
@@ -93,7 +90,7 @@
                    .setAnfme(Double.parseDouble(template.getAnfme()))
                    .setUpdateBy(loginUserId)
                    .setCreateBy(loginUserId);
            if (!deliveryService.save(order)) {
            if (deliveryMapper.insert(order) <= 0) {
                throw new CoolException("单据保存失败！！");
            }
            List<DeliveryItem> items = new ArrayList<>();
@@ -148,15 +145,15 @@
                }
                items.add(orderItem);

                if (!deliveryItemService.save(orderItem)) {
                if (!this.save(orderItem)) {
                    throw new CoolException("单据明细保存失败！！");
                }
            }
            if (!items.isEmpty()) {
                Double anfme = items.stream().mapToDouble(DeliveryItem::getAnfme).sum();
                if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
                if (deliveryMapper.update(null, new LambdaUpdateWrapper<Delivery>()
                        .set(Delivery::getAnfme, anfme)
                        .eq(Delivery::getId, order.getId()))) {
                        .eq(Delivery::getId, order.getId())) <= 0) {
                    throw new CoolException("单据数量修改失败！！");
                }
            }

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

@@ -12,7 +12,10 @@
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.LocItemMapper;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.mapper.WaveMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -23,6 +26,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -37,19 +41,18 @@
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;
    private TaskMapper taskMapper;
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private DeviceSiteService deviceSiteService;
    @Autowired
    @Lazy
    private WcsService wcsService;
    @Autowired
    private OutStockService outStockService;
    private AsnOrderMapper asnOrderMapper;
    @Autowired
    private WaveService waveService;
    private WaveMapper waveMapper;
    @Autowired
    private BasStationService basStationService;
    @Autowired
@@ -122,7 +125,7 @@
            throw new CoolException("空容器出库！！其他类型无效，进入类型："+map.getType());
        }

        if (!taskService.save(task)) {
        if (taskMapper.insert(task) <= 0) {
            throw new CoolException("任务创建失败！！");
        }
    }
@@ -155,10 +158,10 @@
        if (!Objects.isNull(map.getSourceId())) {
            if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
                order = new WkOrder();
                wave = waveService.getById(map.getSourceId());
                wave = waveMapper.selectById(map.getSourceId());
            } else {
                wave = new Wave();
                order = outStockService.getById(map.getSourceId());
                order = asnOrderMapper.selectById(map.getSourceId());
            }
        } else {
            wave = new Wave();
@@ -258,7 +261,7 @@
                task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
            }

            if (!taskService.save(task)) {
            if (taskMapper.insert(task) <= 0) {
                throw new CoolException("任务创建失败！！");
            }

@@ -286,11 +289,11 @@

            if (!Objects.isNull(moveTask.getId())) {
                moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
                if (!taskService.saveOrUpdate(moveTask)) {
                if ((Objects.isNull(moveTask.getId()) ? taskMapper.insert(moveTask) : taskMapper.updateById(moveTask)) <= 0) {
                    throw new CoolException("任务信息修改失败！！");
                }
                task.setParentId(moveTask.getId());
                if (!taskService.updateById(task)) {
                if (taskMapper.updateById(task) <= 0) {
                    throw new CoolException("主任务关联失败！！");
                }
            }
@@ -327,7 +330,7 @@
                taskItems.add(taskItem);

                Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;
                LocItem locItem = locItemService.getById(item.getId());
                LocItem locItem = this.getById(item.getId());
                if (Objects.isNull(locItem)) {
                    throw new CoolException("库存信息不存在！");
                }
@@ -344,7 +347,7 @@
                }
                item.setUpdateBy(loginUserId).setUpdateTime(new Date());

                if (!locItemService.updateById(item)) {
                if (!this.updateById(item)) {
                    throw new CoolException("库存信息修改失败！！");
                }

@@ -510,11 +513,11 @@
                .setBarcode(orgLoc.getBarcode())
                .setMemo(map.getMemo());

        if (!taskService.save(task)) {
        if (taskMapper.insert(task) <= 0) {
            throw new CoolException("新建移库任务失败！！");
        }

        List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
        List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
        if (!locItems.isEmpty()) {
            List<TaskItem> taskItems = new ArrayList<>();
            for (LocItem item : locItems) {

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

@@ -42,9 +42,6 @@
    private LocAreaService locAreaService;
    @Autowired
    private LocTypeRelaMapper locTypeRelaMapper;
    @Autowired
    private LocService locService;

    @Override
    public R modifyLocs(LocModifyParams locs) {
        if (locs.getId().isEmpty()) {

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

@@ -22,10 +22,10 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -48,11 +48,9 @@
public class OutStockItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements OutStockItemService {

    @Autowired
    private OutStockService outStockService;
    private AsnOrderMapper asnOrderMapper;
    @Autowired
    private MatnrService matnrService;
    @Autowired
    private OutStockItemService outStockItemService;

    /**
     * @param
@@ -107,7 +105,7 @@
        Map<String, List<OutStockTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(OutStockTemplate::getCode));
        for (String key : listMap.keySet()) {
            OutStockTemplate template = listMap.get(key).stream().findFirst().get();
            WkOrder wkOrder = outStockService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
            WkOrder wkOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
            if (!Objects.isNull(wkOrder)) {
                continue;
            }
@@ -119,7 +117,7 @@
                    .setCreateBy(loginUserId)
                    .setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()));
            if (!outStockService.save(order)) {
            if (asnOrderMapper.insert(order) <= 0) {
                throw new CoolException("单据保存失败！！");
            }
            List<WkOrderItem> items = new ArrayList<>();
@@ -143,15 +141,15 @@
                    orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
                }
                items.add(orderItem);
                if (!outStockItemService.saveBatch(items)) {
                if (!this.saveBatch(items)) {
                    throw new CoolException("单据明细保存失败！！");
                }
            }
            if (!items.isEmpty()) {
                double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                if (!outStockService.update(new LambdaUpdateWrapper<WkOrder>()
                if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>()
                                .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
                        .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
                        .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId())) <= 0) {
                    throw new CoolException("单据数量修改失败！！");
                }
            }

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

@@ -67,8 +67,6 @@
    @Autowired
    private OutStockItemService outStockItemService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WaveRuleService waveRuleService;
    @Autowired
    private LocItemService locItemService;
@@ -633,7 +631,7 @@
            return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
        }).reversed()).collect(Collectors.toList());

        WkOrder wkOrder = outStockService.getById(outId);
        WkOrder wkOrder = this.getById(outId);
        if (Cools.isEmpty(wkOrder)) {
            throw new CoolException("单据不存在！！");
        }
@@ -729,7 +727,7 @@

        Double sum = itemList.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
        //更新出库单明细及主单
        WkOrder outOrder = outStockService.getById(outId);
        WkOrder outOrder = this.getById(outId);
        if (Objects.isNull(outOrder)) {
            throw new CoolException("出库单据不存在！！");
        }
@@ -737,7 +735,7 @@

        outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);

        if (!outStockService.updateById(outOrder)) {
        if (!this.updateById(outOrder)) {
            throw new CoolException("出库单状态修改失败！！");
        }


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

@@ -10,10 +10,10 @@
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.mapper.QlyInspectMapper;
import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.QlyInspectResultService;
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -31,14 +31,12 @@
public class QlyIsptItemServiceImpl extends ServiceImpl<QlyIsptItemMapper, QlyIsptItem> implements QlyIsptItemService {

    @Autowired
    private QlyInspectService qlyInspectService;
    private QlyInspectMapper qlyInspectMapper;
    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Autowired
    private QlyInspectResultService qlyInspectResultService;
    @Autowired
    private QlyIsptItemService qlyIsptItemService;
    @Autowired
    private WarehouseAreasItemServiceImpl warehouseAreasItemService;
    @Autowired
@@ -103,7 +101,7 @@

            Double isptQty = isptRelt.stream().mapToDouble(QlyInspectResult::getAnfme).sum();

            if (!qlyIsptItemService.update(new LambdaUpdateWrapper<QlyIsptItem>()
            if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
                    .set(QlyIsptItem::getUpdateBy, loginUserId)
                    .set(QlyIsptItem::getAnfme, isptQty)
                    .eq(QlyIsptItem::getId, item.getId()))) {
@@ -139,7 +137,7 @@
                .in(QlyInspectResult::getIsptId, isptIds));
        Double sum = items.stream().mapToDouble(QlyInspectResult::getAnfme).sum();
        if (sum.compareTo(0.00) > 0) {
            qlyInspectService.update(new LambdaUpdateWrapper<QlyInspect>()
            qlyInspectMapper.update(null, new LambdaUpdateWrapper<QlyInspect>()
                    .set(QlyInspect::getIsptQty, sum)
                    .set(QlyInspect::getUpdateBy, loginUserId)
                    .eq(QlyInspect::getId, isptItem.stream().findFirst().get().getIspectId()));

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

@@ -2,11 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CommonExceStatus;
import com.vincent.rsf.server.manager.mapper.ReviseLogMapper;
import com.vincent.rsf.server.manager.mapper.ReviseLogItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,13 +22,11 @@
public class ReviseLogItemServiceImpl extends ServiceImpl<ReviseLogItemMapper, ReviseLogItem> implements ReviseLogItemService {

    @Autowired
    private ReviseLogService reviseLogService;
    private ReviseLogMapper reviseLogMapper;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private ReviseLogItemService reviseLogItemService;
    @Autowired
    private LocReviseService locReviseService;

@@ -43,7 +40,7 @@
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public List<ReviseLogItem> itemSave(ReviseLogItemParams reviseLogItem, Long userId) {
        ReviseLog reviseLog = reviseLogService.getById(reviseLogItem.getReviseLogId());
        ReviseLog reviseLog = reviseLogMapper.selectById(reviseLogItem.getReviseLogId());
        if (Objects.isNull(reviseLog)) {
            throw new RuntimeException("库存历史单据不存在！！");
        }
@@ -97,12 +94,12 @@
//            }
        });

        List<ReviseLog> list = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
        List<ReviseLog> list = reviseLogMapper.selectList(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
        if (Objects.isNull(list)) {
            throw new RuntimeException("数据错误：库存调整单不存在！！");
        }
        List<Long> reviseIds = list.stream().map(ReviseLog::getId).collect(Collectors.toList());
        List<ReviseLogItem> logItems = reviseLogItemService.list(new LambdaQueryWrapper<ReviseLogItem>()
        List<ReviseLogItem> logItems = this.list(new LambdaQueryWrapper<ReviseLogItem>()
                .in(ReviseLogItem::getReviseLogId, reviseIds));

        Double anfems = logItems.stream().mapToDouble(ReviseLogItem::getAnfme).sum();

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

@@ -30,9 +30,6 @@
    private LocReviseService locReviseService;

    @Autowired
    private ReviseLogService reviseLogService;

    @Autowired
    private LocItemService locItemService;

    @Autowired
@@ -67,7 +64,7 @@
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setReviseCode(locRevise.getCode());
            if (!reviseLogService.save(reviseLog)) {
            if (!this.save(reviseLog)) {
                throw new CoolException("调整单明细保存失败！！");
            }

@@ -113,7 +110,7 @@
        if (!revise.getExceStatus().equals(CommonExceStatus.COMMON_EXCE_STATUS_EXCE_ING.val)) {
            throw new CoolException("单据状态未执行或已完成，无法执行完成操作！！");
        }
        List<ReviseLog> logs = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
        List<ReviseLog> logs = this.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
        if (logs.isEmpty()) {
            throw new CoolException("库存日志不存在！！");
        }

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

@@ -44,6 +44,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -97,10 +98,9 @@
    @Autowired
    private BasStationService basStationService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private LocItemWorkingService locItemWorkingService;
    @Autowired
    @Lazy
    private WcsService wcsService;
    @Autowired
    private OutStockService outStockService;
@@ -109,6 +109,7 @@
    @Autowired
    private CheckOrderItemService checkOrderItemService;
    @Autowired
    @Lazy
    private CheckOrderService checkOrderService;
    @Autowired
    private CheckDiffService checkDiffService;
@@ -123,6 +124,7 @@
    @Autowired
    private RemotesInfoProperties.RcsApi rcsApi;
    @Autowired
    @Lazy
    private FlowStepInstanceService flowStepInstanceService;
    @Autowired
    private RemotesInfoProperties.WmsOpenApi wmsOpenApi;
@@ -791,14 +793,14 @@
    @Transactional(rollbackFor = Exception.class)
    public Task taskToTop(Long id, Long loginUserId) throws Exception {
        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
        Task tasks = this.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
        if (Objects.isNull(tasks)) {
            throw new CoolException("任务已处执行状态不可一键置顶！！");
        }
        //判断浅库位任务，修改任务优先级
        modiftyTaskSort(tasks, loginUserId);

        if (!taskService.updateById(tasks)) {
        if (!this.updateById(tasks)) {
            throw new CoolException("置顶失败！！");
        }
        return null;
@@ -963,7 +965,7 @@
                throw new CoolException("数据错误，库位不存在！！");
            }
            if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
                Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
                Task serviceOne = this.getOne(new LambdaQueryWrapper<Task>()
                        .eq(Task::getOrgLoc, loc.getCode())
                        .or()
                        .eq(Task::getTargLoc, loc.getCode()));
@@ -1184,7 +1186,7 @@
        locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));

        task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
        if (!taskService.updateById(task)) {
        if (!this.updateById(task)) {
            throw new CoolException("任务状态修改失败！！");
        }

@@ -1241,7 +1243,7 @@
        locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));

        task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
        if (!taskService.updateById(task)) {
        if (!this.updateById(task)) {
            throw new CoolException("任务状态修改失败！！");
        }
        // 盘点再入库任务结束：将关联的盘点差异单置为已审核
@@ -1255,7 +1257,7 @@
     */
    @Override
    public void markCheckDiffApprovedWhenCheckInDone(Task checkInTask) {
        Task outTask = taskService.getOne(new LambdaQueryWrapper<Task>()
        Task outTask = this.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getBarcode, checkInTask.getBarcode())
                .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)
                .last("limit 1"));
@@ -1333,7 +1335,7 @@
                    throw new CoolException("移库目标库位状态修改失败！！");
                }

                Task outTask = taskService.getById(task.getParentId());
                Task outTask = this.getById(task.getParentId());
                if (!Objects.isNull(outTask)) {
                    LocToTaskParams params = new LocToTaskParams();
                    params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
@@ -2215,7 +2217,7 @@
            return R.error("任务编码不能为空！！");
        }
        List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
        List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
                .in(Task::getId, ids)
                .in(Task::getTaskStatus, integers)
                .orderByDesc(Task::getSort));
@@ -2229,7 +2231,7 @@
            }
        }

        taskService.pubTaskToWcs(tasks);
        this.pubTaskToWcs(tasks);

        return R.ok();
    }
@@ -2355,7 +2357,7 @@
                                throw new CoolException("站点不存在！！");
                            }

                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                            if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
                                throw new CoolException("任务状态修改失败！！");
                            }
@@ -2379,7 +2381,7 @@
                                throw new CoolException("站点不存在！！");
                            }

                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                            if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
                                throw new CoolException("任务状态修改失败！！");
                            }

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

@@ -42,8 +42,6 @@
    @Autowired
    private TransferOrderService transferOrderService;
    @Autowired
    private TransferService transferService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
@@ -334,7 +332,7 @@
            transferOrderService.remove(new LambdaQueryWrapper<TransferOrder>().in(TransferOrder::getTransferId, list));
        }

        transferService.removeByIds(list);
        this.removeByIds(list);
        transferItemService.remove(new LambdaQueryWrapper<TransferItem>().in(TransferItem::getTransferId, list));
        return true;
    }

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

@@ -8,6 +8,7 @@
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,7 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -26,11 +28,9 @@


    @Autowired
    private AsnOrderService asnOrderService;
    private AsnOrderMapper asnOrderMapper;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinItemService waitPakinItemService;
    @Autowired
@@ -38,10 +38,9 @@
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    @Lazy
    private AgvService  agvService;


@@ -63,7 +62,7 @@
            throw new CoolException("参数错误：托盘码为空！！");
        }
//        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
        WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
        WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (!Objects.isNull(pakin)) {
            throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + pakin.getCode() + "使用！！");
@@ -129,7 +128,7 @@
                    .setUpdateBy(userId)
                    .setCreateBy(userId)
                    .setMatnrCode(warehouseAreasItems.getMatnrCode());
            WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
            WkOrder order = asnOrderMapper.selectById(warehouseAreasItems.getAsnId());
            if (!Objects.isNull(order)) {
                pakinItem.setType(null == order.getType() ? null : order.getType())
                        .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -189,7 +188,7 @@
        if (StringUtils.isBlank(waitPakin.getBarcode())) {
            throw new CoolException("参数错误：托盘码为空！！");
        }
        WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
        WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (!Objects.isNull(pakin)) {
            throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + pakin.getCode() + "使用！！");
@@ -227,7 +226,7 @@
            throw new CoolException("参数错误：托盘码为空！！");
        }
//        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
        WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
        WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
        if (!Objects.isNull(pakin)) {
            throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + pakin.getCode() + "使用！！");
@@ -282,7 +281,7 @@
                    .setUpdateBy(userId)
                    .setCreateBy(userId)
                    .setMatnrCode(warehouseAreasItems.getMatnrCode());
            WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
            WkOrder order = asnOrderMapper.selectById(warehouseAreasItems.getAsnId());
            if (!Objects.isNull(order)) {
                pakinItem.setType(null == order.getType() ? null : order.getType())
                        .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -348,7 +347,7 @@
    public synchronized WaitPakin unBind(WaitPakinParam param) {
        String barcode = param.getBarcode();
        if (StringUtils.isNotBlank(barcode)) {
            WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
            WaitPakin waitPakins = this.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
            if (Objects.isNull(waitPakins)) {
                throw new CoolException("组托不存在！！");
            }
@@ -408,13 +407,13 @@
            double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum();
//            double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
            if (waitPakins.getAnfme().compareTo(anfmes) <= 0) {
                if (!waitPakinService.removeById(waitPakins.getId())) {
                if (!this.removeById(waitPakins.getId())) {
                    throw new CoolException("组托删除失败！！");
                }
            } else {
                Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 10000) / 10000.0;
                waitPakins.setAnfme(anfme);
                if (!waitPakinService.updateById(waitPakins)) {
                if (!this.updateById(waitPakins)) {
                    throw new CoolException("组托数据修改失败！！");
                }
            }
@@ -471,7 +470,7 @@
            }
        }

        if (!waitPakinService.removeByIds(pakinIds)) {
        if (!this.removeByIds(pakinIds)) {
            return R.error("Delete Fail");
        }


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

@@ -41,17 +41,11 @@
    @Autowired
    private WaveItemService waveItemService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private WaveRuleServiceImpl waveRuleService;
    @Autowired
@@ -124,7 +118,7 @@
            throw new CoolException("参数不能为空！！");
        }
        List<Long> WaveIds = JSONArray.parseArray(JSON.toJSONString(map.get("ids")), Long.class);
        List<Wave> waves = waveService.listByIds(WaveIds);
        List<Wave> waves = this.listByIds(WaveIds);
        if (Objects.isNull(waves)) {
            throw new CoolException("数据错误： 波次不存在！！");
        }
@@ -170,7 +164,7 @@
                    wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
                }
                wave.setMemo("-->库存不足");
                waveService.updateById(wave);
                this.updateById(wave);
                return R.ok();
            }
            try {
@@ -209,7 +203,7 @@
            Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
            Double v = Math.round((wave.getWorkQty() + sum) * 1000000) / 1000000.0;
            if (wave.getAnfme().compareTo(v) == 0) {
                if (!waveService.update(new LambdaUpdateWrapper<Wave>()
                if (!this.update(new LambdaUpdateWrapper<Wave>()
                        .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
                        .set(Wave::getWorkQty, v)
                        .set(Wave::getUpdateBy, loginUserId)
@@ -219,7 +213,7 @@
                    throw new CoolException("波次状态修改失败！！");
                }
            } else {
                if (!waveService.update(new LambdaUpdateWrapper<Wave>()
                if (!this.update(new LambdaUpdateWrapper<Wave>()
                        .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
                        .set(Wave::getWorkQty, v)
                        .set(Wave::getUpdateBy, loginUserId)

 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 next = CronExpression.parse(cronExpr.trim())
                .next((after == null ? new Date() : after).toInstant().atZone(ZoneId.systemDefault()));
        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

@@ -11,10 +11,10 @@
import com.vincent.rsf.server.system.service.RoleMenuService;
import com.vincent.rsf.server.system.service.UserRoleService;
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;

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

@Service("userService")
@@ -25,7 +25,7 @@
    @Resource
    private RoleMenuService roleMenuService;
    @Resource
    private BCryptPasswordEncoder bCryptPasswordEncoder;
    private PasswordEncoder passwordEncoder;

    @Override
    public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
@@ -69,12 +69,12 @@

    @Override
    public boolean comparePassword(String dbPassword, String inputPassword) {
        return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
        return passwordEncoder.matches(inputPassword, dbPassword);
    }

    @Override
    public String encodePassword(String password) {
        return password == null ? null : bCryptPasswordEncoder.encode(password);
        return password == null ? null : passwordEncoder.encode(password);
    }

    @Override

 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-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

 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>
            <maxFileSize>10MB</maxFileSize>
            <maxHistory>10</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
        </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>
            <maxFileSize>10MB</maxFileSize>
            <maxHistory>10</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
        </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>