diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java index 7360350..787c810 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java @@ -2,6 +2,7 @@ package org.jeecg.modules.appmana.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.constant.DeviceReadConstants; import org.jeecg.common.constant.IotConstants; @@ -26,6 +27,7 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.*; +@Slf4j public class CommonUtils { @@ -306,7 +308,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 try { for (Field field : fields) { field.setAccessible(true); - if (field.getName().startsWith("data") && !field.getName().equals("dataDateTime") && !field.getName().equals("dataGatherType")) { + if ((field.getName().startsWith("data") || field.getName().startsWith("sData")) && !field.getName().equals("dataDateTime") && !field.getName().equals("dataGatherType")) { Object values = field.get(transdataFlowmeter); if (values != null) { String val = values.toString();