修复已知BUG

sms_water/src/main/java/com/huaxu/dto/ReportAttributeDto.java

@@ -26,6 +26,10 @@ public class ReportAttributeDto  implements Serializable {
     @ApiModelProperty("设备属性类型")
     @JsonIgnore
     private Integer attributeType;
+
+
+    @ApiModelProperty("单位")
+    private String unit;
     /**
      * 最小值
      */

sms_water/src/main/java/com/huaxu/service/AbstractReportService.java

@@ -303,8 +303,9 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
         if (CollectionUtil.isEmpty(deviceChildrenList)){
             deviceChildrenList = new ArrayList<>();
         }
+        String unit = StringUtils.isEmpty(v.getUnit()) ? "" : "("+v.getUnit()+")";
         ReportTitleDto.DeviceChildren deviceChildren = new ReportTitleDto.DeviceChildren();
-        deviceChildren.setName(v.getAttributeName());
+        deviceChildren.setName(v.getAttributeName() + unit);
         deviceChildren.setParamId(v.getDeviceParmId().toString());
         // 检查是否有设置维度
         List<ReportTitleDto.StatisticalDimension> statisticalDimensions = new ArrayList<>();

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

@@ -226,7 +226,8 @@
     </select>
     <select id="findAttributeNameList" resultType="com.huaxu.dto.ReportAttributeDto">
         SELECT DISTINCT tab.attributeName,tab.attributeType,tab.SEQ,tab.showMinValue,tab.showAvgValue,tab.showMaxValue,
-        tab.showSumValue,tab.showLatestValue,tab.classify,tab.showOnOff,tab.deviceName,tab.deviceParmId,tab.dimensionId
+        tab.showSumValue,tab.showLatestValue,tab.classify,tab.showOnOff,tab.deviceName,tab.deviceParmId,tab.dimensionId,
+        tab.unit
         from
         (SELECT
         IFNULL(a.REMARK,b.`NAME`) AS "attributeName",
@@ -240,7 +241,8 @@
         s.CLASSIFY AS "classify",
         s.SHOW_ON_OFF AS "showOnOff",
         d.DEVICE_NAME AS "deviceName",
-        a.id AS "deviceParmId"
+        a.id AS "deviceParmId",
+        b.UNIT as "unit"
         FROM sms_device_parm a
         INNER JOIN sms_device d on d.ID = a.DEVICE_ID
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID

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

@@ -32,10 +32,10 @@
         r.`HOUR` AS "dateLabel",
         CONCAT( s.SCENE_NAME, r.DEVICE_NAME ) AS "deviceName",
         r.DEVICE_CODE AS "devoceCode",
-        r.ATTRIBUTE_NAME AS "attributeName",
+        IFNULL(p.REMARK, r.ATTRIBUTE_NAME) AS "attributeName",
         da.unit AS "unit",
 
-        ROUND( sum(r.AVG_VALUE), 2 ) AS "data",
+        ROUND( sum(r.AVG_VALUE), 3 ) AS "data",
         max(r.COLLECT_DATE) AS "date"
         FROM sms_device_parm p
         LEFT JOIN sms_day_report r ON p.DEVICE_ID = r.DEVICE_ID AND p.ATTRIBUTE_ID = r.ATTRIBUTE_ID
@@ -86,10 +86,10 @@
         r.`day` AS "dateLabel",
         CONCAT( s.SCENE_NAME, r.DEVICE_NAME ) AS "deviceName",
         r.DEVICE_CODE AS "devoceCode",
-        r.ATTRIBUTE_NAME AS "attributeName",
+        IFNULL(p.REMARK, r.ATTRIBUTE_NAME) AS "attributeName",
         da.unit AS "unit",
 
-        ROUND( sum(r.AVG_VALUE), 2 ) AS "data",
+        ROUND( sum(r.AVG_VALUE), 3 ) AS "data",
         max(r.COLLECT_DATE) AS "date"
         FROM sms_device_parm p
         LEFT JOIN sms_month_report r ON p.DEVICE_ID = r.DEVICE_ID AND p.ATTRIBUTE_ID = r.ATTRIBUTE_ID
@@ -138,10 +138,10 @@
         r.`month` AS "dateLabel",
         CONCAT( s.SCENE_NAME, r.DEVICE_NAME ) AS "deviceName",
         r.DEVICE_CODE AS "devoceCode",
-        r.ATTRIBUTE_NAME AS "attributeName",
+        IFNULL(p.REMARK, r.ATTRIBUTE_NAME) AS "attributeName",
         da.unit AS "unit",
 
-        ROUND( sum(r.AVG_VALUE), 2 ) AS "data",
+        ROUND( sum(r.AVG_VALUE), 3 ) AS "data",
         max(r.COLLECT_DATE) AS "date"
         FROM sms_device_parm p
         LEFT JOIN sms_year_report r ON p.DEVICE_ID = r.DEVICE_ID AND p.ATTRIBUTE_ID = r.ATTRIBUTE_ID
@@ -1482,10 +1482,10 @@
         r.`day` AS "dateLabel",
         CONCAT( s.SCENE_NAME, r.DEVICE_NAME ) AS "deviceName",
         r.DEVICE_CODE AS "devoceCode",
-        r.ATTRIBUTE_NAME AS "attributeName",
+        IFNULL(p.REMARK, r.ATTRIBUTE_NAME) AS "attributeName",
         da.unit AS "unit",
 
-        ROUND( sum(r.AVG_VALUE), 2 ) AS "data",
+        ROUND( sum(r.AVG_VALUE), 3 ) AS "data",
         max(r.COLLECT_DATE) AS "date"
         FROM sms_device_parm p
         LEFT JOIN sms_month_report r ON p.DEVICE_ID = r.DEVICE_ID AND p.ATTRIBUTE_ID = r.ATTRIBUTE_ID