1

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

@@ -9,11 +9,11 @@ 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
+                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
+#                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: senlinfanghuo
 #                password: slfh123456
 

leiSP-admin/src/main/resources/templates/login.html

@@ -15,6 +15,37 @@
     <img src="../static/syslogin/lydl_2.png" th:src="@{/syslogin/lydl_2.png}"/>
 </div>
 <div class="dl_con">
+    <div style="position: absolute;top: 200px; left: 50px; font-size:20px; color: #ffffff">
+        六大系统模块<br>
+        <ul>
+            <li>1、森林防火监控系统</li>
+            <li>2、病虫害智能监控系统</li>
+            <li>3、乱砍乱伐智能监控系统</li>
+            <li>4、偷砂采石智能监控系统</li>
+            <li>5、毁林偷盗智能监控系统</li>
+            <li>6、APP移动监控系统</li>
+        </ul>
+        <br><br>
+        智能技术
+        <ul>
+            <li>1、摄像头自动巡航、实时抓拍</li>
+            <li>2、警戒头高清抓拍</li>
+            <li>3、历史画面存储、历史记录追查</li>
+            <li>4、可视化平台直观操作实时处理</li>
+            <li>5、现场画面实时回传</li>
+            <li>6、预案智能分析</li>
+            <li>7、大数据分析总结</li>
+        </ul>
+        <br><br>
+        主要技术
+        <ul>
+            <li>前端:bootstrap+vue</li>
+            <li>后端:springboot+mybatis</li>
+            <li>数据库及缓存: redis+mysql</li>
+            <li>操作系统:centos7</li>
+            <li>web中间件:tomcat</li>
+        </ul>
+    </div>
     <form id="signupForm" autocomplete="off">
         <div class="name_div">
             <i><img src="../static/syslogin/lydl_4.png" th:src="@{/syslogin/lydl_4.png}"/></i>

leiSP-common/src/main/java/com/sooka/common/utils/file/FileUploadUtils.java

@@ -16,7 +16,7 @@ import com.sooka.common.utils.uuid.IdUtils;
 
 /**
  * 文件上传工具类
- * 
+ *
  * @author lei_wang
  */
 public class FileUploadUtils
@@ -24,7 +24,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 500 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100
@@ -216,7 +216,7 @@ public class FileUploadUtils
 
     /**
      * 获取文件名的后缀
-     * 
+     *
      * @param file 表单文件
      * @return 后缀名
      */
@@ -229,4 +229,4 @@ public class FileUploadUtils
         }
         return extension;
     }
-}
+}

mybusiness/src/main/java/com/business/slfh/app/mainpage/domain/MainPageVO.java

@@ -1,11 +1,12 @@
 package com.business.slfh.app.mainpage.domain;
 
+import com.sooka.common.core.domain.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class MainPageVO {
+public class MainPageVO extends BaseEntity {
 
 
     Long userId;

mybusiness/src/main/java/com/business/slfh/app/mainpage/service/impl/AppMainPageServiceImpl.java

@@ -136,7 +136,8 @@ public class AppMainPageServiceImpl extends AppBaseService implements AppMainPag
             AppEventQueryVo appEventQueryVo =new AppEventQueryVo();
             appEventQueryVo.setUserId(mainPageVO.getUserId());
             appEventQueryVo.setDepts(depts);
-            List ls = appEventMapper.queryAllEventList(appEventQueryVo);
+            List ls = appEventMapper.queryAllEventList(appEventQueryVo).subList(0,5);
+
             appDataModel.data.put("eventlist",ls);
 
             BigData_Inspection_TodayWindPower today_info = bigData_Inspection_Mapper.selectTodayWindPower();

mybusiness/src/main/resources/mapper/grid/app/AppEventMapper.xml

@@ -94,7 +94,6 @@
         ${params.dataScope}
         order by
         s.event_status asc,s.create_time desc
-        limit 50
     </select>
 
 

mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html

@@ -183,8 +183,8 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goCamera(\'' + row.hikIp + '\',\'' + row.hikPort + '\',\'' + row.hikUsername + '\',\'' + row.hikPassword + '\',\'' + row.hikDeviceport + '\')"><i class="fa fa-edit"></i>显示画面</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goCamera(\'' + row.hikIp + '\',\'' + row.hikPort + '\',\'' + row.hikUsername + '\',\'' + row.hikPassword + '\',\'' + row.hikDeviceport + '\',\'' + row.hikCameraId + '\')"><i class="fa fa-edit"></i>显示画面</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goCamera(\'' + row.hikIp + '\',\'' + row.hikPort + '\',\'' + row.hikUsername + '\',\'' + row.hikPassword + '\',\'' + row.hikDeviceport + '\')"><i class="fa fa-edit"></i>显示画面</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goCamera(\'' + row.hikIp + '\',\'' + row.hikPort + '\',\'' + row.hikUsername + '\',\'' + row.hikPassword + '\',\'' + row.hikDeviceport + '\',\'' + row.hikCameraId + '\')"><i class="fa fa-edit"></i>显示画面</a> ');
                         //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goFireVideo(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看录像</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="goHistory(\'' + row.hikCameraId + '\')"><i class="fa fa-edit"></i>历史回放</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
@@ -198,8 +198,8 @@
 
     //function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){//展示画面
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport,hik_cameraid){//展示画面
-        window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+hik_cameraid)
-        //$.post('http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport,{});
+        // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+hik_cameraid)
+        $.post('http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport,{});
     }
 
     function goHistory(hikCameraId){//历史回放

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

@@ -8,6 +8,9 @@
 </head>
 <body style=" margin: 0;overflow: hidden;background: #000033;width: 100%;height:100%;position: absolute;top: 0;">
 <label id="distanceLength"></label>
+<div style="z-index: 9999999; position: absolute;left: 50%;top: 25%;color: #FFFFFF;">
+    <image th:src="@{/visualization/images/wrj.gif}"></image>
+</div>
 <div id="map" style="margin:0 auto;width: 100%;height: 100%;background: none;"></div>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:src="@{/js/bootstrap.min.js}"></script>
@@ -356,9 +359,9 @@
                 {
                     towerId:option.id
                 },function(res){
-                    window.open('/business/manager/hikcameracontroller/demo_window_simple_preview')
-                    // $.post('http://localhost:8899/camera_id='+res.hikIp+","+res.hikPort+","+
-                    //     res.hikUsername+","+res.hikPassword+","+res.hikDeviceport,{});
+                    // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview')
+                    $.post('http://localhost:8899/camera_id='+res.hikIp+","+res.hikPort+","+
+                        res.hikUsername+","+res.hikPassword+","+res.hikDeviceport,{});
                 }
             );
         });
@@ -370,7 +373,8 @@
     function sxtMarker(option,func){
         var iconUrl = '[[@{/visualization/images/lwt-ho.gif}]]';
         var title = '摄像头';
-        if(option.model == '警戒头'){
+        console.log("*********",option.model)
+        if(option.model == '卡口警戒头'){
             title = '警戒头';
             iconUrl = '[[@{/visualization/images/lwt-hd.gif}]]';
         }
@@ -408,8 +412,9 @@
         });
 
         markName.on("click", function(){
-            //goCamera(option.hik_ip,option.hik_port,option.hik_username,option.hik_password,option.hik_deviceport);
-            window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+option.hik_camera_id)
+            $.post('http://localhost:8899/camera_id='+option.hik_ip+","+option.hik_port+","+option.hik_username+","+option.hik_password+","+option.hik_deviceport,{});
+            // goCamera(option.hik_ip,option.hik_port,option.hik_username,option.hik_password,option.hik_deviceport);
+            // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+option.hik_camera_id)
 
         });
         func(true);
@@ -1449,7 +1454,7 @@
 
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){
         $.post("[[@{/visualization/event/getRoleMenu}]]",function(e){
-            window.open('/business/manager/hikcameracontroller/demo_window_simple_preview')
+            // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview')
             // var url = 'http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport;
             // if(e == 0){
             //     url+=",no_controll";

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

@@ -14,12 +14,12 @@
 <div class="zhly_tit">
     <h3>森林资源管理</h3>
 </div>
-<h1 class="sl_ztit">林地总面积：[[${Visualization_Forest_Count.SIZE}]]平方米</h1>
+<h1 class="sl_ztit">林地总面积：[[${Visualization_Forest_Count.SIZE}]]面积/公顷</h1>
 <div class="sxt_4 clearfix">
     <div class="lz sxt_div">
         <i></i>
         <p>林种</p>
-        <h4><span>[[${Visualization_Forest_Count.LZ}]]</span>个</h4>
+        <h4><span>[[${Visualization_Forest_Count.LZ}]]</span>种</h4>
     </div>
     <div class="sz sxt_div">
         <i></i>
@@ -31,16 +31,16 @@
         <p>立木蓄积</p>
         <h4><span>[[${Visualization_Forest_Count.LMJX}]]</span>个</h4>
     </div>
-    <div class="ylzs sxt_div">
-        <i></i>
-        <p>幼林株数</p>
-        <h4><span>[[${Visualization_Forest_Count.YLZS}]]</span>个</h4>
-    </div>
+    <!--<div class="ylzs sxt_div">-->
+        <!--<i></i>-->
+        <!--<p>幼林株数</p>-->
+        <!--<h4><span>[[${Visualization_Forest_Count.YLZS}]]</span>个</h4>-->
+    <!--</div>-->
 </div>
 
 
 <!--林斑信息-->
-<h1 class="sl_ztit">林斑信息</h1>
+<h1 class="sl_ztit">林班信息</h1>
 <div class="list_xl clearfix" style="display: block;">
     <div class="list_txt_fo fl" id="forestMessage">
     </div>
@@ -107,4 +107,4 @@
 </script>
 <!--  右侧内容  结束-->
 </body>
-</html>
+</html>