From 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:32:14 +0800
Subject: [PATCH] 成品复测功能修改
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 21 ++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsUnqualifiedRetestResultDto.java | 32 ++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 17 ++------
cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java | 8 ++++
inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml | 8 +++-
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 6 +++
6 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index 533c9c7..8abd1a0 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -215,4 +215,10 @@
}
return Result.success();
}
+
+ @ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
+ @GetMapping("/determineWhetherToCollectData")
+ public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber",defaultValue = "") String managementNumber, HttpServletRequest request) {
+ return deviceService.determineWhetherToCollectData(managementNumber, request);
+ }
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
index f77bbca..00e6914 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
@@ -62,4 +62,12 @@
* @return
*/
void importExcel(List<Device> list);
+
+ /**
+ * 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ * @param managementNumber
+ * @param request
+ * @return
+ */
+ Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 86562c9..31c04ba 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -533,6 +533,27 @@
batchOperate(toInsert, toUpdate);
}
+ /**
+ * 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ * @param managementNumber
+ * @param request
+ * @return
+ */
+ @Override
+ public Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request) {
+ String ip = DataAcquisition.getIp(request);
+ List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
+ .eq(Device::getIp, ip));
+ if (ObjectUtils.isEmpty(device)) {
+ return Result.success(false);
+ }
+ if (ObjectUtils.isEmpty(device.get(0).getFileType()) || ObjectUtils.isEmpty(device.get(0).getCollectUrl())) {
+ return Result.success(false);
+ } else {
+ return Result.success(true);
+ }
+ }
+
private Map<String, Integer> queryUserMap(List<Device> batch) {
Set<String> managerNames = batch.stream()
.map(Device::getEquipmentManagerName)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index fa371e8..29cfa15 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.dto.InsOrderPlanDTO;
-import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
-import com.ruoyi.inspect.dto.InsProductBindingDto;
-import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -199,18 +196,14 @@
/**
*
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
+ * @param insUnqualifiedRetestResultDto
* @return
*/
@ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
@PostMapping("/saveUnqualifiedContext")
- public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+ public Result<?> saveUnqualifiedContext(@RequestBody InsUnqualifiedRetestResultDto insUnqualifiedRetestResultDto) {
+ Map<String, Object> param2 = JSON.parseObject(insUnqualifiedRetestResultDto.getParam(), Map.class);
+ insOrderPlanService.saveUnqualifiedContext(param2, insUnqualifiedRetestResultDto.getCurrentTable(), insUnqualifiedRetestResultDto.getSampleId(), insUnqualifiedRetestResultDto.getOrderId(), insUnqualifiedRetestResultDto.getSonLaboratory());
return Result.success();
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsUnqualifiedRetestResultDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsUnqualifiedRetestResultDto.java
new file mode 100644
index 0000000..df596f7
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsUnqualifiedRetestResultDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.inspect.dto;
+
+import lombok.Data;
+
+@Data
+public class InsUnqualifiedRetestResultDto {
+
+ /**
+ * 妯℃澘鍐呭
+ */
+ private String param;
+
+ /**
+ * 褰撳墠妯℃澘id
+ */
+ private Integer currentTable;
+
+ /**
+ * 褰撳墠鏍峰搧id
+ */
+ private Integer sampleId;
+
+ /**
+ * 褰撳墠璁㈠崟id
+ */
+ private Integer orderId;
+
+ /**
+ * 瀛愯瘯楠屽
+ */
+ private String sonLaboratory;
+}
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
index 4be6b91..dddb9c6 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
@@ -46,6 +46,7 @@
<result property="temperature" column="temperature"/>
<result property="humidity" column="humidity"/>
<result property="cableTag" column="cable_tag"/>
+ <result property="sort" column="sort"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
@@ -100,7 +101,8 @@
ip.method_s,
ip.tell,
ip.dic,
- ip.cable_tag
+ ip.cable_tag,
+ ip.sort
</sql>
<select id="selectRetestProduct" resultType="com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct">
@@ -169,7 +171,9 @@
and ins_fibers_id is null
and standard_method_list_id is not null
and ip.cable_tag is null
- and ip.retest_tag = #{retestTag}
+ <if test="retestTag != null and retestTag != ''">
+ and ip.retest_tag = #{retestTag}
+ </if>
</select>
<select id="getInsProductUnqualifiedRetest5" resultMap="product">
select <include refid="getInsProducSql"/>
--
Gitblit v1.9.3