伊宁项目更改相关

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,8 +1,13 @@
 package com.ruoyi;
 
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.AnnotationBeanNameGenerator;
 
 /**
  * 启动程序
@@ -12,10 +17,22 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {
+    /**
+     * 代码混淆后，包名、类名会存在重复，重写buildDefaultBeanName方法，获取全限定的类名
+     */
+    static class ProGuardBeanNameGenerator extends AnnotationBeanNameGenerator {
+        @Override
+        protected String buildDefaultBeanName(BeanDefinition definition) {
+            return definition.getBeanClassName();
+        }
+    }
+
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApplication.class, args);
+//        SpringApplication.run(RuoYiApplication.class, args);
+        new SpringApplicationBuilder(RuoYiApplication .class)
+                .beanNameGenerator(new ProGuardBeanNameGenerator()).run(args);
         System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +

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

@@ -1,16 +1,12 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.ServletRequest;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.system.domain.Dangan;
 import com.ruoyi.system.domain.SysConfig;
@@ -18,7 +14,6 @@ import com.ruoyi.system.domain.UserRelate;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.IDanganService;
 import com.ruoyi.system.service.IUserRelateService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -218,7 +213,22 @@ public class SysIndexController extends BaseController
             }
         }
         mmap.put("danganList",userRelates);
-        return "mainLhk";
+        //TODO 伊宁专有逻辑
+        List<UserRelate> leftOneList = userRelates.stream().filter(x->"基础支撑系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> leftTwoList = userRelates.stream().filter(x->"智慧办公系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> leftThreeList = userRelates.stream().filter(x->"智慧客服系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightOneList = userRelates.stream().filter(x->"智慧生产系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightTwoList = userRelates.stream().filter(x->"智慧管网系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightThreeList = userRelates.stream().filter(x->"智慧营业系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        mmap.put("leftOneList",leftOneList);
+        mmap.put("leftTwoList",leftTwoList);
+        mmap.put("leftThreeList",leftThreeList);
+        mmap.put("rightOneList",rightOneList);
+        mmap.put("rightTwoList",rightTwoList);
+        mmap.put("rightThreeList",rightThreeList);
+//        return "mainLhk";
+//        return "main";
+        return "mainYining";
     }
 
 
@@ -241,6 +251,87 @@ public class SysIndexController extends BaseController
         return AjaxResult.success();
     }
 
+
+    @GetMapping("/system/mainYiningView")
+    public String mainYiningView(ModelMap mmap){
+        mmap.put("version", RuoYiConfig.getVersion());
+
+        String sessionId = ShiroUtils.getSessionId();
+
+
+        UserRelate userRelate = new UserRelate();
+        userRelate.setUserId(getUserId());
+        List<UserRelate> userRelates = userRelateService.selectUserRelateList(userRelate);
+        //获取档案列表
+//        List<Dangan>  danganList = danganService.selectDanganList(new Dangan());
+
+        mmap.put("sessionId",sessionId);
+
+        //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);
+        //TODO 伊宁专有逻辑
+        List<UserRelate> leftOneList = userRelates.stream().filter(x->"基础支撑系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> leftTwoList = userRelates.stream().filter(x->"智慧管网系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> leftThreeList = userRelates.stream().filter(x->"智慧办公系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightOneList = userRelates.stream().filter(x->"智慧生产系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightTwoList = userRelates.stream().filter(x->"智慧客服系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightThreeList = userRelates.stream().filter(x->"水质实验室".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        mmap.put("leftOneList",leftOneList);
+        mmap.put("leftTwoList",leftTwoList);
+        mmap.put("leftThreeList",leftThreeList);
+        mmap.put("rightOneList",rightOneList);
+        mmap.put("rightTwoList",rightTwoList);
+        mmap.put("rightThreeList",rightThreeList);
+        return "mainYiningView";
+    }
+
     @GetMapping("/system/view")
     public String view(ModelMap mmap){
         String sessionId = ShiroUtils.getSessionId();

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

@@ -37,6 +37,9 @@ public class SysLoginController extends BaseController
     @Autowired
     private ConfigService configService;
 
+    @Value("${yiningCodeUrl}")
+    private String yiningCodeUrl;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap)
     {
@@ -47,9 +50,11 @@ public class SysLoginController extends BaseController
         }
         // 是否开启记住我
         mmap.put("isRemembered", rememberMe);
+        mmap.put("codeUrl", yiningCodeUrl);
         // 是否开启用户注册
         mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
-        return "login";
+//        return "login";
+        return "loginYining";
     }
 
     @PostMapping("/login")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/ActionApi.java

@@ -45,7 +45,7 @@ public class ActionApi {
     @PostMapping()
     public AjaxResult userList(@RequestBody ValidateMessage validateMessage)
     {
-
+        logger.info("validateMessage"+validateMessage.toString());
     try {
         if (!StringUtils.isNotEmpty(validateMessage.getClientKey())) {
             return AjaxResult.error("请求失败!");

ruoyi-admin/src/main/resources/application-test.yml

@@ -56,6 +56,9 @@ spring:
                      url: jdbc:postgresql://119.96.165.176:5432/lhk_union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
                      username: postgres
                      password: kpr.23417.postgres
+#                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                      username: postgres
+#                      password: kpr.23417.postgres
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -105,4 +108,5 @@ spring:
     devtools:
         restart:
           # 热部署开关
-          enabled: true
+          enabled: true
+yiningCodeUrl: https://140.246.183.164:9000/base/apply/apk

ruoyi-admin/src/main/resources/static/css/login.css

@@ -5,7 +5,6 @@ body.signin {
 	height:auto;
 	/*background:url(../img/login-background.jpg) no-repeat center fixed;*/
 	background:url(../img/bg.png) no-repeat center fixed;
-
 	-webkit-background-size:cover;
 	-moz-background-size:cover;
 	-o-background-size:cover;

ruoyi-admin/src/main/resources/static/css/mainYining.css

@@ -0,0 +1,455 @@
+/*主要样式*/
+.centerDiv{
+    position: absolute;
+    width: 39%;
+    height: 700px;
+    left: 29%;
+    top: 0;
+    z-index: 9999!important;
+}
+.topDiv{
+    position: absolute;
+    width: 100%;
+    height: 300px;
+    left: 50px;
+    top: 30px;
+    z-index: 9999!important;
+}
+.bottomDiv{
+    position: absolute;
+    width: 100%;
+    height: 300px;
+    left: 0;
+    bottom: 0;
+    z-index: 9999!important;
+}
+
+.leftOneDiv{
+    position: absolute;
+    left: 83px;
+    top: 55px;
+    background:url(../img/yining/leftOne.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+
+.leftOneTopLine{
+    position: absolute;
+    top: 0px;
+    left: 200px;
+    background:url(../img/yining/leftOneTopLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+.leftOneBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 14px;
+    background:url(../img/yining/leftOneBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.leftTwoDiv{
+    position: absolute;
+    left: 100px;
+    top: 200px;
+    background:url(../img/yining/leftTwo.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 627px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.leftTwoTopLine{
+    position: absolute;
+    top: 0px;
+    left: 10px;
+    background:url(../img/yining/leftTwoTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.leftTwoBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 22px;
+    background:url(../img/yining/leftTwoBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.leftThreeDiv{
+    position: absolute;
+    left: 65px;
+    top: 344px;
+    background:url(../img/yining/leftThree.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.leftThreeTopLine{
+    position: absolute;
+    top: 0px;
+    left: 10px;
+    background:url(../img/yining/leftThreeTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.leftThreeBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 215px;
+    background:url(../img/yining/leftThreeBottomLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+
+.rightOneDiv{
+    position: absolute;
+    right: 140px;
+    top: 55px;
+    background:url(../img/yining/rightOne.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightOneTopLine{
+    position: absolute;
+    top: 0px;
+    right: 200px;
+    background:url(../img/yining/rightOneTopLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+.rightOneBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 14px;
+    background:url(../img/yining/rightOneBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.rightTwoDiv{
+    position: absolute;
+    right: 155px;
+    top: 200px;
+    background:url(../img/yining/rightTwo.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 627px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightTwoTopLine{
+    position: absolute;
+    top: 0px;
+    right: 10px;
+    background:url(../img/yining/rightTwoTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.rightTwoBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 22px;
+    background:url(../img/yining/rightTwoBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.rightThreeDiv{
+    position: absolute;
+    right: 122px;
+    top: 344px;
+    background:url(../img/yining/rightThree.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightThreeTopLine{
+    position: absolute;
+    top: 0px;
+    right: 10px;
+    background:url(../img/yining/rightThreeTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.rightThreeBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 215px;
+    background:url(../img/yining/rightThreeBottomLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+
+.leftOneDiv:hover{
+    background:url(../img/yining/hover/leftOneHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftOneDiv:hover .leftOneIcon{
+    content:url(../img/yining/icon/基础支撑系统,选中.png)
+}
+.leftOneDiv:hover .leftOneTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.5);
+    z-index: 99999;
+}
+.leftOneDiv:hover .leftOneBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.leftTwoDiv:hover{
+    background:url(../img/yining/hover/leftTwoHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftTwoDiv:hover .leftTwoIcon{
+    content:url(../img/yining/icon/智慧生产系统,选中.png)
+}
+.leftTwoDiv:hover .leftTwoTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.2);
+    z-index: 99999;
+}
+.leftTwoDiv:hover .leftTwoBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.leftThreeDiv:hover{
+    background:url(../img/yining/hover/leftThreeHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftThreeDiv:hover .leftThreeIcon{
+    content:url(../img/yining/icon/智慧管网系统,选中.png)
+}
+.leftThreeDiv:hover .leftThreeTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+.leftThreeDiv:hover .leftThreeBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.3);
+    z-index: 99999;
+}
+
+.rightOneDiv:hover{
+    background:url(../img/yining/hover/rightOneHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightOneDiv:hover .rightOneIcon{
+    content:url(../img/yining/icon/智慧营业系统,选中.png)
+}
+.rightOneDiv:hover .rightOneTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.4);
+    z-index: 99999;
+}
+.rightOneDiv:hover .rightOneBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.rightTwoDiv:hover{
+    background:url(../img/yining/hover/rightTwoHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightTwoDiv:hover .rightTwoIcon{
+    content:url(../img/yining/icon/智慧客服系统,选中.png)
+}
+.rightTwoDiv:hover .rightTwoTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.2);
+    z-index: 99999;
+}
+.rightTwoDiv:hover .rightTwoBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.rightThreeDiv:hover{
+    background:url(../img/yining/hover/rightThreeHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightThreeDiv:hover .rightThreeIcon{
+    content:url(../img/yining/icon/智慧办公系统,选中.png)
+}
+.rightThreeDiv:hover .rightThreeTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+.rightThreeDiv:hover .rightThreeBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.3);
+    z-index: 99999;
+}
+
+
+/* 其他样式 */
+.leftAllLine{
+    height: 1048px;
+    width: 91px;
+    transform: scale(0.5);
+    position: absolute;
+    left: 180px;
+    top: 35px;
+}
+.rightAllLine{
+    height: 1048px;
+    width: 91px;
+    transform: scale(0.5);
+    position: absolute;
+    right: 180px;
+    top: 35px;
+}
+
+.leftMenu{
+    background:url(../img/yining/二级菜单背景.png) no-repeat center fixed;
+    height: 1048px;
+    /*width: 424px;*/
+    width: 0;
+    transform: scale(0.5);
+    position: absolute;
+    /*left: -60px;*/
+    right: 81%;
+    top: 35px;
+    /*display: none;*/
+}
+.leftMenuMedLine{
+    background:url(../img/yining/背景弧小号.png) no-repeat center fixed;
+    height: 100%;
+    width: 87px;
+    position: absolute;
+    left: -40px;
+    top: -40px;
+}
+.leftMenuLeftLine{
+    background:url(../img/yining/背景弧中号.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    left: 0px;
+    top: -40px;
+}
+.leftMenuRightLine{
+    background:url(../img/yining/背景弧中号.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    right: 0px;
+    top: -40px;
+}
+
+.rightMenu{
+    background:url(../img/yining/二级菜单背景_rotated.png) no-repeat center fixed;
+    height: 1048px;
+    /*width: 424px;*/
+    width: 0;
+    transform: scale(0.5);
+    position: absolute;
+    /*right: -60px;*/
+    left: 81%;
+    top: 35px;
+    /*display: none;*/
+}
+.rightMenuMedLine{
+    background:url(../img/yining/背景弧小号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 87px;
+    position: absolute;
+    right: -40px;
+    top: -40px;
+}
+.rightMenuLeftLine{
+    background:url(../img/yining/背景弧中号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    left: 0px;
+    top: -40px;
+}
+.rightMenuRightLine{
+    background:url(../img/yining/背景弧中号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    right: 0px;
+    top: -40px;
+}
+
+.menuUl {
+    font-size: 40px;
+    color:rgb(209,231,250);
+    width: 100%;
+    height: 80%;
+    position: absolute;
+    left: -40px;
+    top: 70px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.menuUlLi{
+    list-style: none;
+    margin: 0 auto;
+    padding: 10px;
+}
+.menuUlLi:hover{
+    color:rgb(0,251,255);
+}
+
+.menuUlRight{
+    font-size: 40px;
+    color:rgb(209,231,250);
+    width: 100%;
+    height: 80%;
+    position: absolute;
+    left: 10px;
+    top: 70px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.menuUlLiRight{
+    list-style: none;
+    margin: 0 auto;
+    padding: 10px;
+}
+.menuUlLiRight:hover{
+    color:rgb(0,251,255);
+}

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

@@ -523,13 +523,14 @@ $(function() {
 
     //TODO 子窗口调用
     top.window.tagObj = hideModel;
+    top.window.tagFull = fullScreenTab;
     top.window.tagMenu = menuFlag;
 
     function viewClassAD() {
         if(menuFlag){
-            $("#content-main").addClass("viewHeight");
+            // $("#content-main").addClass("viewHeight");
         }else{
-            $("#content-main").removeClass("viewHeight");
+            // $("#content-main").removeClass("viewHeight");
         }
     }
 
@@ -555,6 +556,8 @@ $(function() {
             tabCloseAll();//关闭所有页
             // activeOneTab();//点击首页然后显示首页
             $('#content-main').toggleClass('max');
+
+            $("#content-main").removeClass("contentPositClass");
         }else{
             menuFlag = false;
             $right.removeClass("rightClass");
@@ -564,6 +567,8 @@ $(function() {
             $headMenuDiv.show();
             $simpleDiv.hide();
             $('#content-main').toggleClass('max');
+
+            $("#content-main").addClass("contentPositClass");
         }
         viewClassAD();
     }

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

@@ -30,6 +30,13 @@
 		.viewHeight{
 			height: 100%!important;
 		}
+		.nav>li>a{
+			padding: 11px 20px 11px 25px!important;
+		}
+
+		.contentPositClass{
+			position: relative!important;top: 100px!important;
+		}
 	</style>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
@@ -40,28 +47,29 @@
         <div class="nav-close">
             <i class="fa fa-times-circle"></i>
         </div>
-        <a th:href="@{/index}">
-            <li class="logo hidden-xs">
-                <span class="logo-lg">统一认证平台</span>
+        <a th:href="@{/index}" >
+            <li class="logo hidden-xs" style="height: 60px!important;background-color: rgb(4,35,61)!important;padding-top: 3%">
+				<img th:src="@{favicon.ico}" style="height: 60%;display: inline-block"/>
+                <span class="" style="font-weight: bold">统一认证平台</span>
             </li>
          </a>
-        <div class="sidebar-collapse">
+        <div class="sidebar-collapse" style="background-color: rgb(4,35,61)!important;">
             <ul class="nav" id="side-menu">
-            	<li>
-            		<div class="user-panel">
-            			<a class="menuItem noactive" title="个人中心" th:href="@{/system/user/profile}">
-            				<div class="hide" th:text="个人中心"></div>
-					        <div class="pull-left image">
-		                    	<img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="img-circle" alt="User Image">
-					        </div>
-				        </a>
-				        <div class="pull-left info">
-				          <p>[[${user.loginName}]]</p>
-				          <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
-				          <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>
-				        </div>
-				    </div>
-            	</li>
+            	<!--<li>-->
+            		<!--<div class="user-panel">-->
+            			<!--<a class="menuItem noactive" title="个人中心" th:href="@{/system/user/profile}">-->
+            				<!--<div class="hide" th:text="个人中心"></div>-->
+					        <!--<div class="pull-left image">-->
+		                    	<!--<img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="img-circle" alt="User Image">-->
+					        <!--</div>-->
+				        <!--</a>-->
+				        <!--<div class="pull-left info">-->
+				          <!--<p>[[${user.loginName}]]</p>-->
+				          <!--<a href="#"><i class="fa fa-circle text-success"></i> 在线</a>-->
+				          <!--<a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
+				        <!--</div>-->
+				    <!--</div>-->
+            	<!--</li>-->
                 <li>
                     <a class="menuItem" th:href="@{/system/main}"><i class="fa fa-home"></i> <span class="nav-label">首页</span> </a>
                 </li>
@@ -202,14 +210,14 @@
     <!--右侧部分开始-->
     <div id="page-wrapper" class="gray-bg dashbard-1">
         <!--精细模式-->
-        <div class="row border-bottom" id="comDiv" style="display: none">
-            <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
-                <div class="navbar-header">
+        <div class="row border-bottom" id="comDiv" style="position: fixed!important;top: 0!important;right: 1%!important;width:87%!important;z-index: 99999999!important;">
+            <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0;height: 60px;background-color: rgb(4,35,61)!important;">
+                <div class="navbar-header" style="margin-top: 5px!important;">
                     <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="#" title="收起菜单">
                     	<i class="fa fa-bars"></i>
                     </a>
                 </div>
-                <ul class="nav navbar-top-links navbar-right welcome-message">
+                <ul class="nav navbar-top-links navbar-right welcome-message" style="margin-top: 5px!important;">
 <!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
 					<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="极简模式" href="#" id="hideMenu"><i class="fa fa-arrows-alt"></i></a></li>
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
@@ -232,10 +240,10 @@
 								<a onclick="switchSkin()">
 								<i class="fa fa-dashboard"></i> 切换主题</a>
 							</li>
-							<li>
-								<a onclick="toggleMenu()">
-								<i class="fa fa-toggle-off"></i> 横向菜单</a>
-							</li>
+							<!--<li>-->
+								<!--<a onclick="toggleMenu()">-->
+								<!--<i class="fa fa-toggle-off"></i> 横向菜单</a>-->
+							<!--</li>-->
 							<li class="divider"></li>
 							<li>
 								<a th:href="@{logout}">
@@ -261,7 +269,7 @@
             <!--</nav>-->
         </div>
 
-        <div id="headMenuDiv" style="display: none" class="row content-tabs" th:classappend="${#bools.isFalse(tagsView)} ? |hide|">
+        <div id="headMenuDiv" style="position: fixed!important; top: 60px!important; right: 1%!important; width: 87% !important;z-index: 99999999!important;" class="row content-tabs" th:classappend="${#bools.isFalse(tagsView)} ? |hide|">
             <button class="roll-nav roll-left tabLeft">
                 <i class="fa fa-backward"></i>
             </button>
@@ -279,7 +287,7 @@
         <a id="ax_close_max" class="ax_close_max" href="#" title="关闭全屏"> <i class="fa fa-times-circle-o"></i> </a>
 
         <div class="row mainContent viewHeight" id="content-main" th:classappend="${mainClass}">
-            <iframe class="RuoYi_iframe" name="iframe0" width="100%" height="100%" th:data-id="@{/system/main}"
+            <iframe class="RuoYi_iframe" id="iframe0" name="iframe0" width="100%" height="100%" th:data-id="@{/system/main}"
                 th:src="@{/system/main}" frameborder="0" seamless></iframe>
         </div>
 

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

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>登录智慧水务系统-认证系统</title>
+    <meta name="description" content="智慧水务系统-认证系统">
+    <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/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
+    <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.5}" rel="stylesheet"/>
+    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+    <!-- 360浏览器急速模式 -->
+    <meta name="renderer" content="webkit">
+    <!-- 避免IE使用兼容模式 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <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};
+    </script>
+    <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+    <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
+    <!-- 全局js -->
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
+    <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
+    <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
+    <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
+    <script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.5}"></script>
+    <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+    <style type="text/css">
+        .hClass{
+            position:absolute;
+            left:3%;
+            top:4%;
+            font-size: 25px;
+        }
+        .divHead{
+            font-size: 20px;
+            position: absolute!important;
+            top: 30px!important;
+            left: 15%;
+            color: #1a1a1a;
+        }
+        .divFoot{
+            position: absolute!important;
+            bottom: -20px!important;
+            padding-bottom: 20px;
+            left: 0;
+            width: 100%!important;
+            font-size: 10px!important;
+            text-align: center;
+            color: rgb(153,169,189);
+        }
+        .loginInput:focus{
+            border: 2px dashed #458BF5;
+            color: #458BF5;
+        }
+        body{
+            background-color: #00173A;
+        }
+        .video-bg{position:absolute;top: 0;left:0;/* bottom: 0; */min-width: 100%;min-height: 100%;z-index:-9999;}
+    </style>
+</head>
+<video class="video-bg" autoplay loop muted><source th:src="@{img/yining/loginVideo.mp4}" type="video/mp4">
+</video>
+<body class="signin">
+    <div class="signinpanel">
+        <h4 class="hClass">
+            <img alt="[ 水务系统 ]" src="../static/img/yining/logo.png" th:src="@{/img/yining/logo.png}"
+             style="width: 821px;height: 76px">
+        </h4>
+        <div class="row" style="height: 500px;">
+            <div class="col-sm-7">
+                <div class="signin-info">
+                    <div class="logopanel m-b">
+                        <h1></h1>
+                    </div>
+                    <div class="m-b"></div>
+
+                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
+                </div>
+            </div>
+            <div class="col-sm-5" style="height: 500px;width:400px;position: absolute;right: 20%;">
+                <div class="divHead">
+                    <p>Hello～</p>
+                    <p style="font-weight: bold!important;font-size: 30px">欢迎您登录</p>
+                </div>
+                <form id="signupForm" autocomplete="off" style="height: 520px!important;width:380px;padding-top: 100px;border-radius:24px;background-color: rgb(197,214,232);">
+                        <p style="position: absolute;right: 40px;top: 10px;" onclick="qiehuan()">APP下载→</p>
+                        <img class="leftTwoIcon" alt="[ APP下载二维码 ]" th:src="${codeUrl}" src="https://140.246.183.164:9000/base/apply/apk"
+                             style="display: inline-block;vertical-align:middle;position: absolute;right: 20px;top: 10px;;margin-left: 1em;width: 20px;height: 20px" onclick="qiehuan()">
+                        <input style="border-radius: 12px!important;margin-top: 40px;margin-left:10px;margin-bottom: 20px;width: 300px;height: 56px!important;" type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
+                        <input style="border-radius: 12px!important; margin-bottom: 20px;margin-left:10px;width: 300px;height: 56px!important;" type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+                        <div class="row m-t" th:if="${captchaEnabled==true}" style="margin-bottom: 10px">
+                            <div class="col-xs-6">
+                                <input style="border-radius: 12px!important;margin-left:10px;width: 130px;height: 56px!important;" type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
+                            </div>
+                            <div class="col-xs-6">
+                                <a style="" href="javascript:void(0);" title="点击更换验证码">
+                                    <img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" style="border-radius: 12px;width: 135px;height: 56px"/>
+                                </a>
+                            </div>
+                        </div>
+                        <div class="checkbox-custom" style="width: 100%!important;margin-bottom: 15px;margin-left: 10px" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
+                            <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住密码</label>
+                            <a style="margin-left: 160px" href="javascript:void(0)"  onclick="forgetpassword()"  >忘记密码&raquo;</a></strong>
+                        </div>
+                        <button class="btn btn-success btn-block" style="border-radius: 12px!important;width: 300px!important;height:50px!important;margin-left: 10px;margin-top: 0;
+                                color: #FFFFFF!important;" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
+                </form>
+                <div class="divFoot">
+                    <div>
+                        由江苏长三角智慧水务提供技术支持<br>
+                    </div>
+                </div>
+
+                <form id="signupFormCode" autocomplete="off" style="display:none;height: 520px!important;width:380px;padding-top: 100px;border-radius:24px;background-color: rgb(197,214,232);">
+                    <p style="position: absolute;right: 40px;top: 10px;" onclick="qiehuan()">返回账密登录→</p>
+                    <img class="leftTwoIcon" alt="[ APP下载二维码 ]" th:src="${codeUrl}" src="https://140.246.183.164:9000/base/apply/apk"
+                         style="display: inline-block;vertical-align:middle;position: absolute;right: 45px;top: 100px;;margin-left: 1em;width: 300px;height: 320px" onclick="qiehuan()">
+                </form>
+            </div>
+        </div>
+    </div>.
+<script type="text/javascript">
+    var cordFlag = false;
+    function qiehuan() {
+        if(!cordFlag) {
+            $(".divHead").hide(100);
+            $("#signupForm").hide(100);
+            $("#divFoot").hide(100);
+
+            $("#signupFormCode").show(300);
+            cordFlag = true;
+        }else{
+            $(".divHead").show(300);
+            $("#signupForm").show(300);
+            $("#divFoot").show(300);
+
+            $("#signupFormCode").hide(100);
+            cordFlag = false;
+        }
+    }
+</script>
+</body>
+</html>

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

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<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/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="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"/>
+	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
+	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<th:block th:include="include :: header('首页')" />
+	<style type="text/css">
+		/* html,
+        html body {
+            height: 100%;
+            width: 100%;
+        } */
+		body {
+			margin: 0;
+			overflow: hidden;
+			background-color: #00173A;
+            /*background: url("/img/yining/testBack.png") no-repeat center fixed;*/
+            background-size: cover;
+		}
+
+		.test1 {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			left: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			overflow: hidden;
+			/*background: radial-gradient(#055fd1, #04345c, #001f34);*/
+			/*background: radial-gradient(rgb(0,84,72), rgb(3,41,71), rgb(3,27,64));*/
+			z-index: -9999;
+		}
+
+		.ifreamClass {
+			flex:0 0 1920px!important;
+			height: 1080px!important;
+			z-index: 1;
+		}
+	</style>
+</head>
+
+
+
+<body>
+	<div id="app" class="assembly-html-body" style="position:relative;height: 100%">
+		<div class="test1" style="position:absolute;z-index:2;">
+			<iframe id="iframeView" th:src="@{/system/mainYiningView}" frameborder="0" allowfullscreen="allowfullscreen"></iframe>
+		</div>
+	</div>
+	<script type="text/javascript">
+        function initScale() {
+            let clientWidth = document.body.clientWidth;
+            let num = clientWidth / 1920;
+
+            let  clientHeight = document.body.clientHeight;
+            let numHeight = clientHeight/1080;
+
+
+
+            let scaleNum = Math.min(num,numHeight).toFixed(2);
+
+            console.log(scaleNum);
+            $("#iframeView").addClass("ifreamClass");
+            $("#iframeView").css("transform","scale("+scaleNum+")");
+        }
+
+        initScale();
+	</script>
+</body>
+</html>

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

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!--360浏览器优先以webkit内核解析-->
+    <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"/>
+    <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
+    <script th:src="@{/js/jquery.min.js}"></script>
+</head>
+<style type="text/css">
+    body{
+        background: url("/img/yining/testBack.png") no-repeat center fixed;
+        background-size:1980px 100%;
+    }
+</style>
+<body>
+
+</body>
+</html>

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

@@ -0,0 +1,382 @@
+<!DOCTYPE html>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<!--360浏览器优先以webkit内核解析-->
+	<title></title>
+	<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"/>
+	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
+	<script th:src="@{/js/jquery.min.js}"></script>
+	<th:block th:include="include :: header('首页')" />
+	<style type="text/css">
+		body{
+			background-color: #00173A!important;
+		}
+		#mainTrueVideo{
+			position: fixed;
+			z-index: 9999;
+			/*-webkit-filter: grayscale(100%);*/
+		}
+		#mainYiningVideo{
+			position: fixed;
+			z-index: -9999;
+			/*-webkit-filter: grayscale(100%);*/
+		}
+		.aInput {
+			position: relative;
+			color: rgba(255,255,255,1);
+			text-decoration: none;
+			background-color: rgba(60,141,188,1);
+			font-family: 'Yanone Kaffeesatz';
+			/*font-weight: 700;*/
+			/*font-size: 2em;*/
+			display: block;
+			padding: 4px;
+			-webkit-border-radius: 20px;
+			-moz-border-radius: 20px;
+			border-radius: 20px;
+			-webkit-box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			-moz-box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			margin: 20px auto;
+			width: 60px;
+			height: 60px;
+			text-align: center;
+
+			-webkit-transition: all .1s ease;
+			-moz-transition: all .1s ease;
+			-ms-transition: all .1s ease;
+			-o-transition: all .1s ease;
+			transition: all .1s ease;
+		}
+
+		.aInput:active {
+			-webkit-box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			-moz-box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			position: relative;
+			top: 6px;
+		}
+		.hClass{
+			position:fixed;
+			left:33%;
+			transform: translateY(100px);
+			font-size: 25px;
+			animation: myanimation 2s;
+			animation-iteration-count: 1;
+		}
+		@keyframes myanimation {
+			0%{
+				transform: translateY(-100px);
+			}
+			100%{
+				transform: translateY(100px);
+			}
+		}
+	</style>
+</head>
+
+
+
+<body class="gray-bg">
+<h4 class="hClass">
+	<img id="logImg" alt="[ 水务系统 ]" src="../static/img/yining/logo.png" th:src="@{/img/yining/logo.png}"
+		 style="width: 100%;height: 60px;">
+</h4>
+<video src="mainTrue.mp4" th:src="@{/mainTrue.mp4}" id="mainTrueVideo" width="100%" height="100%" autoplay="autoplay" loop="loop" muted="muted">
+</video>
+<video src="mainYining.mp4" th:src="@{/mainYining.mp4}" id="mainYiningVideo" width="100%" height="100%" autoplay="autoplay" loop="loop" muted="muted">
+</video>
+<div class="leftAllLine">
+	<div class="leftMenuMedLine"></div>
+	<div class="leftMenuLeftLine"></div>
+</div>
+<div class="rightAllLine">
+	<div class="rightMenuMedLine"></div>
+	<div class="rightMenuLeftLine"></div>
+</div>
+<div style="z-index: 9999!important;" class="leftMenu">
+</div>
+<div style="z-index: 9999!important;" class="rightMenu">
+</div>
+<div class="topDiv">
+    <a style="" id="showMenuEsc" onclick="showMenuEsc()" title="模式切换"><i class="fa fa-cog" style="color:#FFFFFF!important;font-size: 30px!important;"></i></a>
+</div>
+<div class="bottomDiv"></div>
+<div class="container-div" style="z-index: 99999">
+	<div id="contentDiv" style="position: absolute;top: 20%;width: 100%;height: 700px;">
+		<div style="display: none" class="leftOneDiv">
+			<div class="leftOneTopLine"></div>
+			<div>
+				<p style="line-height: 6em;padding-left: 1em;display: inline-block;">基础支撑系统</p>
+				<img class="leftOneIcon" alt="[ 基础支撑系统 ]" src="../static/img/yining/icon/基础支撑系统,未选中.png" th:src="@{/img/yining/icon/基础支撑系统,未选中.png}"
+							 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">
+			</div>
+			<div class="leftOneBottomLine"></div>
+		</div>
+		<div style="display: none" class="leftTwoDiv">
+			<div class="leftTwoTopLine"></div>
+			<div>
+				<p style="line-height: 6em;display: inline-block;">智慧管网系统</p>
+				<img class="leftTwoIcon" alt="[ 智慧管网系统 ]" src="../static/img/yining/icon/智慧生产系统,未选中.png" th:src="@{/img/yining/icon/智慧生产系统,未选中.png}"
+					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">
+			</div>
+			<div class="leftTwoBottomLine"></div>
+		</div>
+		<div style="display: none" class="leftThreeDiv">
+			<div class="leftThreeTopLine"></div>
+			<div>
+				<p style="line-height: 6em;padding-left: 1em;display: inline-block;">智慧办公系统</p>
+				<img class="leftThreeIcon" alt="[ 智慧办公系统 ]" src="../static/img/yining/icon/智慧管网系统,未选中.png" th:src="@{/img/yining/icon/智慧管网系统,未选中.png}"
+					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">
+			</div>
+			<div class="leftThreeBottomLine"></div>
+		</div>
+		<div style="display: none" class="rightOneDiv">
+			<div class="rightOneTopLine"></div>
+			<div>
+				<img class="rightOneIcon" alt="[ 智慧生产系统 ]" src="../static/img/yining/icon/智慧营业系统,未选中.png" th:src="@{/img/yining/icon/智慧营业系统,未选中.png}"
+					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 4em;">
+				<p style="line-height: 6em;position:absolute;left:8em;display: inline-block;">智慧生产系统</p>
+			</div>
+			<div class="rightOneBottomLine"></div>
+		</div>
+		<div style="display: none" class="rightTwoDiv">
+			<div class="rightTwoTopLine"></div>
+			<div>
+				<img class="rightTwoIcon" alt="[ 智慧客服系统 ]" src="../static/img/yining/icon/智慧客服系统,未选中.png" th:src="@{/img/yining/icon/智慧客服系统,未选中.png}"
+					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 2em">
+				<p style="line-height: 6em;position:absolute;left:6em;display: inline-block;">智慧客服系统</p>
+			</div>
+			<div class="rightTwoBottomLine"></div>
+		</div>
+		<div style="display: none" class="rightThreeDiv">
+			<div class="rightThreeTopLine"></div>
+			<div>
+				<img class="rightThreeIcon" alt="[ 水质实验室 ]" src="../static/img/yining/icon/智慧办公系统,未选中.png" th:src="@{/img/yining/icon/智慧办公系统,未选中.png}"
+					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 4em">
+				<p style="line-height: 6em;position:absolute;left:8em;display: inline-block;">水质实验室</p>
+			</div>
+			<div class="rightThreeBottomLine"></div>
+		</div>
+		<div class="centerDiv"></div>
+	</div>
+</div>
+<script th:inline="javascript">
+	//TODO 逻辑解释:
+    //第一段视频放到第4秒的时候，就可以降低透明度了
+	//第一段视频放到第4秒时，降低透明度，再过1秒后透明度降到0。
+    $("#mainTrueVideo").css("z-index", "-10000");
+    $("#mainYiningVideo").css("z-index","-10001");
+    $(".leftOneDiv").show(500);
+    $(".leftTwoDiv").show(500);
+    $(".leftThreeDiv").show(500);
+    $(".rightOneDiv").show(500);
+    $(".rightTwoDiv").show(500);
+    $(".rightThreeDiv").show(500);
+    setTimeout(function () {
+        console.log("4秒钟到了");
+        $("#mainTrueVideo").css("opacity", "0.5");
+        setTimeout(function () {
+            $("#mainTrueVideo").css("opacity", "0");
+            $("#mainYiningVideo").css("z-index","-9998");
+        },1000);
+    }, 4000);
+
+	var sessionId = [[${sessionId}]];
+	function opennewpage(url) {
+
+		// window.location.href=url;
+
+		if(url.indexOf("?")>0) {
+            url = url + "&" + "reqid=" + sessionId;
+        }else{
+		    url = url + "?"+"reqid=" + sessionId;
+		}
+
+
+		console.log(url)
+
+		window.open(url)
+		// console.log(danganLoginName)
+		//
+		// console.log(sessionId)
+
+
+
+	}
+
+		//TODO div与空白处点击事件
+		$(".leftOneDiv").hover(function() {
+            var list = [[${leftOneList}]];
+            $(".leftAllLine").animate({left:'20px'},100);
+            $(".leftAllLine").find(".leftMenuLeftLine").hide();
+            $(".leftMenu").animate({width:'424px',opacity:'1'},100);
+            $(".leftMenu").empty();
+            $(".leftMenu").append("<div class='leftMenuLeftLine'></div>" +
+				"<div class='leftMenuRightLine'></div>");
+            let strHtml = "<ul class='menuUl'>";
+            list.forEach(function (e) {
+                strHtml += "<li class='menuUlLi'><span onclick='opennewpage(\""+e.danganUrl+"\")'>" + e.danganName + "</span></li>";
+            });
+            strHtml += "</ul>";
+            $(".leftMenu").append(strHtml);
+            ulClass();
+        });
+		$(".leftTwoDiv").hover(function() {
+			var list = [[${leftTwoList}]];
+            $(".leftAllLine").animate({left:'20px'},100);
+            $(".leftAllLine").find(".leftMenuLeftLine").hide();
+            $(".leftMenu").animate({width:'424px',opacity:'1'},100);
+            $(".leftMenu").empty();
+            $(".leftMenu").append("<div class='leftMenuLeftLine'></div>" +
+                "<div class='leftMenuRightLine'></div>");
+			let strHtml = "<ul class='menuUl'>";
+			list.forEach(function (e) {
+				strHtml += "<li class='menuUlLi'><span onclick='opennewpage(\""+e.danganUrl+"\")'>" + e.danganName + "</span></li>";
+			});
+			strHtml += "</ul>";
+			$(".leftMenu").append(strHtml);
+			ulClass();
+		});
+		$(".leftThreeDiv").hover(function() {
+			var list = [[${leftThreeList}]];
+            $(".leftAllLine").animate({left:'20px'},100);
+            $(".leftAllLine").find(".leftMenuLeftLine").hide();
+            $(".leftMenu").animate({width:'424px',opacity:'1'},100);
+            $(".leftMenu").empty();
+            $(".leftMenu").append("<div class='leftMenuLeftLine'></div>" +
+                "<div class='leftMenuRightLine'></div>");
+			let strHtml = "<ul class='menuUl'>";
+			list.forEach(function(e) {
+				strHtml += "<li class='menuUlLi'><span onclick='opennewpage(\""+e.danganUrl+"\")'>"+e.danganName+"</span></li>";
+			});
+			strHtml += "</ul>";
+			$(".leftMenu").append(strHtml);
+            ulClass();
+		});
+		$(".rightOneDiv").hover(function() {
+			var list = [[${rightOneList}]];
+            $(".rightAllLine").animate({right:'20px'},100);
+            $(".rightAllLine").find(".rightMenuLeftLine").hide();
+            $(".rightMenu").animate({width:'424px',opacity:'1'},100);
+            $(".rightMenu").empty();
+            $(".rightMenu").append("<div class='rightMenuLeftLine'></div>" +
+                "<div class='rightMenuRightLine'></div>");
+			let strHtml = "<ul class='menuUlRight'>";
+			list.forEach(function (e) {
+				strHtml += "<li class='menuUlLiRight'><span onclick='opennewpage(\""+e.danganUrl+"\")'>" + e.danganName + "</span></li>";
+			});
+			strHtml += "</ul>";
+			$(".rightMenu").append(strHtml);
+            ulRightClass();
+    	});
+		$(".rightTwoDiv").hover(function() {
+			var list = [[${rightTwoList}]];
+            $(".rightAllLine").animate({right:'20px'},100);
+            $(".rightAllLine").find(".rightMenuLeftLine").hide();
+            $(".rightMenu").animate({width:'424px',opacity:'1'},100);
+            $(".rightMenu").empty();
+            $(".rightMenu").append("<div class='rightMenuLeftLine'></div>" +
+                "<div class='rightMenuRightLine'></div>");
+			let strHtml = "<ul class='menuUlRight'>";
+			list.forEach(function(e) {
+				strHtml += "<li class='menuUlLiRight'><span onclick='opennewpage(\""+e.danganUrl+"\")'>"+e.danganName+"</span></li>";
+			});
+			strHtml += "</ul>";
+			$(".rightMenu").append(strHtml);
+            ulRightClass();
+		});
+		$(".rightThreeDiv").hover(function() {
+			var list = [[${rightThreeList}]];
+            $(".rightAllLine").animate({right:'20px'},100);
+            $(".rightAllLine").find(".rightMenuLeftLine").hide();
+            $(".rightMenu").animate({width:'424px',opacity:'1'},100);
+            $(".rightMenu").empty();
+            $(".rightMenu").append("<div class='rightMenuLeftLine'></div>" +
+                "<div class='rightMenuRightLine'></div>");
+			let strHtml = "<ul class='menuUlRight'>";
+			list.forEach(function(e) {
+				strHtml += "<li class='menuUlLiRight'><span onclick='opennewpage(\""+e.danganUrl+"\")'>"+e.danganName+"</span></li>";
+			});
+			strHtml += "</ul>";
+			$(".rightMenu").append(strHtml);
+            ulRightClass();
+		});
+
+    	$(".leftMenu").mouseover(function () {
+            $(".leftMenu").show();
+        });
+    	$(".rightMenu").mouseover(function () {
+            $(".rightMenu").show();
+        });
+
+        $(".centerDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+        });
+		$(".topDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+		});
+		$(".bottomDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+		});
+
+		function ulClass() {
+            $(".menuUlLi").hover(function () {
+                $(this).find("img").remove();
+                $(this).find("span").after("<img  src=\"/img/yining/选中右侧.png\" style='width: 30px;height: 30px;'>")
+                $(this).find("span").before("<img  src=\"/img/yining/选中左侧.png\" style='width: 30px;height: 30px;'>")
+            },function () {
+                $(this).find("img").remove();
+            });
+        }
+		
+        function ulRightClass() {
+            $(".menuUlLiRight").hover(function () {
+                $(this).find("img").remove();
+                $(this).find("span").after("<img  src=\"/img/yining/选中右侧.png\" style='width: 30px;height: 30px;'>")
+                $(this).find("span").before("<img  src=\"/img/yining/选中左侧.png\" style='width: 30px;height: 30px;'>")
+            },function () {
+                $(this).find("img").remove();
+            });
+        }
+
+		var menuFlag = top.window.tagMenu;
+        function showMenuEsc(){
+            //传入window顶级节点
+            top.window.tagObj();
+            if(!menuFlag){
+                // $("#showMenuEsc").show();
+            }else{
+                // $("#showMenuEsc").hide();
+            }
+		}
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/dangan/add.html

@@ -328,6 +328,12 @@
                     </div>
                 </div>
                 <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">菜单名：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" type="text" name="menuName">
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="row">

ruoyi-admin/src/main/resources/templates/system/dangan/edit.html

@@ -324,6 +324,12 @@
                     </div>
                 </div>
                 <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">菜单名：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" type="text" name="menuName" th:field="*{menuName}">
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="row">

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

@@ -73,19 +73,19 @@
 		            align: "left"
 		        },
 
-					{
-						field: 'province',
-						title: '行政区划',
-						align: "left",
-						formatter: function(value, row, index) {
-							if(row.province!=null){
-								return row.province+","+row.city+","+row.town;
-							}else{
-								return null;
-							}
-
-						}
-					},
+					// {
+					// 	field: 'province',
+					// 	title: '行政区划',
+					// 	align: "left",
+					// 	formatter: function(value, row, index) {
+					// 		if(row.province!=null){
+					// 			return row.province+","+row.city+","+row.town;
+					// 		}else{
+					// 			return null;
+					// 		}
+                    //
+					// 	}
+					// },
 					{
 						field: 'deptType',
 						title: '机构类型',

ruoyi-admin/src/main/resources/templates/system/forgetPassword/add.html

@@ -34,7 +34,7 @@
             </div>
 
 
-            <button onclick="submitHandler()" class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍后...">提交</button>
+            <!--<button onclick="submitHandler()" class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍后...">提交</button>-->
 
 
 
@@ -82,7 +82,10 @@
         function submitHandler() {
             console.log(1111)
             if ($.validate.form()) {
+                $.modal.loading("加载中，请稍候...");
                 $.operate.save(prefix + "/addSave", $('#form-forgetPassword-add').serialize());
+                $.modal.closeLoading();
+                $.modal.close();//关闭当前窗口
             }
         }
 

ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -36,10 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND invoke_target like concat('%', #{invokeTarget}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+				and create_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+				and create_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 			</if>
 		</where>
 	</select>

ruoyi-system/src/main/java/com/ruoyi/system/domain/Dangan.java

@@ -161,6 +161,17 @@ public class Dangan extends BaseEntity
 
     private String iconPath;
 
+    //TODO 伊宁专用字段
+    private String menuName;//菜单名
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
     public Integer getOrd() {
         return ord;
     }

ruoyi-system/src/main/resources/mapper/system/ApplyMapper.xml

@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealStatus != null  and dealStatus != ''"> and a.deal_status = #{dealStatus}</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND to_date(a.apply_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+                AND a.apply_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND to_date(a.apply_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+                AND a.apply_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
             </if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/DanganMapper.xml

@@ -46,13 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="ord"    column="ord"    />
+        <result property="menuName"    column="menu_name"    />
     </resultMap>
 
     <sql id="selectDanganVo">
         select dangan_id,
         key_id,
         dangan_no,dangan_name, status,
-         sys_person, file_type, model, project_id, brand, run_device_id, relate_device_id, maintain_item_id, factory_time, project_time, use_unit, medium, maintain_time, page_address, test_address, build_factory, build_factory_time, factory_person, factory_person_phone, language, server_ip, server_location, server_info, server_based_yes_no, ops_person, charge_unit, mode, file_info,icon_info, create_by, create_time, update_by, update_time, remark,ord from sys_dangan
+         sys_person, file_type, model, project_id, brand, run_device_id, relate_device_id, maintain_item_id, factory_time, project_time, use_unit, medium, maintain_time, page_address, test_address, build_factory, build_factory_time, factory_person, factory_person_phone, language, server_ip, server_location, server_info, server_based_yes_no, ops_person, charge_unit, mode, file_info,icon_info, create_by, create_time, update_by, update_time, remark,ord,menu_name from sys_dangan
     </sql>
 
     <select id="selectDanganList" parameterType="Dangan" resultMap="DanganResult">
@@ -93,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileInfo != null  and fileInfo != ''"> and file_info = #{fileInfo}</if>
             <if test="iconInfo != null  and iconInfo != ''"> and icon_info = #{iconInfo}</if>
             <if test="ord != null  and ord != ''"> and ord = #{ord}</if>
+            <if test="menuName != null  and menuName != ''"> and menu_name = #{menuName}</if>
         </where>
     </select>
     
@@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="ord != null">ord,</if>
+            <if test="menuName != null">menu_name</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="danganName != null">#{danganName},</if>
@@ -186,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="ord != null">#{ord},</if>
+            <if test="menuName != null">#{menuName}</if>
          </trim>
     </insert>
 
@@ -232,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="ord != null">ord = #{ord},</if>
+            <if test="menuName != null">menu_name = #{menuName}</if>
         </trim>
         where dangan_id = #{danganId}
     </update>

ruoyi-system/src/main/resources/mapper/system/FeedbackMapper.xml

@@ -40,10 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackTime != null "> and f.feedback_time = #{feedbackTime}</if>
             <if test="status != null  and status != ''"> and f.status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND to_date(f.feedback_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+                AND f.feedback_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND to_date(f.feedback_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+                AND f.feedback_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
             </if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/ForgetPasswordMapper.xml

@@ -39,10 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null "> and p.apply_time = #{applyTime}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND to_date(p.apply_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+                AND p.apply_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND to_date(p.apply_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+                AND p.apply_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
             </if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND config_key like concat('%', #{configKey}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+				and create_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+				and create_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 			</if>
 		</where>
     </select>

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -33,10 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+				and create_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and to_date(create_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+				and create_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 			</if>
 	    </where>
 	</select>

ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -34,10 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND login_name like concat('%', #{loginName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and to_date(login_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+				and login_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and to_date(login_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+				and login_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 			</if>
 		</where>
 	</select>

ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -55,10 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND oper_name like concat('%', #{operName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and to_date(oper_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+				and oper_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and to_date(oper_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+				and oper_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 			</if>
 		</where>
 	</select>

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -52,10 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND r.data_scope = #{dataScope}
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and to_date(r.create_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+			and r.create_time &gt;= to_timestamp(#{params.beginTime,'YYYY-MM-DD')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and to_date(r.create_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+			and r.create_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 		</if>
 		<!-- 数据范围过滤 -->
 		 ${params.dataScope}

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -80,10 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND to_date(u.create_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+			AND u.create_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND to_date(u.create_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+			AND u.create_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
 		</if>
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE #{deptId}::VARCHAR = ANY (string_to_array(ancestors, ','))))

ruoyi-system/src/main/resources/mapper/system/UserRelateMapper.xml

@@ -56,10 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and ur.status = #{status}</if>
             <if test="relateTime != null "> and ur.relate_time = #{relateTime}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND to_date(ur.relate_time,'YY-MM-DD') &gt;= to_date(#{params.beginTime},'YY-MM-DD')
+                AND ur.relate_time &gt;= to_timestamp(#{params.beginTime},'YYYY-MM-DD')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND to_date(ur.relate_time,'YY-MM-DD') &lt;= to_date(#{params.endTime},'YY-MM-DD')
+                AND ur.relate_time &lt;= to_timestamp(#{params.endTime},'YYYY-MM-DD')
             </if>
         </where>
         order by d.ord