宣传能力--NEI联调

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java

@@ -47,7 +47,7 @@ public class FactTagAgencyDTO implements Serializable {
     /**
      * 固定值：文章数量
      */
-    private String type="文章数量";
+    private String type="阅读次数";
 
     /**
      * 机关Id

epmet-module/data-report/data-report-server/pom.xml

@@ -112,7 +112,7 @@
                 <spring.redis.password>123456</spring.redis.password>
 
                 <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
                 <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml

@@ -24,7 +24,7 @@
         where agency_id = #{agencyId}
         AND month_id = #{monthId}
         GROUP BY TAG_ID
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -39,7 +39,7 @@
         where agency_id = #{agencyId}
         AND quarter_id = #{quarterId}
         GROUP BY TAG_ID
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -54,7 +54,7 @@
         where agency_id = #{agencyId}
         AND year_id = #{yearId}
         GROUP BY tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -69,7 +69,7 @@
         where agency_id = #{agencyId}
         AND month_id = #{monthId}
         GROUP BY TAG_ID
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -84,7 +84,7 @@
         where agency_id = #{agencyId}
         AND quarter_id = #{quarterId}
         GROUP BY TAG_ID
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -99,7 +99,7 @@
         where agency_id = #{agencyId}
         AND year_id = #{yearId}
         GROUP BY tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC ,tagId ASC
         LIMIT #{pageSize}
     </select>
 
@@ -118,6 +118,7 @@
         AND pub.PID =#{agencyId}
         AND pub.month_id=#{monthId}
         GROUP BY pub.agency_id
+        ORDER BY value DESC,agencyId ASC
 
     </select>
 
@@ -136,6 +137,7 @@
         AND pub.PID =#{agencyId}
         AND pub.quarter_id=#{quarterId}
         GROUP BY pub.agency_id
+        ORDER BY value DESC,agencyId ASC
     </select>
 
     <!-- 当年——下级机发文数：机关名称、机关id、发文数量、上级机关id -->
@@ -153,6 +155,7 @@
         AND pub.PID =#{agencyId}
         AND pub.year_id=#{yearId}
         GROUP BY pub.agency_id
+        ORDER BY value DESC,agencyId ASC
     </select>
 
     <!-- 当月——下级部门文数：部门名称、机关id、发文数量、部门id -->
@@ -170,6 +173,7 @@
         AND pub.agency_id =#{agencyId}
         AND pub.month_id=#{monthId}
         GROUP BY pub.department_id
+        ORDER BY value DESC,departmentId ASC
 
     </select>
 
@@ -188,6 +192,7 @@
         AND pub.agency_id =#{agencyId}
         AND pub.quarter_id=#{quarterId}
         GROUP BY pub.department_id
+        ORDER BY value DESC,departmentId ASC
     </select>
 
     <!-- 当年——下级部门文数：部门名称、机关id、发文数量、部门id -->
@@ -205,6 +210,7 @@
         AND pub.agency_id =#{agencyId}
         AND pub.year_id=#{yearId}
         GROUP BY pub.department_id
+        ORDER BY value DESC,departmentId ASC
     </select>
 
     <!-- 当月——下级网格文数：网格名称、机关id、发文数量、网格id -->
@@ -222,6 +228,7 @@
         AND pub.agency_id = #{agencyId}
         AND pub.month_id=#{monthId}
         GROUP BY pub.grid_id
+        ORDER BY value DESC,gridId ASC
 
     </select>
 
@@ -240,6 +247,7 @@
         AND pub.agency_id = #{agencyId}
         AND pub.quarter_id=#{quarterId}
         GROUP BY pub.grid_id
+        ORDER BY value DESC,gridId ASC
     </select>
 
     <!-- 当年——下级网格文数：网格名称、机关id、发文数量、网格id -->
@@ -257,6 +265,7 @@
         AND pub.agency_id = #{agencyId}
         AND pub.year_id = #{yearId}
         GROUP BY pub.grid_id
+        ORDER BY value DESC,gridId ASC
     </select>
 
 </mapper>