limeng 4 rokov pred
rodič
commit
6b5d8fe599

+ 28 - 2
mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -18,13 +18,18 @@ import com.business.slfh.tools.UserInfoUtil;
 import com.business.slfh.visualization.event.domain.*;
 import com.business.slfh.visualization.event.service.Visualization_Event_Service;
 import com.sooka.common.config.Global;
+import com.sooka.common.utils.CacheUtils;
+import com.sooka.common.utils.StringUtils;
 import com.sooka.framework.util.ShiroUtils;
 import com.sooka.framework.web.service.DictService;
 import com.sooka.system.domain.SysConfig;
+import com.sooka.system.domain.SysDictData;
+import com.sooka.system.domain.SysDictType;
 import com.sooka.system.domain.SysUser;
 import com.sooka.system.mapper.SysConfigMapper;
 import com.sooka.system.service.ISysConfigService;
 import com.sooka.system.service.ISysDictDataService;
+import com.sooka.system.service.ISysDictTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -450,8 +455,8 @@ public class Visualization_Event_Controller extends AppBaseController {
      * */
     @RequestMapping("getVisualizationFrame_WRJGJ")
     public String getVisualizationFrame_WRJGJ(ModelMap map){
-        Visualization_Level level = visualization_event_service.getResLevel();
-        map.put("level",level);
+        List<Visualizaiton_UAV> wrjGjs = visualization_event_service.getWrjGjs();
+        map.put("wrjGjs",wrjGjs);
         return prefix + "/wrjgj";
     }
 
@@ -574,6 +579,27 @@ public class Visualization_Event_Controller extends AppBaseController {
             return jsonObject.toString();
         }
     }
+
+    @RequestMapping("/insertWrjGj")
+    @ResponseBody
+    public List<Visualizaiton_UAV> insertWrjGj(HttpServletRequest request) {
+        Visualizaiton_UAV uav = new Visualizaiton_UAV();
+        uav.setID(UUID_Tools.getUUID());
+        uav.setLATITUDE(request.getParameter("latitude"));
+        uav.setLONGITUDE(request.getParameter("longitude"));
+        visualization_event_service.insertWrjGj(uav);
+        return visualization_event_service.getWrjGjs();
+    }
+    @RequestMapping("/getWrjGjs")
+    @ResponseBody
+    public List<Visualizaiton_UAV> getWrjGjs() {
+        return visualization_event_service.getWrjGjs();
+    }
+    @RequestMapping("/deleteWrjGjs")
+    @ResponseBody
+    public void deleteWrjGjs() {
+        visualization_event_service.deleteWrjGjs();
+    }
     @RequestMapping("/deleteRoadBlocks")
     @ResponseBody
     public String deleteRoadBlocks(HttpServletRequest request) {

+ 16 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/domain/Visualizaiton_UAV.java

@@ -0,0 +1,16 @@
+package com.business.slfh.visualization.event.domain;
+
+import com.sooka.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author limeng
+ * @date 2021年05月27日 17:12
+ */
+@Data
+public class Visualizaiton_UAV extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private String ID;
+    private String LATITUDE;
+    private String LONGITUDE;
+}

+ 3 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -56,4 +56,7 @@ public interface Visualization_Event_Mapper {
     void updateEventSign(@Param("eventId") String eventId,@Param("reservePlanType") String reservePlanType);
     int getRoleMenu(@Param("roles") List<SysRole> roles);
     List<Visualization_XF_Resources> getXfResources(@Param("typeArr") String [] typeArr,@Param("DEPT_ID") String DEPT_ID);
+    void insertWrjGj(Visualizaiton_UAV uav);
+    void deleteWrjGjs();
+    List<Visualizaiton_UAV> getWrjGjs();
 }

+ 3 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java

@@ -48,6 +48,9 @@ public interface Visualization_Event_Service {
     Visualization_Level getResLevel();
     void insertRoadBlocks(Visualization_RoadBlocks roadBlocks);
     void deleteRoadBlocks(Visualization_RoadBlocks roadBlocks);
+    void insertWrjGj(Visualizaiton_UAV uav);
+    void deleteWrjGjs();
+    List<Visualizaiton_UAV> getWrjGjs();
     List<Visualization_RoadBlocks> getRoadBlocks();
     void updateEventSign(String eventId,String reservePlanType);
     int getRoleMenu();

+ 12 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -218,5 +218,17 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     public List<Visualization_XF_Resources> getXfResources(String [] typeArr,String DEPT_ID){
         return Visualization_Event_Mapper.getXfResources(typeArr,DEPT_ID);
     }
+    @Override
+    public void insertWrjGj(Visualizaiton_UAV uav){
+        Visualization_Event_Mapper.insertWrjGj(uav);
+    }
+    @Override
+    public void deleteWrjGjs(){
+        Visualization_Event_Mapper.deleteWrjGjs();
+    }
+    @Override
+    public List<Visualizaiton_UAV> getWrjGjs(){
+        return Visualization_Event_Mapper.getWrjGjs();
+    }
 
 }

+ 34 - 0
mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -218,6 +218,13 @@
         <result property="LATITUDE" column="LATITUDE"/>
         <result property="LONGITUDE" column="LONGITUDE"/>
     </resultMap>
+    <resultMap type="Visualizaiton_UAV" id="Visualizaiton_UAV">
+        <result property="ID" column="ID"/>
+        <result property="LATITUDE" column="LATITUDE"/>
+        <result property="LONGITUDE" column="LONGITUDE"/>
+    </resultMap>
+
+
     <resultMap id="Visualization_XF_Resources" type="Visualization_XF_Resources">
         <result property="ID" column="ID"/>
         <result property="NAME" column="NAME"/>
@@ -1059,4 +1066,31 @@
             #{item}
         </foreach>
     </select>
+
+    <insert id="insertWrjGj" parameterType="Visualizaiton_UAV">
+        insert into t_u_uav
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">id,</if>
+            <if test="LATITUDE != null">latitude,</if>
+            <if test="LONGITUDE != null">longitude,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="LATITUDE != null">#{LATITUDE},</if>
+            <if test="LONGITUDE != null">#{LONGITUDE},</if>
+        </trim>
+    </insert>
+    <select id="getWrjGjs" resultMap="Visualizaiton_UAV">
+        SELECT
+            ID,
+            LATITUDE,
+            LONGITUDE
+        FROM
+            T_U_UAV
+        ORDER BY
+            CREATE_TIME ASC
+    </select>
+    <delete id="deleteWrjGjs">
+        delete from T_U_UAV;
+    </delete>
 </mapper>

BIN
mybusiness/src/main/resources/static/visualization/images/wrj.gif


+ 6 - 0
mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -282,6 +282,12 @@
     <!--<a class="a_txt">设置障碍点</a>-->
     <!--</div>-->
     <!--</div>-->
+    <div class="nav lz">
+    <div class="n_div" url="getVisualizationFrame_WRJGJ">
+    <a class="a_img"></a>
+    <a class="a_txt">无人机轨迹</a>
+    </div>
+    </div>
 
 </div>
 <!--	导航  结束-->

+ 68 - 0
mybusiness/src/main/resources/templates/business/visualization/map.html

@@ -1454,6 +1454,74 @@
         });
     }
 
+    function SetupWrjGj(boo){
+        if(boo){
+            map.on('click', setGj);
+        }else{
+            map.off('click', setGj);
+        }
+    }
+    function setGj(e){
+        $.post("[[@{/visualization/event/insertWrjGj}]]",{
+            latitude:e.latlng.lat,
+            longitude:e.latlng.lng
+        },function(data){
+            draw_wrjGj(data);
+            parent.$("#qt_iframe")[0].contentWindow.refresh();
+        });
+    }
+    function getGjs(){
+        $.post("[[@{/visualization/event/getWrjGjs}]]",function(data){
+            draw_wrjGj(data);
+        });
+    }
+
+    function draw_wrjGj(data){
+        if(data.length == 0) return;
+        resultLayer.clearLayers();
+        let trajectoryArray = new Array();
+        for(let i=0;i<data.length;i++){
+            let lineArray = data[i];
+            let json  = [lineArray.latitude,lineArray.longitude];
+            trajectoryArray.push(json);
+        }
+        draw_trajectoryLine(trajectoryArray);
+        let json = {
+            latitude:data[data.length-1].latitude,
+            longitude:data[data.length-1].longitude
+        };
+        wrjMarker(json);
+    }
+
+    //画线
+    function draw_trajectoryLine(array){
+        let polylineName = "polyline";
+        polylineName = L.polyline(array, {color: '#2E9AFE',weight:6});
+        resultLayer.addLayer(polylineName);
+        polylineName.on("mousemove", function () {
+            polylineName.setStyle({color: 'green',weight:12});
+        });
+        polylineName.on("mouseout", function () {
+            polylineName.setStyle({color: '#2E9AFE',weight:6});
+        });
+    }
+
+    function wrjMarker(option){//无人机
+        let iconUrl = '[[@{/visualization/images/wrj.gif}]]';
+        let icon = L.icon({
+            iconUrl: iconUrl,
+            iconSize: [65, 67],
+            iconAnchor: [37, 57]
+        });
+        let markName="wrjMarker";
+        markName = L.marker(
+            [option.latitude , option.longitude],
+            {icon: icon}
+        );
+        resultLayer.addLayer(markName);
+    }
+
+
     function SetupRoadblocks(boo){
         if(boo){
             map.on('click', onClick);

+ 16 - 20
mybusiness/src/main/resources/templates/business/visualization/wrjgj.html

@@ -15,27 +15,14 @@
     <h3>无人机轨迹管理</h3>
 </div>
 <div class="right_btn">
-    <a class="btn_blue" th:onclick="SetupRoadblocks(true)">设置轨迹</a>
-    <a class="btn_red" th:onclick="SetupRoadblocks(false)">结束设置</a>
-    <a class="btn_red" th:onclick="SetupRoadblocks(false)">清空轨迹</a>
+    <a class="btn_blue" th:onclick="SetupWrjGj(true)">设置轨迹</a>
+    <a class="btn_red" th:onclick="SetupWrjGj(false)">结束设置</a>
+    <a class="btn_red" th:onclick="deleteWrjGjs()">清空轨迹</a>
 </div>
 <div style="overflow-y: scroll;height:650px;">
     <ul class="zhly_list2">
-        <li>
-            <a><i>编号</i>无人机无人机</a>
-            <span></span>
-        </li>
-        <li>
-            <a><i>编号</i>无人机无人机</a>
-            <span></span>
-        </li>
-        <li>
-            <a><i>编号</i>无人机无人机</a>
-            <span></span>
-        </li>
-        <li>
-            <a><i>编号</i>无人机无人机</a>
-            <span></span>
+        <li th:each="gjs : ${wrjGjs}">
+            <a><i>巡查点</i>坐标:[[${#strings.substring(gjs.LATITUDE,0,5)}]],[[${#strings.substring(gjs.LONGITUDE,0,6)}]]</a>
         </li>
     </ul>
 </div>
@@ -57,9 +44,18 @@
 <script>
     $(function(){
         parent.$("#map")[0].contentWindow.clearLayers();
+        parent.$("#map")[0].contentWindow.getGjs();
     });
-    function SetupRoadblocks(boo){
-        parent.$("#map")[0].contentWindow.SetupRoadblocks(boo);
+    function SetupWrjGj(boo){
+        parent.$("#map")[0].contentWindow.SetupWrjGj(boo);
+    }
+    function refresh(){
+        location.href="[[@{/visualization/event/getVisualizationFrame_WRJGJ}]]";
+    }
+    function deleteWrjGjs(){
+        $.post("[[@{/visualization/event/deleteWrjGjs}]]");
+        $(".zhly_list2").html("");
+        parent.$("#map")[0].contentWindow.clearLayers();
     }
 </script>
 <!--  右侧内容  结束-->