修改数据查询导出Excel的数据项名称

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/ItemGroupServiceImpl.java

@@ -529,7 +529,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 List<String> header = CollUtil.newArrayList("时间", "点位名称", "值");
                 rows.add(header);
                 for (Item item : itemList) {
-                    String itemReadName = ItemUtil.getFullItemName(item);
+                    String itemReadName = ItemUtil.getTableItemName(item);
                     List<String> dataTimeList = item.getDataTimeList();
                     List<String> dataValueList = item.getDataValueList();
                     if (Blank.isNotEmpty(dataTimeList)) {
@@ -544,7 +544,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 TreeMap<String, Map<String, String>> map = new TreeMap<>();
                 List<String> header = CollUtil.newArrayList("时间");
                 for (Item item : itemList) {
-                    String itemKey = ItemUtil.getFullItemName(item);
+                    String itemKey = ItemUtil.getTableItemName(item);
                     List<String> dataTimeList = item.getDataTimeList();
                     List<String> dataValueList = item.getDataValueList();
                     if (Blank.isNotEmpty(dataTimeList)) {
@@ -569,7 +569,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                     List<String> row = CollUtil.newArrayList(key);
                     for (int i = 0; i < itemList.size(); i++) {
                         Item item = itemList.get(i);
-                        String itemKey = ItemUtil.getFullItemName(item);
+                        String itemKey = ItemUtil.getTableItemName(item);
                         row.add(m.get(itemKey));
                     }
                     rows.add(row);

industry-system/industry-da/src/main/java/com/example/opc_da/util/ItemUtil.java

@@ -6,6 +6,14 @@ import com.example.opc_common.util.Blank;
 public class ItemUtil {
 
     public static String getFullItemName(Item item){
+        String value = item.getItemName();
+        if(Blank.isNotEmpty(item.getModbusConfig())){
+            value = item.getItemReadName();
+        }
+        return value;
+    }
+
+    public static String getTableItemName(Item item){
         String value = item.getItemReadName();
         if(Blank.isNotEmpty(item.getModbusConfig())){
             value = item.getItemName();