按集中器统计抄表率优化 PengDi@2021/1/4

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/StatMeterReadRateByConcentratorServiceImpl.java

@@ -62,7 +62,7 @@ public class StatMeterReadRateByConcentratorServiceImpl implements StatMeterRead
 		List<StatMeterReadRateDto> list = null;
 		int period = condition.getPeriod();
 		if(period == MeterReadPeriod.TODAY){
-            list = statMeterReadRateByConcentratorMapper.getListByDay(condition);
+            list = statMeterReadRateByConcentratorMapper.getListByToday(condition);
         }
     	else if(period == MeterReadPeriod.LAST_DAY) {
     		list = statMeterReadRateByConcentratorMapper.getListByDay(condition);

smart-city-platform/src/main/resources/mapper/MeterReadRecordMapper.xml

@@ -1085,6 +1085,22 @@
             AND t1.building_id = #{param.buildingId}
         </if>
     </select>
+    <select id="queryUnReadDeviceListForToday_COUNT" resultType="Long">
+        SELECT
+            count(device_id)
+        FROM sc_meter_read_record
+        WHERE read_status = 1
+        <if test = "param.buildingId != null">
+            and building_id = #{param.buildingId}
+        </if>
+        <if test="param.channelId != null">
+            and sys_id = #{param.channelId}
+        </if>
+        <if test="param.custormerId != null ">
+            and customer_id = #{param.custormerId}
+        </if>
+        AND read_date = DATE_FORMAT( now( ), '%Y%m%d' )
+    </select>
     <select id="queryUnReadDeviceListForToday" resultType="com.bz.smart_city.dto.DeviceDto">
         SELECT
             d.site_id as siteId,

smart-city-platform/src/main/resources/mapper/StatMeterReadRateByBuildingMapper.xml

@@ -764,7 +764,7 @@
                 count( 1 ) AS read_times,
                 SUM( IF ( read_status = 2, 1, 0 ) ) AS real_read_times,
                 SUM( IF ( read_status = 1, 1, 0 ) ) AS un_read_times,
-                FORMAT( SUM( IF ( read_status = 2, 1, 0 ) ) / COUNT( 1 ) * 100, 2 ) AS read_rate,
+                convert( SUM( IF ( read_status = 2, 1, 0 ) ) / COUNT( 1 ) * 100, decimal(5,2) ) AS read_rate,
                 mrr.customer_id AS customer_id
             FROM
                 sc_meter_read_record mrr
@@ -781,6 +781,38 @@
         LEFT JOIN sc_building b ON ( rb.building_id = b.id )
         LEFT JOIN sc_customer c ON ( rb.customer_id = c.id )
     </sql>
+    <select id="getRateListByBuildingForToday_COUNT" resultType="Long">
+        SELECT
+            COUNT(1)
+        FROM
+        (
+            SELECT
+                DATE_FORMAT( now( ), '%Y%m%d' ) AS stat_day,
+                mrr.site_id,
+                mrr.sys_id as channel_id,
+                mrr.building_id AS building_id,
+                count( DISTINCT device_id ) AS device_count,
+                count( 1 ) AS read_times,
+                SUM( IF ( read_status = 2, 1, 0 ) ) AS real_read_times,
+                SUM( IF ( read_status = 1, 1, 0 ) ) AS un_read_times,
+                convert( SUM( IF ( read_status = 2, 1, 0 ) ) / COUNT( 1 ) * 100, decimal(5,2) ) AS read_rate,
+                mrr.customer_id AS customer_id
+            FROM
+                sc_meter_read_record mrr
+            WHERE
+                mrr.`status` = 1
+            AND mrr.sys_id = #{param.channelId}
+            AND mrr.read_date = DATE_FORMAT( now( ), '%Y%m%d' )
+            GROUP BY
+                mrr.site_id,
+                mrr.sys_id,
+                mrr.customer_id,
+                mrr.building_id
+        ) rb
+        LEFT JOIN sc_building b ON ( rb.building_id = b.id )
+        LEFT JOIN sc_customer c ON ( rb.customer_id = c.id )
+        <include refid="where_clause"></include>
+    </select>
     <select id="getRateListByBuildingForToday"  resultType="com.bz.smart_city.dto.StatMeterReadRateDto">
         <include refid="base_GetRateListByBuildingForToday"></include>
         <include refid="where_clause"></include>

smart-city-platform/src/main/resources/mapper/StatMeterReadRateByConcentratorMapper.xml

@@ -648,7 +648,7 @@
 		    count(1) AS read_times,
 		    SUM(IF(read_status = 2, 1, 0)) as real_read_times,
 		    SUM(IF(read_status = 1, 1, 0)) as un_read_times ,
-			FORMAT( SUM(IF(read_status = 2, 1, 0)) / count(1) * 100, 2 ) AS read_rate
+			convert( SUM(IF(read_status = 2, 1, 0)) / count(1) * 100, decimal(5,2) ) AS read_rate
 		FROM
 			sc_meter_read_record
 		WHERE 1 = 1
@@ -692,6 +692,65 @@
 		left join sc_device_type dt on (tmp.device_type_id = dt.id)
 		left join sc_device_manufacturer m on (dt.manufacturer_id = m.id)
 	</sql>
+	<select id="getListByToday_COUNT" resultType="Long">
+		SELECT
+			count(1)
+		FROM
+		(
+			SELECT
+			customer_id,
+			concentrator_id,
+			device_type_id,
+			count(1) as device_count,
+			count(1) AS read_times,
+			SUM(IF(read_status = 2, 1, 0)) as real_read_times,
+			SUM(IF(read_status = 1, 1, 0)) as un_read_times ,
+			convert( SUM(IF(read_status = 2, 1, 0)) / count(1) * 100, decimal(5,2) ) AS read_rate
+			FROM
+			sc_meter_read_record
+			WHERE 1 = 1
+			and device_type_id IN ( SELECT device_type_id FROM sc_w_meter_type WHERE parent_id = 1 )
+			<!-- 表类型 -->
+			<if test="param.deviceTypeId != null ">
+				and device_type_id = #{param.deviceTypeId}
+			</if>
+			<!-- 数据权限 -->
+			<if test="param.siteId != null and param.siteId != 0 "> and site_id = #{param.siteId} </if>
+			<if test='param.programItems != null and param.programItems.size() != 0' >
+				and concentrator_id IN (
+				SELECT DISTINCT
+				rd.concentrator_id
+				FROM
+				sc_water_related_device rd
+				WHERE
+				rd.device_id IN (
+				SELECT
+				ud.device_id
+				FROM
+				(
+				SELECT
+				DISTINCT df.device_id
+				FROM sc_device_dim_info df
+				WHERE 1 = 1
+				and <foreach collection="param.programItems" item="item" open="(" separator=" or " close=")">
+				(df.dimension_code = #{item.dimensionCode} and df.dimension_value = #{item.dimensionValue})
+			</foreach> ) ud
+				)
+				)
+			</if>
+			<if test = "param.statDay != null and param.statDay != 0"> and read_date = #{param.statDay}</if>
+		GROUP BY
+			customer_id,
+			concentrator_id,
+			device_type_id
+		) tmp
+		where 1 = 1
+		<if test = "param.beginRate != null "> and tmp.read_rate >= #{param.beginRate}</if>
+		<if test = "param.endRate != null "> and tmp.read_rate <![CDATA[ <= ]]>  #{param.endRate}</if>
+		<if test = "param.custormerId != null"> and tmp.customer_id = #{param.custormerId}</if>
+		<if test = "param.concentratorId != null">and tmp.concentrator_id = #{param.concentratorId}</if>
+		<if test = "param.deviceTypeId != null" >and tmp.device_type_id = #{param.deviceTypeId}</if>
+	</select>
     <select id="getListByToday" resultType="com.bz.smart_city.dto.StatMeterReadRateDto">
 		<include refid="base_query_getListByToday" />
 		<include refid="where_clause" />