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

opt:修改正式环境相关

Browse Source
This commit is contained in:
gongbx
2024-05-13 15:52:58 +08:00
parent b34294d53c
commit 01538e9288
5 changed files with 74 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java
View File

@@ -458,7 +458,7 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
public static Date getDateFormat(String date) public static Date getDateFormat(String date)
throws ParseException { throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat(date.contains("-")?"yyyy-MM-dd":"yyyy/MM/dd");
return dateFormat.parse(date); return dateFormat.parse(date);
} }

8
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
View File

@@ -7,7 +7,7 @@
FROM FROM
EAS_NOBLE.V_UC_OUTINBILL EAS_NOBLE.V_UC_OUTINBILL
WHERE DJZT = '提交' WHERE DJZT = '提交'
AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '8' DAY(3) AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '30' DAY(3)
</select> </select>
<select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT SELECT
@@ -19,7 +19,7 @@
DJZT = '未入库' DJZT = '未入库'
AND CJSJ >= DATE_SUB( AND CJSJ >= DATE_SUB(
CURDATE(), CURDATE(),
INTERVAL 8 DAY) INTERVAL 30 DAY)
</select> </select>
<select id="selectEasIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="selectEasIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT SELECT
@@ -27,13 +27,13 @@
FROM FROM
EAS_NOBLE.V_UC_OUTINBILL EAS_NOBLE.V_UC_OUTINBILL
WHERE DJZT = '提交' WHERE DJZT = '提交'
AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '8' DAY(3) AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '30' DAY(3)
</select> </select>
<select id="selectSrmIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="selectSrmIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT SELECT
FLID,DJID FLID,DJID
FROM V_WMS_INBILL_THIRD FROM V_WMS_INBILL_THIRD
WHERE DJZT='未入库' AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 8 DAY) WHERE DJZT='未入库' AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
</select> </select>
<select id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo"> <select id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo">
SELECT SELECT

42
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
View File

@@ -178,24 +178,24 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
@Override @Override
public void insertOrUpdateBills(List<EasOutInBillDetail> easOutInBillDetails, List<EasOutInBillDetail> existingIds) { public void insertOrUpdateBills(List<EasOutInBillDetail> easOutInBillDetails, List<EasOutInBillDetail> existingIds) {
// CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
// try { try {
insertBills(easOutInBillDetails, existingIds); insertBills(easOutInBillDetails, existingIds);
// } catch (Exception e) { } catch (Exception e) {
// log.error("异常信息：" + e); log.error("异常信息：" + e);
// } }
// }, pool); }, pool);
// CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
// try { try {
updateBills(easOutInBillDetails, existingIds); updateBills(easOutInBillDetails, existingIds);
// } catch (Exception e) { } catch (Exception e) {
// log.error("异常信息：" + e); log.error("异常信息：" + e);
// } }
// }, pool); }, pool);
// CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
// //todo 检查事务是否会失效 //todo 检查事务是否会失效
autoDeleteBill(easOutInBillDetails, existingIds); autoDeleteBill(easOutInBillDetails, existingIds);
// }, pool); }, pool);
} }
@@ -355,10 +355,10 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void autoDeleteBill(List<EasOutInBillDetail> easOutInBillDetails, List<EasOutInBillDetail> existingIds) { public void autoDeleteBill(List<EasOutInBillDetail> easOutInBillDetails, List<EasOutInBillDetail> existingIds) {
try { try {
// 获取距离今天8天前的日期 // 获取距离今天30天前的日期
LocalDate eightDaysAgo = LocalDate.now().minusDays(8); LocalDate eightDaysAgo = LocalDate.now().minusDays(30);
existingIds = existingIds.stream() existingIds = existingIds.stream()
.filter(e -> "提交".equals(e.getDjzt())||"未入库".equals(e.getDjzt())) .filter(e -> "提交".equals(e.getDjzt()) || "未入库".equals(e.getDjzt()))
.filter(e -> { .filter(e -> {
try { try {
return org.nl.common.utils.DateUtil.getDateFormat(e.getCjsj()).toInstant().atZone(ZoneId.systemDefault()).toLocalDate().isAfter(eightDaysAgo); return org.nl.common.utils.DateUtil.getDateFormat(e.getCjsj()).toInstant().atZone(ZoneId.systemDefault()).toLocalDate().isAfter(eightDaysAgo);

4
nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java
View File

@@ -59,7 +59,7 @@ public class EasBillSchedule {
* eas单据数据同步 * eas单据数据同步
*/ */
@Async("taskExecutor") @Async("taskExecutor")
@Scheduled(cron = "0/20 * * * * *") @Scheduled(cron = "0/120 * * * * *")
public void getEasOutInBills() { public void getEasOutInBills() {
// 获取eas视图查询未提交的单据 // 获取eas视图查询未提交的单据
List<EasOutInBillDetail> easOutInBillDetails = easOutInBillDetailMapper.selectPageWithInventory(); List<EasOutInBillDetail> easOutInBillDetails = easOutInBillDetailMapper.selectPageWithInventory();
@@ -81,7 +81,7 @@ public class EasBillSchedule {
* eas单据自动审核 * eas单据自动审核
*/ */
@Async("taskExecutor") @Async("taskExecutor")
//@Scheduled(cron = "0/120 * * * * *") @Scheduled(cron = "0/180 * * * * *")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void automaticAuditBills() { public void automaticAuditBills() {
try { try {

63
nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -10,19 +10,24 @@ spring:
datasource: datasource:
mysql: mysql:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
mysql_srm: mysql_srm:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# username: ${DB_USER:wms_third}
# password: ${DB_PWD:NOBLElift@!#wms}
# type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:10.10.188.30}:${DB_PORT:3306}/${DB_NAME:nuoli_v1.0}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:10.10.188.32}:${DB_PORT:3306}/${DB_NAME:nuoli_v1.0}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:wms_third} username: ${DB_USER:wms_third}
password: ${DB_PWD:NOBLElift@!#wms} password: ${DB_PWD:NOBLElift@#wms}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
oracle_eas: oracle_eas:
driver-class-name: oracle.jdbc.OracleDriver driver-class-name: oracle.jdbc.OracleDriver
url: jdbc:oracle:thin:@192.168.100.97:1521:orcl url: jdbc:oracle:thin:@192.168.100.98:1521:orcl
username: ${DB_USER:stuser} username: ${DB_USER:stuser}
password: ${DB_PWD:stuser123} password: ${DB_PWD:stuser123}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
@@ -42,14 +47,12 @@ spring:
threads: 4 threads: 4
nettyThreads: 4 nettyThreads: 4
singleServerConfig: singleServerConfig:
database: 3 database: 15
connectionMinimumIdleSize: 8 connectionMinimumIdleSize: 8
connectionPoolSize: 8 connectionPoolSize: 8
address: redis://127.0.0.1:6379 address: redis://127.0.0.1:6379
idleConnectionTimeout: 10000 idleConnectionTimeout: 10000
timeout: 3000 timeout: 3000
# 登录相关配置 # 登录相关配置
login: login:
# 登录缓存 # 登录缓存
@@ -68,23 +71,48 @@ login:
heigth: 36 heigth: 36
# 内容长度 # 内容长度
length: 2 length: 2
# 字体名称，为空则使用默认字体 # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
font-name: font-name:
# 字体大小 # 字体大小
font-size: 25 font-size: 25
#是否允许生成代码，生产环境设置为false #jwt
generator: jwt:
enabled: true header: Authorization
# 令牌前缀
#是否开启 swagger-ui token-start-with: Bearer
swagger: # 必须使用最少88位的Base64对该令牌进行编码
enabled: true base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
# 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
token-validity-in-seconds: 7200000
# 在线用户key
online-key: online-token-
# 验证码
code-key: code-key-
# token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
detect: 1800000
# 续期时间范围，默认 1小时，这里单位毫秒
renew: 3600000
# IP 本地解析 # IP 本地解析
ip: ip:
local-parsing: true local-parsing: true
#是否允许生成代码，生产环境设置为false
generator:
enabled: false
#如果生产环境要开启swagger，需要配置请求地址
#springfox:
# documentation:
# swagger:
# v2:
# host: # 接口域名或外网ip
#是否开启 swagger-ui
swagger:
enabled: false
# 文件存储路径 # 文件存储路径
file: file:
mac: mac:
@@ -101,7 +129,7 @@ file:
avatarMaxSize: 5 avatarMaxSize: 5
logging: logging:
file: file:
path: C:\log\wms path: /app/jar/logs
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
# Sa-Token配置 # Sa-Token配置
@@ -130,6 +158,7 @@ sa-token:
allow-url: "*" allow-url: "*"
# 是否打开单点注销功能 # 是否打开单点注销功能
is-slo: true is-slo: true
# ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开） # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
# 是否打开模式三 # 是否打开模式三
isHttp: true isHttp: true
@@ -142,7 +171,7 @@ sa-token:
token-session-check-login: false token-session-check-login: false
alone-redis: alone-redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 1 database: 9
# Redis服务器地址 # Redis服务器地址
host: 127.0.0.1 host: 127.0.0.1
# Redis服务器连接端口 # Redis服务器连接端口