пре 4 година · 07ec720205
--- a/leiSP-admin/src/main/resources/application-druid.yml
+++ b/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
			
 
				 
			
 
				 
			
 
				 
			
--- a/leiSP-admin/src/main/resources/application.yml
+++ b/leiSP-admin/src/main/resources/application.yml
@@ -10,6 +10,7 @@ leisp:
 
				   demoEnabled: true
			
 
				   # 文件路径 示例（ Windows配置D:/leisp/uploadPath，Linux配置 /home/leisp/uploadPath）
			
 
				   profile: /home/soft/temp/
			
 
				+#  profile: D:/leisp/uploadPath
			
 
				 #  profile: /home/leisp/uploadPath
			
 
				   #profile : f:/
			
 
				   # 获取ip地址开关
			
--- a/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java
+++ b/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java
@@ -175,6 +175,8 @@ public class TUEventFireServiceImpl implements ITUEventFireService {
 
				             notice.setNoticeType("3");//1通知 2公告  //3-确认事件消息
			
 
				             notice.setEventId(eventId);
			
 
				             notice.setReserveplanType(reserveplan_type);
			
 
				+            notice.setGlobalUserIds(user.getUserId().toString());
			
 
				+            notice.setIsGroupNotice("1");//群发模式 不插入扩展表
			
 
				             noticeService.insertNotice(notice);
			
 
				 
			
 
				             //手机推送
			
--- a/mybusiness/src/main/resources/templates/business/manager/firemanager/historyFire.html
+++ b/mybusiness/src/main/resources/templates/business/manager/firemanager/historyFire.html
@@ -4,6 +4,11 @@
 
				 <head>
			
 
				     <th:block th:include="include :: header('【事件信息(历史火情)】列表')"/>
			
 
				     <script th:src="@{/visualization/superMap/examples/js/include-web.js}"></script>
			
 
				+    <style>
			
 
				+        .leaflet-bottom{
			
 
				+            display: none;
			
 
				+        }
			
 
				+    </style>
			
 
				 </head>
			
 
				 <body class="gray-bg">
			
 
				     <div class="container-div">
			
@@ -113,5 +118,6 @@
 
				         }
			
 
				     </script>
			
 
				 
			
 
				+
			
 
				 </body>
			
 
				 </html>
			
--- a/mybusiness/src/main/resources/templates/business/visualization/confirm1.html
+++ b/mybusiness/src/main/resources/templates/business/visualization/confirm1.html
@@ -1,19 +1,23 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
			
 
				 <head>
			
 
				-    <th:block th:include="include :: header('消息通知选择用户')" />
			
 
				-    <th:block th:include="include :: bootstrap-duallistbox-css" />
			
 
				+    <th:block th:include="include :: header('消息通知选择用户')"/>
			
 
				+    <th:block th:include="include :: bootstrap-duallistbox-css"/>
			
 
				     <style>
			
 
				-        .ksh-ul .tzff  span{
			
 
				+        .ksh-ul .tzff span {
			
 
				             display: inline-block;
			
 
				             position: relative;
			
 
				             top: -2px;
			
 
				             left: 2px;
			
 
				         }
			
 
				-        .ksh-ul .tzff  input{
			
 
				+
			
 
				+        .ksh-ul .tzff input {
			
 
				             margin-left: 10px;
			
 
				         }
			
 
				-        .tzff{padding-top:4px }
			
 
				+
			
 
				+        .tzff {
			
 
				+            padding-top: 4px
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -25,7 +29,9 @@
 
				                 <div class="ibox-content">
			
 
				                     <form id="form" action="#" class="wizard-big">
			
 
				                         <select id="selectorx" class="form-control dual_select" multiple>
			
 
				-                            <option th:each="user : ${userList}" th:value="${user.userId}">[[${user.dept.deptName}]]：[[${user.userName}]]（[[${user.phonenumber}]]）</option>
			
 
				+                            <option th:each="user : ${userList}" th:value="${user.userId}">
			
 
				+                                [[${user.dept.deptName}]]：[[${user.userName}]]（[[${user.phonenumber}]]）
			
 
				+                            </option>
			
 
				                         </select>
			
 
				                     </form>
			
 
				                 </div>
			
@@ -33,8 +39,8 @@
 
				         </div>
			
 
				     </div>
			
 
				 </div>
			
 
				-<th:block th:include="include :: footer" />
			
 
				-<th:block th:include="include :: bootstrap-duallistbox-js" />
			
 
				+<th:block th:include="include :: footer"/>
			
 
				+<th:block th:include="include :: bootstrap-duallistbox-js"/>
			
 
				 <script th:inline="javascript">
			
 
				 
			
 
				     $('.dual_select').bootstrapDualListbox({
			
@@ -49,7 +55,7 @@
 
				         removeAllLabel: '移除所有',
			
 
				         infoText: '共{0}个',
			
 
				         showFilterInputs: true,       // 是否带搜索
			
 
				-        selectorMinimalHeight: $(document).height()/2
			
 
				+        selectorMinimalHeight: $(document).height() / 2
			
 
				     });
			
 
				 
			
 
				 </script>
			
--- a/mybusiness/src/main/resources/templates/business/visualization/measure.html
+++ b/mybusiness/src/main/resources/templates/business/visualization/measure.html
@@ -5,6 +5,11 @@
 
				     <meta charset="UTF-8">
			
 
				     <title data-i18n="resources.title_measureDistance"></title>
			
 
				     <script th:src="@{/visualization/superMap/examples/js/include-web.js}"></script>
			
 
				+    <style>
			
 
				+        .leaflet-bottom{
			
 
				+            display: none;
			
 
				+        }
			
 
				+    </style>
			
 
				 </head>
			
 
				 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
			
 
				 <button onclick="addMark()">打点</button>
			
@@ -19,9 +24,9 @@
 
				     map = L.map('map', {
			
 
				         preferCanvas: true,
			
 
				         crs: L.CRS.EPSG4326,
			
 
				-        center: [43.15, 124.78],
			
 
				-        maxZoom: 10,
			
 
				-        zoom: 10
			
 
				+        center: [43.10, 124.60],
			
 
				+        maxZoom: 15,
			
 
				+        zoom: 10.5
			
 
				     });
			
 
				     L.supermap.tiledMapLayer(url).addTo(map);
			
 
				     resultLayer = L.featureGroup().addTo(map);
			
--- a/mybusiness/src/main/resources/templates/business/visualization/measure_size.html
+++ b/mybusiness/src/main/resources/templates/business/visualization/measure_size.html
@@ -6,6 +6,11 @@
 
				     <title data-i18n="resources.title_measureDistance"></title>
			
 
				     <script th:src="@{/visualization/superMap/examples/js/include-web.js}"></script>
			
 
				     <script type="text/javascript" th:src="@{/dist/ol/include-ol.js}"></script>
			
 
				+    <style>
			
 
				+        .leaflet-bottom{
			
 
				+            display: none;
			
 
				+        }
			
 
				+    </style>
			
 
				 </head>
			
 
				 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%; position: absolute;top: 0;">
			
 
				 <div id="map" style="width: 100%;height:100%"></div>
			
@@ -18,8 +23,8 @@
 
				             .extend([new ol.supermap.control.Logo()]),
			
 
				         view: new ol.View({
			
 
				             //center: [43.15, 124.78],
			
 
				-            center: [124.78, 43.15],
			
 
				-            zoom: 10,
			
 
				+            center: [43.10, 124.60],
			
 
				+            zoom: 10.5,
			
 
				             projection: 'EPSG:4326',
			
 
				             multiWorld: true
			
 
				         })
			
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 
				 <?xml version="1.0" encoding="UTF-8"?>
			
 
				 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
			
 
				-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				     <groupId>com.leisp</groupId>
			
@@ -212,18 +212,6 @@
 
				             </dependency>
			
 
				 
			
 
				 
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				         </dependencies>
			
 
				     </dependencyManagement>
			
 
				 
			
@@ -238,17 +226,28 @@
 
				     </modules>
			
 
				 
			
 
				 
			
 
				-
			
 
				     <!--<dependencies>-->
			
 
				-        <!--&lt;!&ndash;因配置外部TOMCAT 而配置&ndash;&gt;-->
			
 
				-        <!--<dependency>-->
			
 
				-            <!--<groupId>org.springframework.boot</groupId>-->
			
 
				-            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
			
 
				-            <!--<scope>provided</scope>-->
			
 
				-        <!--</dependency>-->
			
 
				+    <!--&lt;!&ndash;因配置外部TOMCAT 而配置&ndash;&gt;-->
			
 
				+    <!--<dependency>-->
			
 
				+    <!--<groupId>org.springframework.boot</groupId>-->
			
 
				+    <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
			
 
				+    <!--<scope>provided</scope>-->
			
 
				+    <!--</dependency>-->
			
 
				     <!--</dependencies>-->
			
 
				 
			
 
				     <build>
			
 
				+
			
 
				+        <resources>
			
 
				+            <resource>
			
 
				+                <directory>src/main/resources</directory>
			
 
				+                <includes>
			
 
				+                    <!--包含文件夹以及子文件夹下所有资源-->
			
 
				+                    <include>**/*.*</include>
			
 
				+                </includes>
			
 
				+            </resource>
			
 
				+        </resources>
			
 
				+
			
 
				+
			
 
				         <plugins>
			
 
				             <plugin>
			
 
				                 <groupId>org.apache.maven.plugins</groupId>
			
@@ -263,8 +262,8 @@
 
				 
			
 
				             <!--孙一石 注释 打包问题-->
			
 
				             <!--<plugin>-->
			
 
				-                <!--<groupId>org.springframework.boot</groupId>-->
			
 
				-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
			
 
				+            <!--<groupId>org.springframework.boot</groupId>-->
			
 
				+            <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
			
 
				             <!--</plugin>-->
			
 
				             <plugin>
			
 
				                 <groupId>org.apache.maven.plugins</groupId>
			
@@ -275,9 +274,6 @@
 
				             </plugin>
			
 
				 
			
 
				 
			
 
				-
			
 
				-
			
 
				-
			
 
				         </plugins>
			
 
				     </build>