From 74205424049d169a8d3bbabb74b4c8c9adf1ec99 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 二月 2025 16:05:51 +0800
Subject: [PATCH] 设备列表查询接口修改
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 329 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 297 insertions(+), 32 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 0d8377b..f1723fd 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
@@ -1,37 +1,43 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.ADto;
-import com.yuanchu.mom.dto.BDto;
-import com.yuanchu.mom.dto.DeviceDto;
+import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.mapper.DeviceMapper;
-import com.yuanchu.mom.mapper.StructureItemParameterMapper;
-import com.yuanchu.mom.mapper.UserMapper;
-import com.yuanchu.mom.pojo.DataConfig;
-import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.StructureItemParameter;
-import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.mapper.*;
+import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.service.DocumentService;
import com.yuanchu.mom.utils.DataAcquisition;
+import com.yuanchu.mom.utils.HackLoopTableRenderPolicy;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.Result;
import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -49,6 +55,8 @@
private DeviceMapper deviceMapper;
+ private EnumServiceImpl enumService;
+
private UserMapper userMapper;
private StructureItemParameterMapper structureItemParameterMapper;
@@ -56,13 +64,29 @@
@Autowired
private DataConfigService dataConfigService;
+ private QrShowServiceImpl qrShowService;
+
+ private InsSampleMapper insSampleMapper;
+
+ private DocumentService documentService;
+
+ private DeviceMetricRecordMapper deviceMetricRecordMapper;
+
+ private DeviceMaintenanceMapper deviceMaintenanceMapper;
+
@Override
- public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter) {
+ public List<User> selectUserList() {
+ List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().like(User::getDepartLimsId, "1"));
+ return users;
+ }
+
+ @Override
+ public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(DeviceDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
- IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter));
+ IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter),laboratoryNameIsNull);
map.put("body", iPage);
return map;
}
@@ -107,17 +131,25 @@
@Override
public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
- Integer id;
+ List<Integer> id;
try {
if (ObjectUtils.isEmpty(inspectionItemSubclass)) {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
+
}else {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
.eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
}
} catch (Exception e) {
return null;
@@ -129,9 +161,11 @@
for (Device device : devices) {
String[] ids = device.getInsProductIds().split(",");
for (String i : ids) {
- if (i.equals(id + "")) {
- devices2.add(device);
- break;
+ if (ObjectUtils.isNotEmpty(i)) {
+ if (id.contains(Integer.parseInt(i))) {
+ devices2.add(device);
+ break;
+ }
}
}
}
@@ -139,8 +173,35 @@
}
@Override
- public Device selectDeviceByCode(String code) {
- return deviceMapper.selectOne(Wrappers.<Device>lambdaQuery().eq(Device::getFactoryNo, code).last("limit 1"));
+ public Device selectDeviceByCode(Integer id) {
+ DeviceDto deviceDto = deviceMapper.selectDeviceByCode(id);
+ List<Integer> ids = new ArrayList<>();
+ if (Strings.isNotEmpty(deviceDto.getAuthorizedPerson())) {
+ if (deviceDto.getAuthorizedPerson().equals("null")) {
+ deviceDto.setAuthorizedPerson("[]");
+ }
+ ids = JSON.parseArray(deviceDto.getAuthorizedPerson(), Integer.class);
+ }
+ String name = "";
+ if (!ids.isEmpty()) {
+ name = userMapper.selectBatchIds(ids).stream().map(User::getName).collect(Collectors.joining(","));
+ }
+ deviceDto.setAuthorizedPersonName(name);
+ //鏌ヨ璁惧鏍″噯淇℃伅
+ DeviceMetricRecord calibrate = qrShowService.getDeviceMetricRecord(id, "calibrate");
+ //deviceDto.setCalibrationDate(qrShowService.formatDate(calibrate.getCalibrationDate(),"yyyy-MM-dd"));
+ deviceDto.setCalibrateNo(calibrate.getCertificateSerialNumber());
+
+ // 鍒颁簡鍋滅敤鏃ユ湡锛岃嚜鍔ㄥ皢鐘舵�佹敼涓哄仠鐢�
+ if (deviceDto.getNextCalibrationDate() != null) {
+ if (LocalDateTime.now().isAfter(deviceDto.getNextCalibrationDate())) {
+ List<Enums> enums = enumService.selectEnumByCategory("璁惧鐘舵��");
+ List<Enums> status = enums.stream().filter(item -> item.getLabel().equals("鍋滅敤")).collect(Collectors.toList());
+ deviceDto.setDeviceStatus(Integer.parseInt(status.get(0).getValue()));
+ deviceMapper.updateById(deviceDto);
+ }
+ }
+ return deviceDto;
}
@Override
@@ -149,6 +210,7 @@
String ip = DataAcquisition.getIp(request);
List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
.eq(Device::getIp, ip));
+ // 1銆佹楠�
if(device.size() > 1) {
String str = "";
for (Device device1 : device) {
@@ -163,6 +225,7 @@
if (ObjectUtils.isEmpty(device.get(0).getFileType()) || ObjectUtils.isEmpty(device.get(0).getCollectUrl())) {
throw new ErrorException("鏈粰璇ワ細" + device.get(0).getDeviceName() + "璁惧閰嶇疆閲囬泦璺緞鎴栨枃浠跺悗缂�锛�");
}
+ // 2銆佸彇璁惧鍏宠仈鐨勬楠岄」锛屾楠屽瓙椤�
List<DataConfig> list1 = new ArrayList<>();
inspectionItemSubclass.forEach(i -> {
List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
@@ -172,12 +235,16 @@
.orderBy(false, false, DataConfig::getId));
list1.addAll(list);
});
- Map<String, String> map = DataAcquisition.dataAcquisitionEntrance(list1, device.get(0), entrustCode, sampleCode, ip);
+ List<DataConfig> collect = list1.stream().distinct().collect(Collectors.toList());
+ // 3銆侀噰闆嗭紝鍙栨暟鎹�
+ Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(collect, device.get(0), entrustCode, sampleCode, ip);
+ // 4銆侀�犲惊鐜鏁帮紝鍙備笌鍏紡璁＄畻
if (ObjectUtils.isNotEmpty(map)) {
- String frequency = DataAcquisition.createFrequency(entrustCode, sampleCode);
- map.put("frequency", frequency);
+ Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);
+ return Result.success(frequency);
+ } else {
+ return Result.success(null);
}
- return Result.success(map);
}
@Override
@@ -960,10 +1027,208 @@
@Override
public List<Map<String, Object>> treeDevice(String deviceName) {
List<Map<String, Object>> listMap = deviceMapper.treeDevice(deviceName);
- /* Map<String, List<Device>> listMap = devices.stream()
- .collect(Collectors.groupingBy(device ->
- device.getLargeCategory() != null ? device.getLargeCategory() : "鍏朵粬"
- ));*/
return listMap;
}
+
+ @Override
+ public Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request) {
+ String ip = DataAcquisition.getIp(request);
+ Device device = baseMapper.selectOne(Wrappers.<Device>lambdaQuery()
+ .eq(Device::getIp, ip));
+ if (ObjectUtils.isEmpty(device)) {
+ return Result.success(false);
+ }
+ if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
+ return Result.success(false);
+ } else {
+ return Result.success(true);
+ }
+ }
+
+ @Override
+ public void exportDeviceFile(Integer deviceId, HttpServletResponse response) {
+
+ // 璁惧淇℃伅
+ Device device = baseMapper.selectById(deviceId);
+ // 璁惧妗ｆ
+ List<Document> documentList = documentService.list(Wrappers.<Document>lambdaQuery().eq(Document::getDeviceId, deviceId));
+ // 璁惧鏍″噯琛�
+ List<DeviceMetricRecord> deviceMetricRecordList = deviceMetricRecordMapper.selectList(Wrappers.<DeviceMetricRecord>lambdaQuery().eq(DeviceMetricRecord::getDeviceId, deviceId));
+ // 璁惧缁翠慨琛�
+ List<DeviceMaintenance> deviceMaintenanceList = deviceMaintenanceMapper.selectList(Wrappers.<DeviceMaintenance>lambdaQuery().eq(DeviceMaintenance::getDeviceId, deviceId));
+
+
+ // 杩斿洖缁檞ord鐨勬暟鎹垪琛� 鍒嗕负宸﹀彸涓ゅ垪鏁版嵁
+ List<DocumentExportWordDto> documentExportWordDtoList = new ArrayList<>();
+ // 缁欐。妗堝姞搴忓彿 骞跺乏鍙冲垎涓哄乏鍙充袱鍒楀湪word涓樉绀�
+ extracted(documentList, documentExportWordDtoList);
+
+
+ // 灏嗘牎鍑嗚〃鍜岀淮淇〃鏀惧叆涓�涓璞′腑鏂逛究word琛ㄦ牸涓樉绀�
+ List<DeviceMetricRecordAndMaintenanceDto> deviceMetricRecordAndMaintenanceDtoList = getDeviceMetricRecordAndMaintenanceDtoList(deviceMetricRecordList, deviceMaintenanceList);
+
+
+ // 鑾峰彇璺緞
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word/device-document.docx");
+ Configure configure = Configure.builder()
+ .bind("document", new HackLoopTableRenderPolicy())
+ .bind("deviceMetricRecordAndMaintenanceDtoList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("device", device);
+ put("document", documentExportWordDtoList); // 妗ｆ
+ put("deviceMetricRecordAndMaintenanceDtoList", deviceMetricRecordAndMaintenanceDtoList); // 鏍″噯琛� 鍜� 缁翠慨琛�
+ }});
+
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ device.getDeviceName() + "妗ｆ", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
+
+ private List<DeviceMetricRecordAndMaintenanceDto> getDeviceMetricRecordAndMaintenanceDtoList(List<DeviceMetricRecord> deviceMetricRecordList, List<DeviceMaintenance> deviceMaintenanceList) {
+ // 璁惧鏍″噯琛ㄥ拰璁惧缁翠慨琛ㄧ殑闆嗗悎
+ List<DeviceMetricRecordAndMaintenanceDto> deviceMetricRecordAndMaintenanceDtoList = new ArrayList<>();
+ // 璁惧鏍″噯琛ㄥ拰璁惧缁翠慨琛ㄧ殑闀垮害鍙兘涓嶄竴鏍� 鍙栨渶澶у�� 涓嶅鐨勭敤绌烘暟鎹～鍏�
+ int metricRecordSize = deviceMetricRecordList.size();
+ int maintenanceSize = deviceMaintenanceList.size();
+ int size = Math.max(metricRecordSize, maintenanceSize);
+ // 缁� 鏍￠獙鍜岀淮淇璞� 璧嬪��
+ for (int i = 0; i < size; i++) {
+ // 鏍￠獙鍜岀淮淇璞�
+ DeviceMetricRecordAndMaintenanceDto deviceMetricRecordAndMaintenanceDto = new DeviceMetricRecordAndMaintenanceDto();
+ // 璁剧疆搴忓彿
+ deviceMetricRecordAndMaintenanceDto.setIndex(i + 1);
+
+ // 鏍″噯琛ㄦ暟鎹�
+ if (metricRecordSize > i) {
+ // 璁剧疆鏃ユ湡鏍煎紡
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ // 鑾峰彇璁惧鏍″噯琛ㄦ暟鎹�
+ DeviceMetricRecord deviceMetricRecord = deviceMetricRecordList.get(i);
+ // 璁剧疆鏍″噯鏃ユ湡
+ deviceMetricRecordAndMaintenanceDto.setCalibrationDateString(sdf.format(deviceMetricRecord.getCalibrationDate()));
+ // 璁剧疆璇佷功缂栧彿
+ deviceMetricRecordAndMaintenanceDto.setCertificateNumber(deviceMetricRecord.getCertificateSerialNumber());
+ // 璁剧疆鏈夋晥鏈�
+ deviceMetricRecordAndMaintenanceDto.setValidityDateString(sdf.format(deviceMetricRecord.getNextCalibrationDate()));
+ // 璁剧疆鏍″噯鏈夋晥鏃ユ湡
+ deviceMetricRecordAndMaintenanceDto.setValidityDateString(sdf.format(deviceMetricRecord.getConfirmDate()));
+ // 璁剧疆妫�楠岀粨鏋�
+ deviceMetricRecordAndMaintenanceDto.setJudgement(deviceMetricRecord.getStatus());
+ }
+
+ // 缁翠慨琛ㄦ暟鎹�
+ if (maintenanceSize > i) {
+ // 鑾峰彇璁惧缁翠慨琛ㄦ暟鎹�
+ DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(i);
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ // 缁翠慨鏃ユ湡
+ deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getDate().format(dateTimeFormatter));
+ // 澶勭悊鏂规硶
+ deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getContent());
+ // 澶囨敞
+ deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getComments());
+ }
+
+ deviceMetricRecordAndMaintenanceDtoList.add(deviceMetricRecordAndMaintenanceDto);
+ }
+ return deviceMetricRecordAndMaintenanceDtoList;
+ }
+
+ /**
+ * 缁欐。妗堝姞搴忓彿 骞跺乏鍙冲垎涓哄乏鍙充袱鍒楀湪word涓樉绀�
+ *
+ * @param documentList 妗ｆ鍒楄〃
+ * @param documentExportWordDtoList 杩斿洖缁檞ord鐨勬暟鎹垪琛�
+ */
+ private static void extracted(List<Document> documentList, List<DocumentExportWordDto> documentExportWordDtoList) {
+ // 缁欐。妗堝姞搴忓彿 骞朵笖鍒嗕负宸﹀彸涓や釜鍒楄〃鍦╳ord涓樉绀�
+ for (int i = 0; i < documentList.size(); i++) {
+ // 鍒涘缓word琛ㄦ牸涓竴琛岀殑鏁版嵁瀵硅薄
+ DocumentExportWordDto documentExportWordDto = new DocumentExportWordDto();
+ // 鑾峰彇妗ｆ淇℃伅
+ Document document = documentList.get(i);
+ // 鏍煎紡鍖栨棩鏈�
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ // 鏍规嵁搴忓彿 鍒嗗埆鍔犲叆涓や釜鍒楄〃
+ if (i % 2 == 0) {
+ // 濂囨暟鍦ㄥ乏鍒�
+ documentExportWordDto.setIndex1(i + 1);
+ documentExportWordDto.setName1(document.getName());
+ documentExportWordDto.setQuantity1(document.getQuantity());
+ documentExportWordDto.setPageCount1(document.getPageCount());
+ documentExportWordDto.setArchiveDateString1(document.getProvideDate().format(dateTimeFormatter));
+ } else {
+ // 鍋舵暟鍦ㄥ彸鍒�
+ documentExportWordDto.setIndex2(i + 1);
+ documentExportWordDto.setName2(document.getName());
+ documentExportWordDto.setQuantity2(document.getQuantity());
+ documentExportWordDto.setPageCount2(document.getPageCount());
+ documentExportWordDto.setArchiveDateString2(document.getProvideDate().format(dateTimeFormatter));
+ }
+ // 鎶婁竴琛屾暟鎹璞″姞鍏ュ垪琛�
+ documentExportWordDtoList.add(documentExportWordDto);
+ }
+ }
+
+ @Override
+ public void exportEquipmentDetails(HttpServletResponse response) {
+ List<Device> deviceList = baseMapper.selectList(null);
+ List<DeviceExport> deviceExportList = new ArrayList<>();
+
+ int index = 1;
+ for (Device device : deviceList) {
+ Integer equipmentManager = device.getEquipmentManager();
+ String equipmentManagerName = null;
+ if (equipmentManager != null) {
+ User user = userMapper.selectById(equipmentManager);
+ if (user != null) {
+ equipmentManagerName = user.getName();
+ }
+ }
+ DeviceExport deviceExport = new DeviceExport();
+ BeanUtils.copyProperties(device, deviceExport);
+ deviceExport.setIndex(index);
+ deviceExport.setEquipmentManagerName(equipmentManagerName);
+ deviceExportList.add(deviceExport);
+ index++;
+ }
+
+ // 鑾峰彇璺緞
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word/quipment-details.docx");
+ Configure configure = Configure.builder()
+ .bind("deviceList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("deviceList", deviceExportList);
+ }});
+
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "浠櫒璁惧涓�瑙堣〃", "UTF-8");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
}
--
Gitblit v1.9.3