图表修改

sms_water/src/main/resources/mapper/MonitorDataMapper.xml

@@ -30,15 +30,15 @@
             ,d.DEVICE_NAME as "deviceName"
             ,d.DEVICE_CODE as "deviceCode"
             ,da.id as "attributeId"
-            ,da.`NAME` as "attributeName"
+            ,da.NAME as "attributeName"
             ,da.IDENTIFIER as "identifier"
             ,da.UNIT as "unit"
         from sms_device d
-        left join sms_scene s on s.id = d.SCENE_ID and s.`STATUS` = 1
-        left join sms_scene ps on s.PARENT_SCENE_IDS LIKE concat('%,', ps.id ,',%') and ps.PARENT_SCENE_ID ='0' and ps.`STATUS` = 1
-        left join sms_device_type dt on dt.id=d.DEVICE_TYPE_ID and dt.`STATUS` = 1
-        left join sms_device_attribute da on dt.id=da.DEVICE_TYPE_ID and da.`STATUS` = 1
-        where d.`STATUS` =1 and d.DEVICE_CODE=#{deviceCode}
+        left join sms_scene s on s.id = d.SCENE_ID and s.STATUS = 1
+        left join sms_scene ps on s.PARENT_SCENE_IDS LIKE concat('%,', ps.id ,',%') and ps.PARENT_SCENE_ID ='0' and ps.STATUS = 1
+        left join sms_device_type dt on dt.id=d.DEVICE_TYPE_ID and dt.STATUS = 1
+        left join sms_device_attribute da on dt.id=da.DEVICE_TYPE_ID and da.STATUS = 1
+        where d.STATUS =1 and d.DEVICE_CODE=#{deviceCode}
 
     </select>
 
@@ -54,7 +54,7 @@
     </insert>
 
     <insert id="batchInsertYearReport">
-        INSERT INTO `sms`.`sms_year_report`( `TENANT_ID`, `PARENT_SCENE_ID`, `PARENT_SCENE_NAME`, `SCENE_ID`, `SCENE_NAME`, `DEVICE_ID`, `DEVICE_NAME`, `DEVICE_CODE`, `ATTRIBUTE_ID`, `ATTRIBUTE_NAME`, `YEAR`, `MONTH`, `MIN_VALUE`, `MAX_VALUE`, `AVG_VALUE`, `SUM_VALUE`, `LATEST_VALUE`, `COLLECT_DATE`)
+        INSERT INTO sms_year_report( TENANT_ID, PARENT_SCENE_ID, PARENT_SCENE_NAME, SCENE_ID, SCENE_NAME, DEVICE_ID, DEVICE_NAME, DEVICE_CODE, ATTRIBUTE_ID, ATTRIBUTE_NAME, YEAR, MONTH, MIN_VALUE, MAX_VALUE, AVG_VALUE, SUM_VALUE, LATEST_VALUE, COLLECT_DATE)
         select TENANT_ID, PARENT_SCENE_ID, PARENT_SCENE_NAME, SCENE_ID, SCENE_NAME, DEVICE_ID, DEVICE_NAME, DEVICE_CODE, ATTRIBUTE_ID, ATTRIBUTE_NAME,  YEAR, MONTH
             ,min(MIN_VALUE) MIN_VALUE
             ,max(MAX_VALUE) MAX_VALUE
@@ -68,7 +68,7 @@
     </insert>
 
     <insert id="batchInsertMonthReport">
-        INSERT INTO `sms`.`sms_month_report`( `TENANT_ID`, `PARENT_SCENE_ID`, `PARENT_SCENE_NAME`, `SCENE_ID`, `SCENE_NAME`, `DEVICE_ID`, `DEVICE_NAME`, `DEVICE_CODE`, `ATTRIBUTE_ID`, `ATTRIBUTE_NAME`, `YEAR`, `MONTH`, `DAY`, `MIN_VALUE`, `MAX_VALUE`, `AVG_VALUE`, `SUM_VALUE`, `LATEST_VALUE`, `COLLECT_DATE`)
+        INSERT INTO sms_month_report( TENANT_ID, PARENT_SCENE_ID, PARENT_SCENE_NAME, SCENE_ID, SCENE_NAME, DEVICE_ID, DEVICE_NAME, DEVICE_CODE, ATTRIBUTE_ID, ATTRIBUTE_NAME, YEAR, MONTH, DAY, MIN_VALUE, MAX_VALUE, AVG_VALUE, SUM_VALUE, LATEST_VALUE, COLLECT_DATE)
 
         select TENANT_ID, PARENT_SCENE_ID, PARENT_SCENE_NAME, SCENE_ID, SCENE_NAME, DEVICE_ID, DEVICE_NAME, DEVICE_CODE, ATTRIBUTE_ID, ATTRIBUTE_NAME,  YEAR, MONTH, DAY
             ,min(MIN_VALUE) MIN_VALUE

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -47,7 +47,7 @@
         ,r.COLLECT_DATE as "date"
 
         ,d.DEVICE_CODE as "devoceCode"
-        ,r.PARENT_SCENE_NAME+d.DEVICE_NAME as "deviceName"
+        ,CONCAT(r.PARENT_SCENE_NAME,d.DEVICE_NAME) as "deviceName"
         ,da.unit as "unit"
         ,r.ATTRIBUTE_NAME as "attributeName"