Merge remote-tracking branch 'origin/master'

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

@@ -110,6 +110,8 @@ 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();
         //事件总数
         int Visualization_All_Event_Count = visualization_event_service.Visualization_All_Event_Count();
         //人员总数
@@ -129,6 +131,7 @@ public class Visualization_Event_Controller extends AppBaseController {
         event.setUSER_DEPTID(DEPTID);
         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_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/domain/Visualization_Event_Count.java

@@ -0,0 +1,15 @@
+package com.business.slfh.visualization.event.domain;
+
+import com.sooka.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author limeng
+ * @date 2021年05月28日 15:14
+ */
+@Data
+public class Visualization_Event_Count extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private String COUNT;
+    private String RESERVEPLAN_TYPE;
+}

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

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

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

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

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

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

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

@@ -236,6 +236,10 @@
         <result property="DEPT_ID" column="DEPT_ID"/>
         <result property="FOREST_TYPE" column="FOREST_TYPE"/>
     </resultMap>
+    <resultMap id="Visualization_Event_Count" type="Visualization_Event_Count">
+        <result property="COUNT" column="COUNT"/>
+        <result property="RESERVEPLAN_TYPE" column="RESERVEPLAN_TYPE"/>
+    </resultMap>
 
 
     <sql id="Columns">
@@ -331,6 +335,41 @@
         ) AS t
     </select>
 
+    <select id="Visualization_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
+                    1 = 1
+                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
+                    1 = 1
+                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/static/visualization/images/zhly_body.css

@@ -526,7 +526,7 @@ img {display:block;border:none; margin:0 auto;}
 	top: 11%;
 }
 .wei .wei_tab {
-  position: relative;
+  float: left;
   border-radius: 5px;
   display: flex;
   list-style: none;
@@ -569,6 +569,38 @@ img {display:block;border:none; margin:0 auto;}
   opacity: 0;
   background-color: #036688;
 }
+.wei .test-long{
+	float: left;
+	padding: 0 10px;
+}
+.wei .test-long li{
+	 float: left;
+	 margin-right: 3px;
+	 color: #00ccff;
+	 display: inline-block;
+	 line-height: 35px;
+	 padding:0 8px;
+	border: 1px solid #0093c0;
+	border-radius: 5px;
+	cursor:pointer;
+ }
+.wei .test-long li:hover{
+	background: #0aae23;
+	color: #ffffff;
+	cursor:pointer;
+	border-radius: 5px;
+}
+.wei .test-long li span{
+	display: inline-block;
+	float: left;
+}
+.wei .test-long li img{
+	display: inline-block;
+	float: left;
+	margin-top: 8px;
+	margin-right: 5px;
+}
+
 
 .squeeze {
   transition: all 1.5s;

mybusiness/src/main/resources/static/visualization/images/zhly_page.css

@@ -1212,4 +1212,33 @@
 
 
 .iclient-leaflet-logo img{display: none!important;}
-.leaflet-touch .leaflet-control-attribution, .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {display: none!important;}
+.leaflet-touch .leaflet-control-attribution, .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {display: none!important;}
+
+
+#jk_hover,#jk_hover2{
+	position: absolute;
+	height: auto;
+	background: #000;
+	z-index: 100;
+	border: 1px solid #00ccff;
+	border-radius: 10px;
+	display: none;
+	top: 110px;
+	padding: 15px;
+}
+#jk_hover{
+	left: 0;
+
+}
+#jk_hover ul li, #jk_hover2 ul li{
+	color: #00ccff;
+	display: block;
+	height: 30px;
+	line-height: 30px;
+	text-align: left;
+}
+#jk_hover ul li span, #jk_hover2 ul li span{
+	color: #ffffff!important;
+
+}
+

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

@@ -304,25 +304,31 @@
         <li class="aa"><a name="xzt">行政图</a></li>
         <li class="aa"><a name="lwt">路网图</a></li>
     </ul>
+    <ul class="test-long">
+        <li><img  src="../images/cej.png"><span>测距</span></li>
+        <li><img  src="../images/cemj.png"><span>测面积</span></li>
+        <li><img  src="../images/gbcj.png"><span>退出测量</span></li>
+    </ul>
 </div>
+
 <!--二维三维 结束-->
 <!--事件 左侧导航 开始-->
 <div class="left_nav">
     <label><input type="checkbox" checked name="leftNav" id="slfh" />森林防火</label>
-    <label><input type="checkbox" checked name="leftNav" id="bch" >病虫害</label>
-    <label><input type="checkbox" checked name="leftNav" id="lwt" />瞭望台</label>
-    <label><input type="checkbox" checked name="leftNav" id="sxt" />警戒头</label>
-    <label><input type="checkbox" checked name="leftNav" id="toud" />偷盗</label>
-    <label><input type="checkbox" checked name="leftNav" id="lklf" />乱砍滥伐</label>
-    <label><input type="checkbox" checked name="leftNav" id="tscs" />偷沙采石</label>
-    <label><input type="checkbox" checked name="leftNav" id="phd" />扑火队</label>
-    <label><input type="checkbox" checked name="leftNav" id="jjd" />机降点</label>
-    <label><input type="checkbox" checked name="leftNav" id="qxz" />气象站</label>
-    <label><input type="checkbox" checked name="leftNav" id="fhjcz" />防火检查站</label>
-    <label><input type="checkbox" checked name="leftNav" id="lyj" />林业局</label>
-    <label><input type="checkbox" checked name="leftNav" id="lc" />林场</label>
-    <label><input type="checkbox" checked name="leftNav" id="sy" />水源</label>
-    <label><input type="checkbox" checked name="leftNav" id="jywz" />救援物资</label>
+    <label><input type="checkbox"  name="leftNav" id="bch" >病虫害</label>
+    <label><input type="checkbox"  name="leftNav" id="lwt" />瞭望台</label>
+    <label><input type="checkbox"  name="leftNav" id="sxt" />警戒头</label>
+    <label><input type="checkbox"  name="leftNav" id="toud" />偷盗</label>
+    <label><input type="checkbox"  name="leftNav" id="lklf" />乱砍滥伐</label>
+    <label><input type="checkbox"  name="leftNav" id="tscs" />偷沙采石</label>
+    <label><input type="checkbox"  name="leftNav" id="phd" />扑火队</label>
+    <label><input type="checkbox"  name="leftNav" id="jjd" />机降点</label>
+    <label><input type="checkbox"  name="leftNav" id="qxz" />气象站</label>
+    <label><input type="checkbox"  name="leftNav" id="fhjcz" />防火检查站</label>
+    <label><input type="checkbox"  name="leftNav" id="lyj" />林业局</label>
+    <label><input type="checkbox"  name="leftNav" id="lc" />林场</label>
+    <label><input type="checkbox"  name="leftNav" id="sy" />水源</label>
+    <label><input type="checkbox"  name="leftNav" id="jywz" />救援物资</label>
 </div>
 <!--事件 左侧导航 结束-->
 <!--森林 左侧导航 开始-->

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

@@ -15,21 +15,62 @@
     <h3>实时数据监控</h3>
 </div>
 <div class="sssjjk clearfix">
-    <div class="jk_div">
+    <div class="jk_div" onmouseover="overShow()" onmouseout="overHide()">
         <img th:src="@{/visualization/images/zhly_23.png}"/>
-        <div class="jk_txt">
+
+        <div class="jk_txt" >
             <h2 class="jk_sj"><i th:text="${Visualization_Report_Event_Count}"/></h2>
             <span>上报总数</span>
-        </div>
 
+        </div>
+        <div id="jk_hover">
+            <ul>
+                <li th:each="veec : ${Visualization_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>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'">乱砍乱伐:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'">偷砂采石:</span>
+                    [[${veec.COUNT}]]
+                </li>
+            </ul>
+        </div>
     </div>
-    <div class="jk_div">
+
+    <div class="jk_div"  onmouseover="overShowTow()" onmouseout="overHideTow()" >
         <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>
         </div>
+        <div id="jk_hover2">
+            <ul>
+                <li th:each="veec : ${Visualization_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>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'">乱砍乱伐:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'">偷砂采石:</span>
+                    [[${veec.COUNT}]]
+                </li>
+            </ul>
+        </div>
     </div>
+    <script>
+        function overShow() {
+
+            document.getElementById("jk_hover").style.display = "block";
+        }
+        function overHide() {
+            document.getElementById("jk_hover").style.display = "none"
+        }
+        function overShowTow() {
+            document.getElementById("jk_hover2").style.display = "block";
+        }
+        function overHideTow() {
+            document.getElementById("jk_hover2").style.display = "none"
+        }
+    </script>
     <div class="jk_div">
         <img th:src="@{/visualization/images/zhly_27.png}"/>
         <div class="jk_txt">

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

@@ -65,11 +65,11 @@
 
     function initMarker(){
         clearLayers();
-        getSxtMarkers();
-        getLwtMarkers();
-        getSyMarkers();
-        getJywzMarkers();
-        getXfResources(["fhjcz","lyj","lc","jjd","phd","qxz"]);
+        // getSxtMarkers();
+        // getLwtMarkers();
+        // getSyMarkers();
+        // getJywzMarkers();
+        // getXfResources(["fhjcz","lyj","lc","jjd","phd","qxz"]);
         var eventName = parent.$("#qt_iframe")[0].contentWindow.getFrameElementValue("eventName");
         var deptId = parent.$("#qt_iframe")[0].contentWindow.getFrameElementValue("treeId");
         var deptName = parent.$("#qt_iframe")[0].contentWindow.getFrameElementValue("treeName");