root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge:代码合并

Browse Source
This commit is contained in:
zhouz
2025-11-27 17:10:08 +08:00
parent 422b234821
commit 0ec9b86d54
4 changed files with 112 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/pom.xml
View File

@@ -113,11 +113,11 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.apache.shardingsphere</groupId>--> <groupId>org.apache.shardingsphere</groupId>
<!-- <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>--> <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
<!-- <version>5.1.1</version>--> <version>5.1.1</version>
<!-- </dependency>--> </dependency>
<!--Spring boot 核心 --> <!--Spring boot 核心 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -1296,7 +1296,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
* @param iostorinv_id： 单据标识 * @param iostorinv_id： 单据标识
* @return List<JSONObject> 生成任务的集合 * @return List<JSONObject> 生成任务的集合
*/ */
private List<JSONObject> createTaskMange(List<JSONObject> disLikeList, String iostorinv_id) { private JSONObject createTaskMange(List<JSONObject> disLikeList, String iostorinv_id) {
// 仓位表 // 仓位表
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -37,6 +37,10 @@ public abstract class AbstractAcsTask {
return addTask(); return addTask();
} }
public List<AcsTaskDto> schedule(String taskId) {
return addTask(taskId);
}
/** /**
* 添加任务进行下发 * 添加任务进行下发
* *
@@ -45,6 +49,10 @@ public abstract class AbstractAcsTask {
public abstract List<AcsTaskDto> addTask(); public abstract List<AcsTaskDto> addTask();
public List<AcsTaskDto> addTask(SchBaseTask task){ public List<AcsTaskDto> addTask(SchBaseTask task){
throw new BadRequestException("当前类没有重写addTask(task)方法");
};
public List<AcsTaskDto> addTask(String task_id){
throw new BadRequestException("当前类没有重写addTask(taskId)方法"); throw new BadRequestException("当前类没有重写addTask(taskId)方法");
}; };

149
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -1,57 +1,104 @@
server: server:
port: 9999 port: 8013
#配置数据源 #配置数据源
spring: spring:
datasource: shardingsphere:
druid: datasource:
db-type: com.alibaba.druid.pool.DruidDataSource names: master,slave
driverClassName: com.mysql.cj.jdbc.Driver master:
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true type: com.alibaba.druid.pool.DruidDataSource
username: ${DB_USER:root} driver-class-name: com.mysql.cj.jdbc.Driver
password: ${DB_PWD:123456} # 初始连接数
# 初始连接数 initial-size: 20
initial-size: 5 # 最小连接数
# 最小连接数 min-idle: 30
min-idle: 15 # 最大连接数
# 最大连接数 max-active: 300
max-active: 30 # 是否自动回收超时连接
# 超时时间(以秒数为单位) socket-timeout: 10
remove-abandoned-timeout: 180 query-time-out: 7
# 获取连接超时时间 transaction-query-timeout: 30
max-wait: 3000 # 获取连接超时时间
# 连接有效性检测时间 max-wait: 4000
time-between-eviction-runs-millis: 60000 # 连接有效性检测时间
# 连接在池中最小生存的时间 time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000 # 连接在池中最小生存的时间
# 连接在池中最大生存的时间 min-evictable-idle-time-millis: 300000
max-evictable-idle-time-millis: 600000 # 连接在池中最大生存的时间
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除 max-evictable-idle-time-millis: 900000
test-while-idle: true # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个 test-while-idle: true
test-on-borrow: true # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
# 是否在归还到池中前进行检验 test-on-borrow: true
test-on-return: false # 是否在归还到池中前进行检验
# 检测连接是否有效 test-on-return: false
validation-query: select 1 # 检测连接是否有效
# 配置监控统计 validation-query: select 1
webStatFilter: # 配置监控统计
enabled: true webStatFilter:
stat-view-servlet: enabled: true
enabled: true stat-view-servlet:
url-pattern: /druid/* enabled: true
reset-enable: false url-pattern: /druid/*
filters: reset-enable: false
DruidFilter,stat filters:
# query-timeout: 1 DruidFilter,stat
# stat: url: jdbc:mysql://localhost:3306/lms_xc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
# enabled: true username: root
# # 记录慢SQL password: root
# log-slow-sql: true slave:
# slow-sql-millis: 1000 type: com.alibaba.druid.pool.DruidDataSource
# merge-sql: true driver-class-name: com.mysql.cj.jdbc.Driver
# wall: # 初始连接数
# config: initial-size: 20
# multi-statement-allow: true # 最小连接数
min-idle: 30
# 最大连接数
max-active: 300
# 是否自动回收超时连接
socket-timeout: 10
query-time-out: 7
transaction-query-timeout: 30
# 获取连接超时时间
max-wait: 4000
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
# 连接在池中最大生存的时间
max-evictable-idle-time-millis: 900000
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
test-while-idle: true
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
test-on-borrow: true
# 是否在归还到池中前进行检验
test-on-return: false
# 检测连接是否有效
validation-query: select 1
# 配置监控统计
webStatFilter:
enabled: true
stat-view-servlet:
enabled: true
url-pattern: /druid/*
reset-enable: false
filters:
DruidFilter,stat
url: jdbc:mysql://127.0.0.1:3306/lms_xc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: root
password: root
rules:
readwrite-splitting:
data-sources:
db:
type: Static
props:
#接口有事务，读写分离不生效，默认全部使用主库
write-data-source-name: master
read-data-source-names: slave
#负载均衡算法名称
load-balancer-name: round-robin
redis: redis:
#数据库索引 #数据库索引
database: ${REDIS_DB:15} database: ${REDIS_DB:15}