From eafecc3ac0227960f2b8fa377be27f066e10e50f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 20 五月 2025 10:47:58 +0800
Subject: [PATCH] perf(lb-qms): 优化查询功能和时间范围筛选
---
ruoyi-modules/lb-qms/src/main/resources/mapper/qms/LbTestResultMapper.xml | 5 ++++-
ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java | 1 +
ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbSensorResultServiceImpl.java | 1 +
ruoyi-admin/src/main/resources/application-prod.yml | 16 ++++++++--------
ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java | 12 ++++++++++--
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index c63e21a..2e1f792 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,10 +1,10 @@
--- # 涓存椂鏂囦欢瀛樺偍浣嶇疆 閬垮厤涓存椂鏂囦欢琚郴缁熸竻鐞嗘姤閿�
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: /data/server/temp
--- # 鐩戞帶涓績閰嶇疆
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
+ enabled: false
url: http://localhost:9090/admin
instance:
service-host-type: IP
@@ -16,7 +16,7 @@
--- # snail-job 閰嶇疆
snail-job:
- enabled: true
+ enabled: false
# 闇�瑕佸湪 SnailJob 鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
group: "ruoyi_group"
# SnailJob 鎺ュ叆楠岃瘉浠ょ墝 璇﹁ script/sql/ry_job.sql `sj_group_config`琛�
@@ -52,9 +52,9 @@
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://192.168.0.23:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
- password: root
+ password: 123456
# # 浠庡簱鏁版嵁婧�
# slave:
# lazy: true
@@ -107,7 +107,7 @@
# 鏁版嵁搴撶储寮�
database: 0
# redis 瀵嗙爜蹇呴』閰嶇疆
- password: ruoyi123
+ #password: ruoyi123
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
@@ -212,11 +212,11 @@
redirect-uri: ${justauth.address}/social-callback?source=maxkey
topiam:
# topiam 鏈嶅姟鍣ㄥ湴鍧�
- server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
+ server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
client-id: 449c4*********937************759
client-secret: ac7***********1e0************28d
redirect-uri: ${justauth.address}/social-callback?source=topiam
- scopes: [ openid, email, phone, profile ]
+ scopes: [openid, email, phone, profile]
qq:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
diff --git a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
index 38ae238..ce9ed02 100644
--- a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
+++ b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
@@ -82,6 +82,7 @@
lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), LbBatch::getDeviceCode, bo.getDeviceCode());
lqw.eq(bo.getUserId() != null, LbBatch::getUserId, bo.getUserId());
lqw.eq(bo.getNum() != null, LbBatch::getNum, bo.getNum());
+ lqw.orderByDesc(LbBatch::getBatchCode);
return lqw;
}
diff --git a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbSensorResultServiceImpl.java b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbSensorResultServiceImpl.java
index 9360dc7..2cd2117 100644
--- a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbSensorResultServiceImpl.java
+++ b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbSensorResultServiceImpl.java
@@ -101,6 +101,7 @@
lqw.eq(bo.getTotalCount() != null, LbSensorResult::getTotalCount, bo.getTotalCount());
lqw.eq(bo.getOkCount() != null, LbSensorResult::getOkCount, bo.getOkCount());
lqw.eq(bo.getNgCount() != null, LbSensorResult::getNgCount, bo.getNgCount());
+ lqw.orderByDesc(LbSensorResult::getTestNum);
return lqw;
}
diff --git a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
index d4472b5..e4b0d69 100644
--- a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
+++ b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
@@ -15,6 +15,8 @@
import cn.shlanbao.qms.mapper.LbTestResultMapper;
import cn.shlanbao.qms.service.ILbTestResultService;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.*;
/**
@@ -76,6 +78,7 @@
@Override
public List<LbTestResultVo> queryList(LbTestResultBo bo) {
if (StringUtils.isNotBlank(bo.getProdModel())) {
+
return baseMapper.selectByProdModelAndConditions(bo);
} else {
LambdaQueryWrapper<LbTestResult> lqw = buildQueryWrapper(bo);
@@ -116,8 +119,13 @@
lqw.eq(bo.getTestValue() != null, LbTestResult::getTestValue, bo.getTestValue());
lqw.eq(StringUtils.isNotBlank(bo.getJudgeDetail()), LbTestResult::getJudgeDetail, bo.getJudgeDetail());
lqw.eq(StringUtils.isNotBlank(bo.getTestResult()), LbTestResult::getTestResult, bo.getTestResult());
- lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
- LbTestResult::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+ // 璁剧疆寮�濮嬫椂闂村拰缁撴潫鏃堕棿鐨勬椂鍒嗙
+ if (params.get("beginCreateTime") != null && params.get("endCreateTime") != null) {
+ LocalDateTime beginTime = ((LocalDateTime) params.get("beginCreateTime")).with(LocalTime.MIN);
+ LocalDateTime endTime = ((LocalDateTime) params.get("endCreateTime")).with(LocalTime.MAX);
+ lqw.between(LbTestResult::getCreateTime, beginTime, endTime);
+ }
+
lqw.orderByAsc(LbTestResult::getCreateTime);
return lqw;
}
diff --git a/ruoyi-modules/lb-qms/src/main/resources/mapper/qms/LbTestResultMapper.xml b/ruoyi-modules/lb-qms/src/main/resources/mapper/qms/LbTestResultMapper.xml
index b712e66..92c69e0 100644
--- a/ruoyi-modules/lb-qms/src/main/resources/mapper/qms/LbTestResultMapper.xml
+++ b/ruoyi-modules/lb-qms/src/main/resources/mapper/qms/LbTestResultMapper.xml
@@ -29,8 +29,11 @@
</choose>
</if>
<if test="ew.params.beginCreateTime != null and ew.params.endCreateTime != null">
- AND tr.create_time BETWEEN #{ew.params.beginCreateTime} AND #{ew.params.endCreateTime}
+ AND tr.create_time BETWEEN
+ DATE_FORMAT(#{ew.params.beginCreateTime}, '%Y-%m-%d 00:00:00') AND
+ DATE_FORMAT(#{ew.params.endCreateTime}, '%Y-%m-%d 23:59:59')
</if>
+
</where>
ORDER BY tr.create_time ASC
</select>
--
Gitblit v1.9.3