1.数据完整性列表调整

2.区域电能质量评估列表调整
3.调整监测点台账列表顺序
4.删除灿能电力字样
5.调整loge和ico图标
6.调整概览首页在线率和完整率数据
7.调整设备树的查询方式

pqs9000/src/main/resources/mybatis/mappers/data/AssesMapper.xml

@@ -66,5 +66,44 @@
 			GROUP BY
 				LINEID
 	</select>
-
+	<select id="getLineVol" resultType="com.njcn.pojo.data.AssesData">
+		SELECT
+			T6.NAME powerCompany,
+			T7.NAME substation,
+			T1.LINEID lineId,
+			T2.NAME lineName,
+			VU_DEV as vuDevs,
+			Freq_Dev as freqDev,
+			Data_PLT as dataPlt,
+			V_Unbalance_CP95 as vunbalanceCp95,
+			V_THD_CP95 as vThdCp95
+		FROM
+		(
+			SELECT
+				LINEID,
+				ROUND(AVG( VU_DEV ),2) VU_DEV,
+				ROUND(AVG( Freq_Dev ),2) Freq_Dev,
+				ROUND(AVG( Data_PLT ),2) Data_PLT,
+				ROUND(AVG( V_Unbalance_CP95 ),2) V_Unbalance_CP95,
+				ROUND(AVG( V_THD_CP95 ),2) V_THD_CP95
+			FROM
+				PQS_ASSES
+			WHERE
+				TIMEID BETWEEN #{startTime}
+				AND #{endTime}
+				AND LINEID IN
+			<foreach collection="list"  item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+			GROUP BY
+				LINEID
+		) T1,
+			PQ_LINE T2,
+			PQ_SUBSTATION T7,
+			PQ_GDINFORMATION T6
+		WHERE
+			T1.LINEID = T2.LINE_INDEX
+			AND T2.SUB_INDEX = T7.SUB_INDEX
+			AND T2.GD_INDEX = T6.GD_INDEX
+	</select>
 </mapper>

pqs9000/src/main/resources/mybatis/mappers/data/IntegrityMapper.xml

@@ -23,7 +23,7 @@
         SUM (T1.real) countOnline,
         SUM (T1.due) countAll
         FROM
-        PQS_NGCPINTEGRITY T1
+        PQS_Integrity T1
         WHERE
         T1.Line_index in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
@@ -148,7 +148,7 @@
         4
         ) * 100 integrity
         FROM
-        PQS_NGCPINTEGRITY T1
+        PQS_Integrity T1
         WHERE
         T1.LINE_INDEX IN  <foreach collection="list" item="item" open="(" close=")" separator=",">#{item}</foreach>
         AND t1.TIMEID BETWEEN #{startTime} AND #{endTime}

pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml

@@ -108,7 +108,8 @@
 		a.line_index lineIndex,
 		mod(a.line_index,10) as lineNum,
 		a.name as lineName,
-		nvl(b.POWER_SUBSTATION_NAME,e.name)||'_'||sv.NAME||'_'||a.name as electricityQualityName,
+		e.name||'_'||sv.NAME||'_'||a.name as electricityQualityName,
+		sv.NAME as busBarName,
 		a.dev_index devIndex,
 		a.status lineStatus,
 		b.pttype ptType,
@@ -194,10 +195,14 @@
 		<if test="status!=null">
 			and d.status = #{status}
 		</if>
+		<if test="powerId!=null">
+			and b.POWERID = #{powerId}
+		</if>
 		<choose>
 			<when test="type == 0"> and b.MONITOR_ID is not null and b.MONITOR_ID != ' '</when>
 			<when test="type == 1"> and (b.MONITOR_ID IS NULL or b.MONITOR_ID IN (' '))</when>
 		</choose>
+		order by province,gdName,devName,lineNum,subName,busBarName,lineName
 	</select>
 
 	<select id="getDeptsLineIndex" resultType="java.lang.Integer"

pqs9000/src/main/resources/mybatis/mappers/user/DeptsLineMapper.xml

@@ -127,7 +127,43 @@
         </foreach>
     </select>
 
-
+    <select id="selectIndexsPowerIdByDeptRun" resultType="IndexsCount">
+        SELECT
+        t2.LINE_INDEX lineIndex,
+        t2.SUB_INDEX subIndex,
+        t2.DEV_INDEX devIndex,
+        t2.GD_INDEX gdIndex
+        FROM
+        PQS_DEPTSLINE t1,
+        PQ_LINE t2,
+        PQ_LINEDETAIL t4,
+        PQ_DEVICE t3
+        WHERE
+        t1.LINE_INDEX = t2.LINE_INDEX
+        and t4.LINE_INDEX = t2.LINE_INDEX
+        AND t2.DEV_INDEX = t3.DEV_INDEX
+        AND t1.DEPTS_INDEX in
+        <foreach collection="depts" item="item"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        <if test="sysType != null">
+            AND t1.systype=#{sysType}
+        </if>
+        AND t3.DEVMODEL = #{devModel}
+        <if test="devStatus!=null">
+            AND t3.DevFlag=#{devStatus}
+        </if>
+        <if test="status!=null">
+            AND t3.status = #{status}
+        </if>
+        <if test="powerId!=null">
+            AND t4.POWERID = #{powerId}
+        </if>
+        AND t3.DATATYPE in
+        <foreach collection="dataType" item="item"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 
     <select id="selectIndexsByDeptsRunForStatFlag" resultType="IndexsCount">
         SELECT