From 501548e49492b4f83f2deee73316fda8abe33210 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 03 三月 2026 16:20:33 +0800
Subject: [PATCH] 数量监测
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5205.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5205.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5205.java
index 477b12a..2048583 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5205.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5205.java
@@ -107,36 +107,39 @@
dto.setTempMax(grainData.getTempMax());
dto.setTempMin(grainData.getTempMin());
dto.setTempAve(grainData.getTempAve());
- dto.setCable(grainData.getCable().replaceAll(",","-"));
- if(StringUtils.isNotEmpty(grainData.getCableCir())){
+ dto.setCable(grainData.getCable().replaceAll(",", "-"));
+ if (StringUtils.isNotEmpty(grainData.getCableCir())) {
dto.setCableCir(grainData.getCableCir().replaceAll(",", "-"));
}
List<PPointDto> listPoints = new ArrayList<>();
PPointDto pointDto;
- for (GrainPoint point : grainData.getListPoints()) {
- pointDto = new PPointDto();
- pointDto.setX(point.getX());
- pointDto.setY(point.getY());
- pointDto.setZ(point.getZ());
- pointDto.setFz(point.getFz());
- pointDto.setTemp(point.getTemp());
- listPoints.add(pointDto);
+ if (grainData.getListPoints() != null) {
+ for (GrainPoint point : grainData.getListPoints()) {
+ pointDto = new PPointDto();
+ pointDto.setX(point.getX());
+ pointDto.setY(point.getY());
+ pointDto.setZ(point.getZ());
+ pointDto.setFz(point.getFz());
+ pointDto.setTemp(point.getTemp());
+ listPoints.add(pointDto);
+ }
}
dto.setPoints(listPoints);
-
List<PDetailDto> listDetail = new ArrayList<>();
PDetailDto detailDto;
-
- for (GrainLay lay : grainData.getListLays()) {
- detailDto = new PDetailDto();
- detailDto.setFz(lay.getFz());
- detailDto.setFzName(lay.getFz() + "灞�");
- detailDto.setTempMax(lay.getTempMax());
- detailDto.setTempMin(lay.getTempMin());
- detailDto.setTempAve(lay.getTempAve());
- listDetail.add(detailDto);
+ if (grainData.getListLays() != null) {
+ for (GrainLay lay : grainData.getListLays()) {
+ detailDto = new PDetailDto();
+ detailDto.setFz(lay.getFz());
+ detailDto.setFzName(lay.getFz() + "灞�");
+ detailDto.setTempMax(lay.getTempMax());
+ detailDto.setTempMin(lay.getTempMin());
+ detailDto.setTempAve(lay.getTempAve());
+ listDetail.add(detailDto);
+ }
}
+
dto.setDetails(listDetail);
return PhoneRespUtil.success(dto, req);
--
Gitblit v1.9.3