From dd43f10cba754d4a7b371b9bf39db262b94d3c10 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 七月 2024 15:43:59 +0800
Subject: [PATCH] 数采报错修复
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 2 +-
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 3 ++-
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 79c8bf5..9e25d22 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -138,7 +138,7 @@
public Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode) {
String ipAddress = request.getRemoteAddr();
// 闃叉鍥炵幆鍦板潃鍙樹负IPv6
- String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
+ String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
.eq(Device::getIp, ip));
if (ObjectUtils.isEmpty(device)) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index d89a644..87b261b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -84,10 +84,10 @@
}
// 濡傛灉瀛樺湪瀛樺偍鍦板潃锛屽垯绉诲姩鍦板潃
if (ObjectUtils.isNotEmpty(device.getStorageUrl())) {
- String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl();
+ String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl() + "&fileType=" + device.getFileType();
String storageUrlResult = HttpUtil.get(s);
JSONObject storageUrlResultJson = JSON.parseObject(storageUrlResult);
- if (Objects.equals(storageUrlResultJson.get("code"), 1)) {
+ if (Objects.equals(storageUrlResultJson.get("code"), 0)) {
if (ObjectUtils.isEmpty(storageUrlResultJson.get("msg"))) {
throw new ErrorException("瀛樺偍鍦板潃閿欒锛屽彲鑳芥枃浠惰矾寰勯厤缃敊璇紒");
} else {
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 40bcc1f..60660a3 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -119,7 +119,8 @@
</select>
<select id="getInspectionItemSubclass" resultType="java.lang.String">
- SELECT ip.inspection_item_subclass FROM ins_product ip
+ SELECT if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass FROM ins_product ip
where ip.ins_sample_id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3