Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加实时数据中的设备名称

This commit is contained in:
zy 2025-11-26 15:37:37 +08:00
parent 16f199a8de
commit 6bdbd0f246
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java
View File

@ -92,7 +92,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
} else { } else {
if (transdataAir != null) { if (transdataAir != null) {
transdataAir.setDeployId(deployId); transdataAir.setDeployId(deployId);
voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructAir(transdataAir), zhibiaoList)); voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructAir(transdataAir), zhibiaoList));
return voTransData; return voTransData;
} }
} }
@ -103,7 +103,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
} else { } else {
if (transdataSoil != null) { if (transdataSoil != null) {
transdataSoil.setDeployId(deployId); transdataSoil.setDeployId(deployId);
voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructSoil(transdataSoil), zhibiaoList)); voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructSoil(transdataSoil), zhibiaoList));
return voTransData; return voTransData;
} }
} }
@ -114,7 +114,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
} else { } else {
if (transdataWater != null) { if (transdataWater != null) {
transdataWater.setDeployId(deployId); transdataWater.setDeployId(deployId);
voTransData.setTransData(CommonUtils.markZhibiao(CommonUtils.constructSoil(transdataWater), zhibiaoList)); voTransData.setTransData(CommonUtils.markZhibiao(deploy,CommonUtils.constructSoil(transdataWater), zhibiaoList));
return voTransData; return voTransData;
} }
} }
@ -721,7 +721,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
} }
public static List<CommonDataTrans> markZhibiao(List<CommonDataTrans> dataList, List<ScEquZhibiao> zhibiaoList) { public static List<CommonDataTrans> markZhibiao(SurvDeviceDeploy deploy,List<CommonDataTrans> dataList, List<ScEquZhibiao> zhibiaoList) {
if (dataList == null || dataList.size() == 0) {//无数据直接返回 if (dataList == null || dataList.size() == 0) {//无数据直接返回
System.out.println("无数据直接返回"); System.out.println("无数据直接返回");
return dataList; return dataList;
@ -770,6 +770,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
} else { } else {
System.out.println("无指标跳过====================" + commonDataTrans.getSurvItem()); System.out.println("无指标跳过====================" + commonDataTrans.getSurvItem());
} }
commonDataTrans.setDeployRemark(deploy.getDeployDes());
} }

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java
View File

@ -17,6 +17,8 @@ import java.time.LocalDateTime;
public class CommonDataTrans { public class CommonDataTrans {
@ApiModelProperty("设备编号") @ApiModelProperty("设备编号")
private String deployId; private String deployId;
@ApiModelProperty("设备名称")
private String deployRemark;
@ApiModelProperty("监测类型") @ApiModelProperty("监测类型")
private String survType; private String survType;
@ApiModelProperty("监测项名称") @ApiModelProperty("监测项名称")