Merge remote-tracking branch 'origin/master'

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -122,8 +122,10 @@ public class Visualization_Event_Controller extends AppBaseController {
 
         //上报总数
         int Visualization_Report_Event_Count = visualization_event_service.Visualization_Report_Event_Count();
-        //各类时间数量
+        //各类事件数量
         List <Visualization_Event_Count> Visualization_Event_Each_Count = visualization_event_service.Visualization_Event_Each_Count();
+        //各类事件已确定数量
+        List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count = visualization_event_service.Visualization_ALL_Event_Each_Count();
         //事件总数
         int Visualization_All_Event_Count = visualization_event_service.Visualization_All_Event_Count();
         //人员总数
@@ -144,6 +146,7 @@ public class Visualization_Event_Controller extends AppBaseController {
         List<Visualization_Event> Visualization_Pending_List = visualization_event_service.Visualization_Pending_List(event);
         map.put("Visualization_Report_Event_Count", Visualization_Report_Event_Count);
         map.put("Visualization_Event_Each_Count", Visualization_Event_Each_Count);
+        map.put("Visualization_ALL_Event_Each_Count", Visualization_ALL_Event_Each_Count);
         map.put("Visualization_All_Event_Count", Visualization_All_Event_Count);
         map.put("Visualization_User_Count", Visualization_User_Count);
         map.put("Visualization_Car_Count", Visualization_Car_Count);

mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -60,4 +60,5 @@ public interface Visualization_Event_Mapper {
     void deleteWrjGjs();
     List<Visualizaiton_UAV> getWrjGjs();
     List<Visualization_Event_Count> Visualization_Event_Each_Count(@Param("DEPT_ID") String DEPT_ID);
+    List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count(@Param("DEPT_ID") String DEPT_ID);
 }

mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java

@@ -56,4 +56,5 @@ public interface Visualization_Event_Service {
     int getRoleMenu();
     List<Visualization_XF_Resources> getXfResources(String [] typeArr,String DEPT_ID);
     List<Visualization_Event_Count> Visualization_Event_Each_Count();
+    List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count();
 }

mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -234,5 +234,9 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     public List<Visualization_Event_Count> Visualization_Event_Each_Count(){
         return Visualization_Event_Mapper.Visualization_Event_Each_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
+    @Override
+    public List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count(){
+        return Visualization_Event_Mapper.Visualization_ALL_Event_Each_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
+    }
 
 }

mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -370,6 +370,41 @@
         ) AS t GROUP BY reserveplan_type
     </select>
 
+    <select id="Visualization_ALL_Event_Each_Count" resultType="Visualization_Event_Count">
+        SELECT
+        COUNT(t.id) COUNT,RESERVEPLAN_TYPE
+        FROM
+        (
+            (
+                SELECT
+                id,'reserveplan_type_1' as reserveplan_type
+                FROM
+                t_u_event_fire
+                WHERE
+                event_status NOT IN ('event_status_1','event_status_6')
+                AND DEPT_ID IN (
+                <include refid="Depts">
+                    <property name="dept_id" value="#{DEPT_ID}"/>
+                </include>
+            )
+        )
+          UNION
+        (
+            SELECT
+            id,reserveplan_type
+            FROM
+            t_u_event_others
+            WHERE
+            event_status NOT IN ('event_status_1','event_status_6')
+            AND DEPT_ID IN (
+            <include refid="Depts">
+                <property name="dept_id" value="#{DEPT_ID}"/>
+            </include>
+            )
+        )
+    ) AS t GROUP BY reserveplan_type
+    </select>
+
     <select id="Visualization_All_Event_Count" resultType="Integer">
         SELECT
           COUNT(t.id) AllEvent

mybusiness/src/main/resources/templates/business/visualization/frame.html

@@ -20,7 +20,7 @@
 
         <div class="jk_txt" >
             <h2 class="jk_sj"><i th:text="${Visualization_Report_Event_Count}"/></h2>
-            <span>上报总数</span>
+            <span>事件总数</span>
 
         </div>
         <div id="jk_hover">
@@ -44,11 +44,11 @@
         <img th:src="@{/visualization/images/zhly_20.png}"/>
         <div class="jk_txt">
             <h2 class="jk_sj"><i th:text="${Visualization_All_Event_Count}"/></h2>
-            <span>火情总数</span>
+            <span>确认总数</span>
         </div>
-        <div id="jk_hover2">
+        <div id="jk_hover2" th:if="${Visualization_All_Event_Count} != 0">
             <ul>
-                <li th:each="veec : ${Visualization_Event_Each_Count}">
+                <li th:each="veec : ${Visualization_ALL_Event_Each_Count}">
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_1'">森林防火:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_2'">病虫害:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'">偷盗偷猎:</span>