fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -159,7 +159,7 @@ </PropertyDef> <PropertyDef name="deptId"> <Property></Property> <Property name="label">所属分库</Property> <Property name="label">所在库区</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property> <Property name="keyProperty">id</Property> @@ -628,12 +628,19 @@ <Property name="align">center</Property> <Property name="width">150</Property> </DataColumn> <DataColumn name="deptId"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> <Property name="property">deptId</Property> <Property name="align">center</Property> <Property name="width">250</Property> </DataColumn> <DataColumn name="plateNum"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> <Property name="property">plateNum</Property> <Property name="align">center</Property> <Property name="width">130</Property> <Property name="width">120</Property> </DataColumn> <DataColumn> <Property name="property">customerName</Property> @@ -763,6 +770,12 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">deptId</Property> <Property name="property">deptId</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">depotId</Property> <Property name="property">depotId</Property> <Property name="label">装卸仓库</Property> @@ -823,7 +836,7 @@ <Property name="trigger">ddNotice</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <AutoFormElement> <Property name="name">noticeId</Property> <Property name="property">noticeId</Property> <Editor/> fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -82,14 +82,6 @@ mmap.put("user", user); mmap.put("sysName", FrameworkConfig.getName()); //判断是否显示库区选择弹窗 String showDeptList = "Y"; SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId()); if (Constant.DEPT_TYPE_20.equals(userDept.getType())) { showDeptList = "N"; } mmap.put("showDeptList", showDeptList); ContextUtil.updateSubDept(user.getLoginName(), deptId); SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId)); mmap.put("dept", dept); fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
@@ -10,7 +10,9 @@ import com.fzzy.igds.service.CoreDeptService; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.SystemUtil; import com.fzzy.sys.manager.common.CommonManager; import com.fzzy.sys.manager.security.SecManager; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import lombok.extern.slf4j.Slf4j; import com.ruoyi.common.utils.StringUtils; @@ -39,17 +41,21 @@ @Resource private SecManager secManager; @Resource private CommonManager commonManager; @Resource private CoreDeptService deptService; /** * 库区安防页面 * @param type 1.表示2.5D鸟瞰图页面预览；2.表示列表预览页面 * @param type 1.表示2.5D鸟瞰图页面预览；2.表示列表预览页面 * @param deptId * @param view * @return */ @RequestMapping("/video-dept") public String videoDept(@RequestParam(value = "type", required = false) String type, ModelMap view) { @RequestParam(value = "deptId", required = false) String deptId, ModelMap view) { if (StringUtils.isBlank(type)) { type = "2"; @@ -58,11 +64,24 @@ SysUser user = ContextUtil.getLoginUser(); view.put(Constant.MODEL_KEY_LOGIN_USER, user); String deptId = ContextUtil.subDeptId(user); if(StringUtils.isBlank(deptId)){ deptId = ContextUtil.subDeptId(user); } view.put("deptId", deptId); List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId()); view.put("listCamera", listCamera); SysDept sysDept = commonManager.getDeptById(deptId); view.put("dept", sysDept); view.put("type", type); //判断是否显示库区选择弹窗 String showDeptList = "Y"; if (Constant.USER_TYPE_30.equals(user.getUserType())) { showDeptList = "N"; } view.put("showDeptList", showDeptList); //默认监控列表页面 String viewUrl = prefix + "/video-list-dept"; @@ -70,53 +89,7 @@ if("1".equals(type)){ viewUrl = prefix + "/video-aerial-dept"; //鸟瞰图 Dept dept = deptService.getDeptById(deptId); if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) { view.put("backgroundImg", dept.getImgPath()); } } if("2".equals(type)){ viewUrl = prefix + "/video-list-dept"; } return viewUrl; } /** * 监管安防页面 * @param type 1.表示2.5D鸟瞰图页面预览；2.表示列表预览页面 * @param view * @return */ @RequestMapping("/video-super") public String videoSuper(@RequestParam(value = "type", required = false) String type, ModelMap view) { if (StringUtils.isBlank(type)) { type = "2"; } SysUser user = ContextUtil.getLoginUser(); view.put(Constant.MODEL_KEY_LOGIN_USER, user); String deptId = ContextUtil.subDeptId(user); view.put("deptId", deptId); List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId()); view.put("listCamera", listCamera); //默认监控列表页面 String viewUrl = prefix + "/video-list-dept"; if("1".equals(type)){ viewUrl = prefix + "/video-aerial-dept"; //鸟瞰图 Dept dept = deptService.getDeptById(deptId); if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) { view.put("backgroundImg", dept.getImgPath()); } view.put("backgroundImg", commonManager.getDeptImg(deptId)); } if("2".equals(type)){ viewUrl = prefix + "/video-list-dept"; fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -7,9 +7,11 @@ import com.fzzy.igds.service.DepotService; import com.fzzy.igds.service.DicService; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +36,36 @@ @Resource private CoreDeptService coreDeptService; @Autowired @Resource private ISysUserService userService; @Resource private ISysDeptService iSysDeptService; /** * 根据库区编码获取库区下所有仓库列表 * * @param id * @return */ public SysDept getDeptById(String id) { return iSysDeptService.selectDeptById(Long.valueOf(id)); } /** * 获取库区鸟瞰图 * @param deptId * @return */ public String getDeptImg(String deptId) { String imgPath = "/img/deptImg.jpg"; //默认图 Dept dept = coreDeptService.getDeptById(deptId); if(null != dept && StringUtils.isNotEmpty(dept.getImgPath())){ imgPath = dept.getImgPath(); } return imgPath; } /** * 根据字典类型获取字典列表 fzzy-igdss-web/src/main/resources/static/common/igds-common.js
@@ -232,7 +232,9 @@ if ("video" == pageTag) { url = "/group/video"; } if ("sys" == pageTag) { url = "/index?deptId=" + deptId; } window.location.href = url; }
@@ -50,10 +50,50 @@ table = layui.table; }); showDeptSelect(); //初始化渲染播放列表 renderList(); }); /** * 弹出切换库区列表 */ function showDeptSelect() { if(showDeptList === "N"){ $("#deptList").css('display', 'none'); } if(showDeptList === "Y"){ $("#deptList").css('display', 'block'); } } /** * 弹出切换库区列表 */ function showDepotAreaSelect() { layer.open({ type: 2, title: '选择库区', area: ['400px', '650px'], offset: ['50px', '170px'], shade: 0, content: "/com.fzzy.igds.SelectDept.d", closeBtn: 1 }); } /** * * @param id * @returns {boolean} */ function onDeptAreaChange(id) { window.location.href = "./security/video-dept?type=" + type + "&deptId=" + id; return true; } /** * 渲染监控列表 */ fzzy-igdss-web/src/main/resources/templates/group/gis.html
@@ -56,12 +56,14 @@ <div class="container"> <div class="i-top"> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">省级储备粮监管平台</span></h1> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">智慧粮库质押监管大屏</span></h1> <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">新疆伊宁农村商业银行股份有限公司——智慧监管平台</p> <div class="i-navBar"> <a href="javaScript:;" onclick="changePage('index')" class="i-nav3">首页</a> <a href="javaScript:;" onclick="changePage('gis')" class="i-nav4 active">GIS监管</a> <a href="javaScript:;" onclick="changePage('video')" class="i-nav5">视频监管</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">退出系统</a> <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">后台管理</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">退出系统</a> </div> <div class="date-time-module"> <span id="navBarTime"></span> fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -23,12 +23,14 @@ <div class="container"> <div class="i-top"> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">政策性储备粮油监管平台</span></h1> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">智慧粮库质押监管大屏</span></h1> <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">新疆伊宁农村商业银行股份有限公司——智慧监管平台</p> <div class="i-navBar"> <a href="javaScript:;" onclick="changePage('index')" class="i-nav3 active">首页</a> <a href="javaScript:;" onclick="changePage('gis')" class="i-nav4">GIS监管</a> <a href="javaScript:;" onclick="changePage('video')" class="i-nav5">视频监管</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">退出系统</a> <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">后台管理</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">退出系统</a> </div> <div class="date-time-module"> <span id="navBarTime"></span> fzzy-igdss-web/src/main/resources/templates/group/video.html
@@ -135,12 +135,14 @@ <div class="container row-main"> <div class="i-top"> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">政策性储备粮油监管平台</span></h1> <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">智慧粮库质押监管大屏</span></h1> <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">新疆伊宁农村商业银行股份有限公司——智慧监管平台</p> <div class="i-navBar"> <a href="javaScript:;" onclick="changePage('index')" class="i-nav3">首页</a> <a href="javaScript:;" onclick="changePage('gis')" class="i-nav4">GIS监管</a> <a href="javaScript:;" onclick="changePage('video')" class="i-nav5 active">视频监管</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">退出系统</a> <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">后台管理</a> <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">退出系统</a> </div> <div class="date-time-module"> <span id="navBarTime"></span> fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -271,12 +271,14 @@ </div> <!-- 右侧栏 --> <ul class="nav navbar-top-links navbar-right welcome-message"> <li style="background-color: #03703a;"><a onclick="showDepotAreaSelect()" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="库区选择" href="javascript:;"><i class="fa fa-refresh"></i> [[${#strings.defaultString(dept.deptName, <li style="background-color: #03703a;"><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" th:title="${dept.deptName}" href="javascript:;"><i class="fa fa-map-o"></i> [[${#strings.defaultString(dept.deptName, '-')}]]</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li> <!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档"--> <!-- href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i--> <!-- class="fa fa-question-circle"></i> 文档</a></li>--> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="大屏" href="/index-gateway" id="index-gateway"><i class="fa fa-laptop"></i> 大屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" @@ -399,24 +401,6 @@ area : ["530px", "386px"], content : [ctx + "system/switchSkin", 'no'] }) } /** * 弹出切换库区列表 */ function showDepotAreaSelect() { if(showDeptList === "N"){ return false; } layer.open({ type: 2, title: '选择库区', area: ['400px', '650px'], offset: ['50px', '1350px'], shade: 0, content: "com.fzzy.igds.SelectDept.d", closeBtn: 1 }); } /** fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
@@ -223,6 +223,13 @@ width: 100%; height: 100%; } .dept{ margin-left: 150px; font-size: 16px; color: #FFFFFF; width: 400px; padding-top: 8px; } </style> </head> @@ -238,6 +245,10 @@ <h3> <i></i>视频实时预览 </h3> <div id="deptList" class="dept" onclick="showDepotAreaSelect()"> <img style="width: 18px" th:src="@{/img/web/security/qh.png}"/> [[${#strings.defaultString(dept.deptName, '-')}]] </div> <div class="fenping_icon"> <img onclick="fenping(1)" id="f_1" style="width: 30px" th:src="@{/img/web/group/fp_1_active.png}"/> <img onclick="fenping(4)" id="f_4" style="width: 30px" th:src="@{/img/web/group/fp_4.png}"/> @@ -419,6 +430,8 @@ <script th:inline="javascript"> var listCamera = [[${listCamera}]]; var showDeptList = [[${showDeptList}]]; var type = [[${type}]]; </script> <script th:src="@{/js/jquery.min.js}"></script> <script th:src="@{/ajax/libs/layui/layui.js}"></script>
