Merge remote-tracking branch 'origin/master'

mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java

@@ -303,11 +303,11 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
         String alarmSourceName = infoJson.getString("alarmSourceName");
         Date alarmDate = new Date(infoJson.getLong("alarmDate") * 1000L);
 
-        JSONArray pictures = JSON.parseArray(alarmPicture);
-        String alarmPictures[] = new String[pictures.size()];
-        for (int i = 0; i < alarmPictures.length; i++) {
-            alarmPictures[i] = pictures.get(i).toString();
-        }
+//        JSONArray pictures = JSON.parseArray(alarmPicture);
+//        String alarmPictures[] = new String[pictures.size()];
+//        for (int i = 0; i < alarmPictures.length; i++) {
+//            alarmPictures[i] = pictures.get(i).toString();
+//        }
 
         if (alarmType != null && (alarmType.equals("5122") || alarmType.equals("5131") || alarmType.equals("302")) && !gpsX.equals("0.000000")) {
 //        if (alarmType != null && (alarmType.equals("5131")) && !gpsX.equals("0.000000")) {
@@ -316,7 +316,7 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
             System.out.println("fireDistance:" + fireDistance);
             System.out.println("deviceCode:" + deviceCode);
             System.out.println("alarmCode:" + alarmCode);
-            System.out.println("alarmPicture:" + alarmPictures);
+//            System.out.println("alarmPicture:" + alarmPictures);
             System.out.println("alarmDate:" + alarmDate);
             System.out.println("alarmType:" + alarmType);
             System.out.println("alarmSourceName:" + alarmSourceName);
@@ -378,8 +378,11 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
 
             String eid = UUID_Tools.getUUID();
             tUEventFire.setId(eid);//事件ID
-
-            for (String s : alarmPictures) {
+            JSONObject jso = JSON.parseObject(al);
+            String pics = JSON.parseObject(jso.getJSONObject("data").getJSONArray("alarms").get(0).toString()).getString("picture");
+            String[] p = pics.split(";");
+            //查询图片
+            for (String s : p) {
                 TResAttach t = new TResAttach();
                 t.setId(UUID.fastUUID().toString());
                 t.setBusId(eid);
@@ -388,11 +391,11 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
             }
 
             saveFire(tUEventFire, null);
-//            TResAttach tResAttach = new TResAttach();
-//            tResAttach.setId(UUID.fastUUID().toString());
-//            tResAttach.setBusId(eid);
-//            tResAttach.setResUrl(alarmPictures[1]);
-//            itResAttachService.insertTResAttach(tResAttach);
+            TResAttach tResAttach = new TResAttach();
+            tResAttach.setId(UUID.fastUUID().toString());
+            tResAttach.setBusId(eid);
+            tResAttach.setResUrl(p[0]);
+            itResAttachService.insertTResAttach(tResAttach);
 
 
 //默认一个处理过程 - 孙一石 2021-11-08
@@ -414,12 +417,12 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
 
             tuEventprocessMapper.insertTUEventprocess(tuEventprocess);
 
-            //添加附件
-            TResAttach att = new TResAttach();
-            att.setId(UUID.fastUUID().toString());
-            att.setBusId(processid);
-            att.setResUrl(alarmPictures[1]);
-            itResAttachService.insertTResAttach(att);
+            //添加附件(右侧过程的图)
+//            TResAttach att = new TResAttach();
+//            att.setId(UUID.fastUUID().toString());
+//            att.setBusId(processid);
+//            att.setResUrl(p[0]);
+//            itResAttachService.insertTResAttach(att);
 
 
             new Thread(new Runnable() {

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

@@ -51,7 +51,8 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
 
     @Override
     public int Visualization_Camera_Count() {
-        return Visualization_Event_Mapper.Visualization_Camera_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
+        String dept_id = userInfoUtil.getLoginUserInfo().getDeptId().toString();
+        return Visualization_Event_Mapper.Visualization_Camera_Count(dept_id);
     }
 
     @Override

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

@@ -723,6 +723,7 @@
         <if test="REMARK != null and REMARK != ''">
             AND DEPT_ID = '${REMARK}'
         </if>
+        order by seq asc
     </select>
 
     <select id="getNearestCamera" resultMap="Visualization_Camera">

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

@@ -8,12 +8,7 @@
     <form class="form-horizontal m" id="form-camera-add">
         <input name="deptId" type="hidden" id="deptTreeId"/>
         <input name="orgDeptId" type="hidden" id="orgTreeId"/>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">排序：</label>
-            <div class="col-sm-8">
-                <input maxlength="100" name="seq" value="0" class="form-control" type="text" required>
-            </div>
-        </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label">名称：</label>
             <div class="col-sm-8">
@@ -42,7 +37,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">海康摄像头ID：</label>
+            <label class="col-sm-3 control-label">大华摄像头ID：</label>
             <div class="col-sm-8">
                 <input maxlength="100" name="hikCameraId" class="form-control" type="text" required>
             </div>
@@ -119,6 +114,12 @@
                        placeholder="请选择归属林场部门" class="form-control" readonly>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">排序：</label>
+            <div class="col-sm-8">
+                <input maxlength="100" name="seq" value="0" class="form-control" type="text" required>
+            </div>
+        </div>
     </form>
 </div>
 <th:block th:include="include :: footer"/>

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

@@ -9,12 +9,7 @@
         <input name="id" th:field="*{id}" type="hidden">
         <input name="deptId" th:field="*{deptId}" type="hidden" id="deptTreeId"/>
         <input name="orgDeptId" th:field="*{orgDeptId}" type="hidden" id="orgTreeId"/>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">排序：</label>
-            <div class="col-sm-8">
-                <input maxlength="100" name="seq" th:field="*{seq}" class="form-control" type="text" required>
-            </div>
-        </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label">名称：</label>
             <div class="col-sm-8">
@@ -52,7 +47,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">海康摄像头ID：</label>
+            <label class="col-sm-3 control-label">大华像头ID：</label>
             <div class="col-sm-8">
                 <input maxlength="100" name="hikCameraId" th:field="*{hikCameraId}" class="form-control" type="text"
                        required>
@@ -135,6 +130,12 @@
                        placeholder="请选择归属林场部门" class="form-control" readonly>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">排序：</label>
+            <div class="col-sm-8">
+                <input maxlength="100" name="seq" th:field="*{seq}" class="form-control" type="text" required>
+            </div>
+        </div>
     </form>
 </div>
 <th:block th:include="include :: footer"/>

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

@@ -106,6 +106,8 @@
     var prefix = ctx + "business/manager/policiesmanager";
 
     $(function () {
+        console.log("p url==",prefix + "/list")
+
         var options = {
             url: prefix + "/list",
             createUrl: prefix + "/add",

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

@@ -1,77 +1,83 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('【取水口管理】列表')" />
+    <th:block th:include="include :: header('【取水口管理】列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>名称：</label>
-                                <input type="text" name="name"/>
-                            </li>
-                            <li>
-                                <label>联系人：</label>
-                                <input type="text" name="contactUser"/>
-                            </li>
-                            <li>
-                                <label>电话：</label>
-                                <input type="text" name="contactPhone"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>名称：</label>
+                            <input type="text" name="name"/>
+                        </li>
+                        <li>
+                            <label>联系人：</label>
+                            <input type="text" name="contactUser"/>
+                        </li>
+                        <li>
+                            <label>电话：</label>
+                            <input type="text" name="contactPhone"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="waterintake:waterintake:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="waterintake:waterintake:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="waterintake:waterintake:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <input style="display: none" type="file" name="file" id="fileField" onchange="importExcel(document.getElementById('fileField').value)">
-                <a class="btn btn-warning" shiro:hasPermission="system:forestdevice:export" onclick="fileField.click()">
-                    <i class="fa fa-download"></i> 导入
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="waterintake:waterintake:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="waterintake:waterintake:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="waterintake:waterintake:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <input style="display: none" type="file" name="file" id="fileField"
+                   onchange="importExcel(document.getElementById('fileField').value)">
+            <a class="btn btn-warning" shiro:hasPermission="system:forestdevice:export" onclick="fileField.click()">
+                <i class="fa fa-download"></i> 导入
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('waterintake:waterintake:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('waterintake:waterintake:remove')}]];
-        var prefix = ctx + "/business/manager/waterintake";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('waterintake:waterintake:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('waterintake:waterintake:remove')}]];
+    var prefix = ctx + "business/manager/waterintake";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "【取水口管理】",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        console.log("w url==",prefix + "/list")
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "【取水口管理】",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: 'ID',
-                    visible:false
+                    visible: false
                 },
                 {
                     field: 'name',
@@ -100,47 +106,47 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         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> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
+        };
+        $.table.init(options);
+    });
 
-        function importExcel(filename) {
-            String.prototype.endWith=function(endStr){
-                var d=this.length-endStr.length;
-                return (d>=0&&this.lastIndexOf(endStr)==d)
-            }
-            if(!filename.endWith(".xls")){
-                $.modal.alert("请上传.xls文件！")
-                setTimeout("window.location.reload()",1000);
-                return;
-            }
-            //alert(filename)
-            var obj = new Object();
-            obj.filename = filename
-            $.ajax({
-                url : prefix + "/importExcel",
-                method : 'post',
-                data : obj,
-                success : function (e) {
-                    //console.log(e,"=e")
-                    if(e.code == 0){
-                        //alert("success")
-                        $.modal.alert(e.msg)
-                        setTimeout("window.location.reload()",1000);
-                    }else {
-                        $.modal.alert(e.msg)
-                        setTimeout("window.location.reload()",1000);
-                    }
-                }
-            });
+    function importExcel(filename) {
+        String.prototype.endWith = function (endStr) {
+            var d = this.length - endStr.length;
+            return (d >= 0 && this.lastIndexOf(endStr) == d)
+        }
+        if (!filename.endWith(".xls")) {
+            $.modal.alert("请上传.xls文件！")
+            setTimeout("window.location.reload()", 1000);
+            return;
         }
-    </script>
+        //alert(filename)
+        var obj = new Object();
+        obj.filename = filename
+        $.ajax({
+            url: prefix + "/importExcel",
+            method: 'post',
+            data: obj,
+            success: function (e) {
+                //console.log(e,"=e")
+                if (e.code == 0) {
+                    //alert("success")
+                    $.modal.alert(e.msg)
+                    setTimeout("window.location.reload()", 1000);
+                } else {
+                    $.modal.alert(e.msg)
+                    setTimeout("window.location.reload()", 1000);
+                }
+            }
+        });
+    }
+</script>
 </body>
-</html>
+</html>