1.一周充放曲线改为了时间聚合柱状图。

2.PCS最高温度修复bug展示多PCS设备的数据
3.PCS的状态根据状态枚举映射配置的内容显示
4.BMS的总览，增加工作状态、与PCS通讯、与EMS通讯的配置，及关联展示
5.增加批量导入单体电池点位的功能
6.修复计算点可能会出现id与code在一个池子内的问题，再次计算后数据正常
7.计算点增加小数位限制的功能，实时计算与7天历史接口都已经按照配置的小数位进行限制
8.统计报表中的功率曲线改为了按照分钟显示
9.功率曲线出现断点的问题是因为数据计算太密集了导致的，增加了前端连线不断的显示
10.PCS和电池堆的曲线与配置增加了关联设备显示
11.点位映射中的电池温度，增加了多设备
12.收益报表增加升序排列，合并当月所有合计
13.增加业务报表备注功能，可以根据业务设计开发，目前电表报表与收益报表均有备注列可以修改

ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml

@@ -346,7 +346,7 @@
         group by t.data_date,
                  COALESCE(c.is_workday, CASE WHEN WEEKDAY(t.data_date) < 5 THEN 1 ELSE 0 END),
                  COALESCE(NULLIF(TRIM(w.weather_desc), ''), '--')
-        order by t.data_date desc
+        order by t.data_date asc
 
     </select>
 </mapper>

ems-system/src/main/resources/mapper/ems/EmsPointConfigMapper.xml

@@ -28,6 +28,7 @@
         <result property="modbusDataType" column="modbus_data_type"/>
         <result property="modbusReadOrder" column="modbus_read_order"/>
         <result property="modbusGroup" column="modbus_group"/>
+        <result property="decimalScale" column="decimal_scale"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -39,7 +40,7 @@
         select id, point_id, site_id, device_category, device_id, point_name, data_key, point_desc, register_address,
                data_unit, data_a, data_k, data_b, data_bit, is_alarm, point_type, calc_expression,
                collect_enabled, collect_source, modbus_register_type, modbus_data_type, modbus_read_order, modbus_group,
-               create_by, create_time, update_by, update_time, remark
+               decimal_scale, create_by, create_time, update_by, update_time, remark
         from ems_point_config
     </sql>
 
@@ -92,6 +93,7 @@
             <if test="modbusDataType != null">modbus_data_type,</if>
             <if test="modbusReadOrder != null">modbus_read_order,</if>
             <if test="modbusGroup != null">modbus_group,</if>
+            <if test="decimalScale != null">decimal_scale,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -121,6 +123,7 @@
             <if test="modbusDataType != null">#{modbusDataType},</if>
             <if test="modbusReadOrder != null">#{modbusReadOrder},</if>
             <if test="modbusGroup != null">#{modbusGroup},</if>
+            <if test="decimalScale != null">#{decimalScale},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -134,7 +137,7 @@
             point_id, site_id, device_category, device_id, point_name, data_key, point_desc, register_address,
             data_unit, data_a, data_k, data_b, data_bit, is_alarm, point_type, calc_expression,
             collect_enabled, collect_source, modbus_register_type, modbus_data_type, modbus_read_order, modbus_group,
-            create_by, create_time, update_by, update_time, remark
+            decimal_scale, create_by, create_time, update_by, update_time, remark
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -161,6 +164,7 @@
                 #{item.modbusDataType},
                 #{item.modbusReadOrder},
                 #{item.modbusGroup},
+                #{item.decimalScale},
                 #{item.createBy},
                 now(),
                 #{item.updateBy},
@@ -195,6 +199,7 @@
             <if test="modbusDataType != null">modbus_data_type = #{modbusDataType},</if>
             <if test="modbusReadOrder != null">modbus_read_order = #{modbusReadOrder},</if>
             <if test="modbusGroup != null">modbus_group = #{modbusGroup},</if>
+            <if test="decimalScale != null">decimal_scale = #{decimalScale},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -226,6 +231,7 @@
             modbus_data_type = #{modbusDataType},
             modbus_read_order = #{modbusReadOrder},
             modbus_group = #{modbusGroup},
+            decimal_scale = #{decimalScale},
             update_by = #{updateBy},
             update_time = now(),
             remark = #{remark}
@@ -259,13 +265,13 @@
             point_id, site_id, device_category, device_id, point_name, data_key, point_desc, register_address,
             data_unit, data_a, data_k, data_b, data_bit, is_alarm, point_type, calc_expression,
             collect_enabled, collect_source, modbus_register_type, modbus_data_type, modbus_read_order, modbus_group,
-            create_by, create_time, update_by, update_time, remark
+            decimal_scale, create_by, create_time, update_by, update_time, remark
         )
         select
             concat('PT_', replace(uuid(), '-', '')), #{targetSiteId}, device_category, device_id, point_name, data_key, point_desc, register_address,
             data_unit, data_a, data_k, data_b, data_bit, is_alarm, point_type, calc_expression,
             collect_enabled, collect_source, modbus_register_type, modbus_data_type, modbus_read_order, modbus_group,
-            #{operName}, now(), #{operName}, now(), remark
+            decimal_scale, #{operName}, now(), #{operName}, now(), remark
         from ems_point_config
         where site_id = #{templateSiteId}
     </insert>

ems-system/src/main/resources/mapper/ems/EmsSiteMonitorPointMatchMapper.xml

@@ -54,4 +54,14 @@
         </foreach>
     </insert>
 
+    <update id="updateEmsSiteMonitorPointMatch" parameterType="com.xzzn.ems.domain.EmsSiteMonitorPointMatch">
+        update ems_site_monitor_point_match
+        set data_point = #{dataPoint},
+            fixed_data_point = #{fixedDataPoint},
+            use_fixed_display = #{useFixedDisplay},
+            update_by = #{updateBy},
+            update_time = now()
+        where id = #{id}
+    </update>
+
 </mapper>