Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -938,7 +938,7 @@ public class MonitorFanIdxController extends BaseController {
                 Map<String, Object> yearMap = new HashMap<>();
                 dayMap.put("name",name);
                 dayMap.put("gateWayId",stationBasic.getFanGatewayId());
-                dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("日发电量").toString())* CommonConstans.pvGenPoweActor));
+                dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("日发电量").toString())* CommonConstans.pvGenPoweActor*CommonConstans.pvGenPoweActorDay));
                 monthMap.put("name",name);
                 monthMap.put("gateWayId",stationBasic.getFanGatewayId());
                 monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("月发电量").toString())* CommonConstans.pvGenPoweActor));

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/TemporaryDataMapper.xml

@@ -5,7 +5,7 @@
 
 
     <select id="timingTemporarysSorageData" resultType="map">
-        SELECT avg(value) as value ,
+        SELECT FORMAT( avg(value),2)as value ,
         created_time as createdTime ,
         equipmentIndexName
         FROM