修改占位符格式

chuanyi_client2/src/views/report_template/index.vue

@@ -2179,7 +2179,8 @@ export default {
               // name = name.substring(name.lastIndexOf('.') + 1)
               let v = '${' + groupId + '.' + name + '}'
 			  if (item.itemReadName) {
-				  v = '${' + groupId + '.' + item.itemReadName + '}'
+				  // v = '${' + groupId + '.' + item.itemReadName + '}'
+          v = item.dataSourceName + "." + item.itemReadName
 			  }
               item.placeHolder = v
               item.standby = JSON.stringify({
@@ -2409,7 +2410,7 @@ export default {
           left: 'center'
         },
 		grid: {
-			
+
 		},
         tooltip: {
 			top: 0

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaChangeTask.java

@@ -268,6 +268,7 @@ public class OpcDaChangeTask extends TimerTask {
                                     //组装相应的原始数据
                                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                                     sqlCurrentYmdh = currentYmdh;
+                                    redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
                                 }
                             }
                             if (!javaType.toLowerCase().equals("boolean")) {

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -266,6 +266,9 @@ public class OpcDaFrequencyTask extends TimerTask {
                         break;
                     }
                     try {
+                        System.out.println("--------------server" + server);
+                        System.out.println("--------------serverState" + server.getServerState());
+                        System.out.println("--------------group" + group);
                         Map<org.openscada.opc.lib.da.Item, ItemState> resultMap = group.read(true, itemArr);
                         index++;
                         List<CursorRawData> cursorRawDataList = new ArrayList<>();
@@ -302,6 +305,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                                     //组装相应的原始数据
                                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                                     sqlCurrentYmdh = currentYmdh;
+                                    redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
                                 }
                             }
                             if (Blank.isNotEmpty(dm) && dm.getModelType().equals(ConstantStr.VALUE_REPLACE)) {

cqcy-ei/cqcy-ei-da/src/main/resources/mapper/ItemGroupDao.xml

@@ -187,11 +187,13 @@
         ti.data_model_id,
         ti.is_driver_item,
         tdm.operation_rule,
+        tds.data_source_name,
         tard.org_data_value,
         tard.data_value
         FROM
         t_item ti
         LEFT JOIN t_item_group tig ON ti.item_group_id = tig.id
+        LEFT JOIN t_data_source tds ON tig.data_source_id=tds.id
         LEFT JOIN t_data_model tdm ON ti.data_model_id = tdm.id
         LEFT JOIN t_attach_raw_data tard ON ti.item_group_id = tard.item_group_id
         AND tig.data_source_id = tard.data_source_id