在线监测修改

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -791,6 +791,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
     public MonitorDataCollectDto GetCalTotalData(List<MonitorDataCollectDto> calculateRes){
         MonitorDataCollectDto result=new MonitorDataCollectDto();
         for(MonitorDataCollectDto calculate :calculateRes){
+            result.setSceneTypeName(calculate.getSceneTypeName());
             for(MonitorDataDto monitorData : calculate.getMonitorDataEntities()){
                 byte[] bytes = redisUtil.get(("sms_water_"+monitorData.getDeviceCode()).getBytes());
                 if(bytes != null && bytes.length>0) {

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

@@ -52,6 +52,7 @@
         <result property="pointY" column="point_y" jdbcType="VARCHAR"/>
         <result property="address" column="address" jdbcType="VARCHAR"/>
         <result property="deviceState" column="device_state" jdbcType="INTEGER"/>
+        <result property="sceneTypeName" column="scene_type_name" jdbcType="VARCHAR"/>
         <collection property="MonitorDataEntities" ofType="com.huaxu.dto.MonitorDataDto" javaType="list">
             <result property="attributeId" column="attribute_id" jdbcType="INTEGER"/>
             <result property="attributeName" column="attribute_name" jdbcType="VARCHAR"/>
@@ -558,7 +559,7 @@
     </select>
     <!-- 查询设备参数-->
     <select id="statsDeviceParm" resultMap="deviceDataMap">
-        SELECT t6.id device_id,t6.device_code,t6.device_name,t7.attribute_id,t7.parm_type attribute_type,
+        SELECT t6.id device_id,t6.device_code,t6.device_name,t7.attribute_id,t7.parm_type attribute_type,t3.scene_type_name,
          case when t7.attribute_id is  null then null when t8.id is null then 0 else 1 end is_alarm
         <if test="type == 4 ">,t9.latest_value</if>
         from sms_scene t1
@@ -682,7 +683,7 @@
     </select>
     <!--查询昨日水厂制水总量-->
     <select id="selectTotalYieldWater" resultType="java.lang.Double">
-        select sum(sum_value) yieldWater
+        select sum(sum_value)/10000 yieldWater
         from sms_scene t1
         <include refid="sceneDeviceJoins"/>
         inner join sms_month_report t8 on t8.device_id=t2.device_id and t8.attribute_id =t5.attribute_id