Merge remote-tracking branch 'origin/master'

leiSP-admin/src/main/resources/application-druid.yml

@@ -9,18 +9,18 @@ spring:
 #                url: jdbc:mysql://192.168.100.11:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 
 
-#                url: jdbc:mysql://192.168.100.11:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: senlinfanghuo
-#                password: slfh123456
+                url: jdbc:mysql://192.168.100.11:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: senlinfanghuo
+                password: slfh123456
 
 #                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: senlinfanghuo
 #                password: slfh123456
 
 
-                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: sjkj
-                password: sjkj123456
+#                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: sjkj
+#                password: sjkj123456
 
 
 

mybusiness/src/main/java/com/business/slfh/visualization/event/domain/Visualization_User.java

@@ -18,4 +18,5 @@ public class Visualization_User extends BaseEntity {
     private String LATITUDE;
     private String LONGITUDE;
     private String USER_DEPTID;
+    private String AVATAR;
 }

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

@@ -181,6 +181,7 @@
         <result property="OLSTATUS" column="OLSTATUS"/>
         <result property="LATITUDE" column="LATITUDE"/>
         <result property="LONGITUDE" column="LONGITUDE"/>
+        <result property="AVATAR" column="AVATAR"/>
     </resultMap>
 
     <resultMap id="Visualization_Plan" type="Visualization_Plan">
@@ -790,6 +791,8 @@
             U.PHONENUMBER,
             U.STATUS,
             U.CREATE_TIME,
+        U.AVATAR,
+
 --             IF(OL.STATUS='ON_LINE',"1","0") OLSTATUS
             IF(u.login_date > date_add(now(), interval -3 minute),"1","0") OLSTATUS
         FROM SYS_USER U

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

@@ -263,12 +263,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 class="nav lz">-->
+    <!--<div class="n_div" url="getVisualizationFrame_LZ">-->
+    <!--<a class="a_img"></a>-->
+    <!--<a class="a_txt">设置障碍点</a>-->
+    <!--</div>-->
+    <!--</div>-->
 
 </div>
 <!--	导航  结束-->
@@ -327,73 +327,4 @@
         $("#map")[0].contentWindow.pushData($(this));
     });
 </script>
-
-<!--<script type="text/javascript" include="bootstrap,jquery,widgets.alert" src="http://218.27.1.157:8090/iserver/iClient/forJavaScript/examples/js/include-web.js"></script>-->
-<script type="text/javascript" include="bootstrap,jquery,widgets.alert" th:src="@{/visualization/superMap/examples/js/include-web.js}"></script>
-<!--<script type="text/javascript" include="draw" src="http://218.27.1.157:8090/iserver/iClient/forJavaScript/dist/mapboxgl/include-mapboxgl.js"></script>-->
-<script type="text/javascript" include="draw" th:src="@{/visualization/superMap/dists/mapboxgl/include-mapboxgl.js}"></script>
-<script type="text/javascript">
-    var host = window.isLocal ? window.server : "https://iserver.supermap.io";
-    var url = host + "/iserver/services/map-world/rest/maps/World";
-    var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
-        "with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
-        " Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
-
-    var map = new mapboxgl.Map({
-        container: 'map',
-        style: {
-            "version": 8,
-            "sources": {
-                "raster-tiles": {
-                    "attribution": attribution,
-                    "type": "raster",
-                    "tiles": [host + '/iserver/services/maps/rest/maps/World/zxyTileImage.png?prjCoordSys={"epsgCode":3857}&z={z}&x={x}&y={y}'],
-                    "tileSize": 256,
-                },
-            },
-            "layers": [{
-                "id": "simple-tiles",
-                "type": "raster",
-                "source": "raster-tiles",
-                "minzoom": 0,
-                "maxzoom": 22
-            }],
-        },
-        center: [0, 0],
-        maxZoom: 18,
-        zoom: 3
-    });
-    map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
-    map.addControl(new mapboxgl.NavigationControl(), 'top-left');
-
-    var draw = new MapboxDraw({
-        displayControlsDefault: false,
-        controls: {
-            line_string: true,
-            trash: true
-        }
-    });
-
-    map.addControl(draw, "top-left");
-
-    function measureDistance(e) {
-        if (!e.features) {
-            widgets.alert.showAlert(resources.msg_noDataRedraw, false);
-        }
-        var param = new SuperMap.MeasureParameters(e.features[0]);
-        new mapboxgl.supermap.MeasureService(url).measureDistance(param, function (serviceResult) {
-            var distance = serviceResult.result.distance;
-            widgets.alert.showAlert(distance + resources.msg_m, true);
-        });
-    }
-
-    function removeMsg() {
-        $('#msg_container').remove();
-    }
-
-    map.on('draw.create', measureDistance);
-    map.on('draw.delete', removeMsg);
-
-
-</script>
 </html>

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

@@ -65,7 +65,7 @@
     <ul class="zhly_list3">
         <li th:each="user : ${visualization_users}" th:onclick="draw_trajectoryLine([[${user.USER_ID}]],[[${user.USER_NAME}]],[[${user.PHONENUMBER}]])">
             <div class="list_xl clearfix">
-                <a class="list_img fl"><img th:src="@{/visualization/images/zhly_77.png}"/></a>
+                <a class="list_img fl"><img th:src="${user.AVATAR}"/></a>
                 <div class="list_txt fl">
                     <p><b>登录名：</b><i>[[${user.LOGIN_NAME}]]</i></p>
                     <p><b>用户名称：</b><i>[[${user.USER_NAME}]]</i></p>
@@ -162,4 +162,4 @@
         $("#treeName").val("");
     }
 </script>
-</html>
+</html>