切换江津模版

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -87,6 +87,62 @@ public class SysIndexController extends BaseController
         mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
         mmap.put("isMobile", ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")));
 
+        UserRelate userRelate = new UserRelate();
+        userRelate.setUserId(getUserId());
+        List<UserRelate> userRelates = userRelateService.selectUserRelateList(userRelate);
+        //获取档案列表
+//        List<Dangan>  danganList = danganService.selectDanganList(new Dangan());
+
+        //23年2月14日新增,加入档案信息
+        if(!CollectionUtils.isEmpty(userRelates)) {
+            for (UserRelate relate : userRelates) {
+                Dangan dangan = danganService.selectDanganById(relate.getDanganId());
+                if(!ObjectUtils.isEmpty(dangan)){
+                    if(!StringUtils.isEmpty(dangan.getIconInfo())){
+                        if(dangan.getIconInfo().contains("/upload")){
+                            //期望给用户展示用的可直接访问的URL
+                            String newStr = dangan.getIconInfo();
+                            String[] ipPorts = ipPort.split(",");
+                            //分ip+端口号 和 域名情况
+                            if(ipPorts.length>=2){
+                                //说明是由ip,端口组成的参数
+                                newStr = "http://"+ipPorts[0]+":"+ipPorts[1]+"/iconShow"+newStr;
+                            }else if(ipPorts.length==1){
+                                //说明ip配置的是域名
+                                newStr = "http://"+ipPorts[0]+"/iconShow"+newStr;
+                            }
+                            dangan.setIconInfo(newStr);
+                        }
+                    }else{
+                        //说明档案图标未上传,那么使用默认图标
+                        SysConfig configQuery = new SysConfig();
+                        configQuery.setConfigKey("sys.main.defaultIcon");
+                        SysConfig configEntity = configMapper.selectConfig(configQuery);
+                        if(!ObjectUtils.isEmpty(configEntity)) {
+                            String config = configEntity.getConfigValue();
+                            if (!StringUtils.isEmpty(config)) {
+                                //说明全局config表中已配置
+                                //期望给用户展示用的可直接访问的URL
+                                String newStr = config;
+//                                String[] ipPorts = ipPort.split(",");
+//                                //分ip+端口号 和 域名情况
+//                                if (ipPorts.length >= 2) {
+//                                    //说明是由ip,端口组成的参数
+//                                    newStr = "http://" + ipPorts[0] + ":" + ipPorts[1] + "/iconShow" + newStr;
+//                                } else if (ipPorts.length == 1) {
+//                                    //说明ip配置的是域名
+//                                    newStr = "http://" + ipPorts[0] + "/iconShow" + newStr;
+//                                }
+                                dangan.setIconInfo(newStr);
+                            }
+                        }
+                    }
+                    relate.setDangan(dangan);
+                }
+            }
+        }
+        mmap.put("danganList",userRelates);
+
         // 菜单导航显示风格
         String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
         // 移动端，默认使左侧导航菜单，否则取默认配置

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -76,9 +76,9 @@ public class SysLoginController extends BaseController
         // 是否开启用户注册
         mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
 //        return "login";
-//        return "loginYining";
+        return "loginYining";
 //        return "loginDangyang";
-        return "loginJiangjin";
+//        return "loginJiangjin";
     }
 
     @PostMapping("/login")

ruoyi-admin/src/main/resources/static/ruoyi/index.js

@@ -53,6 +53,19 @@ document.addEventListener('keypress', resetTimer, false);
 document.addEventListener('touchmove', resetTimer, false);
 document.addEventListener('',resetTimer,false);
 
+var danganYiningList = [[${danganList}]];
+document.getElementById('yiningLogoutLink').addEventListener('click', function(event) {
+    // // 阻止默认的链接跳转行为
+    // event.preventDefault();
+    // alert(111);
+    debugger
+    // 执行你的方法
+    console.log(danganYiningList);
+
+    // // 如果需要，可以在这里进行其他操作，例如重定向
+    // window.location.href = this.href;
+});
+
 $(function() {
     // 初始化定时器
     resetTimer();

ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
+    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/index.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
+    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -52,7 +52,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs" style="width: 100%!important;height: 60px!important;background-color: rgb(4,35,61)!important;padding-top: 3%">
-				<img th:src="@{faviconOld.ico}" style="height: 60%;display: inline-block"/>
+				<img th:src="@{favicon.ico}" style="height: 60%;display: inline-block"/>
                 <span class="" style="font-weight: bold">统一认证平台</span>
             </li>
          </a>
@@ -249,8 +249,8 @@
 							<!--</li>-->
 							<li class="divider"></li>
 							<li>
-								<a th:href="@{logout}">
-								<i class="fa fa-sign-out"></i> 退出登录</a>
+								<a id="yiningLogoutLink" th:href="@{logout}">
+								<a><i class="fa fa-sign-out"></i> 退出登录</a>
 							</li>
 						</ul>
 					</li>

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

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/loginDangyang.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/loginJiangjin.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/loginYining.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/main.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainDangyang.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainDangyangView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainJiangjin.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainJiangjinView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainJiangjin.css" th:href="@{/css/mainJiangjin.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainLhk.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainYining.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainYiningMaskView.html

@@ -5,7 +5,7 @@
     <title></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainYiningView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -167,6 +167,11 @@
 		<div class="centerDiv"></div>
 	</div>
 </div>
+<a href="https://chat.deltawaters.online/ui/chat/13d161dc762e3849" target="_blank">
+<img id="wisdom_png" alt="[ 小伊智慧体 ]" src="../static/yining_wisdom.png" th:src="@{/yining_wisdom.png}"
+	 style="width: 100px;height: 100px;cursor: pointer;position:fixed;
+			right: 2%;bottom: 10%;z-index: 9999">
+</a>
 <script th:inline="javascript">
 	//TODO 逻辑解释:
     //第一段视频放到第4秒的时候，就可以降低透明度了
@@ -192,7 +197,6 @@
 	function opennewpage(url) {
 
 		// window.location.href=url;
-
 		if(url.indexOf("?")>0) {
             url = url + "&" + "reqid=" + sessionId;
         }else{

ruoyi-admin/src/main/resources/templates/main_v1.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>统计</title>
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/register.html

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
 </head>
 <body class="signin">

ruoyi-admin/src/main/resources/templates/skin.html

@@ -8,7 +8,7 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <style type="text/css">

ruoyi-admin/src/main/resources/templates/view.html

@@ -3,13 +3,13 @@
 
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="./static/images/faviconOld.ico" type="image/icon">
+    <link rel="shortcut icon" href="./static/images/favicon.ico" type="image/icon">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-    <link rel="icon" href="./static/faviconOld.ico">
+    <link rel="icon" href="./static/favicon.ico">
     <title>老河口清源供水有限公司</title>
 
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -287,7 +287,7 @@ public class ShiroConfig
         // Shiro连接约束配置，即过滤链的定义
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 对静态资源设置匿名访问
-        filterChainDefinitionMap.put("/faviconOld.ico**", "anon");
+        filterChainDefinitionMap.put("/favicon.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/html/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");