From e841378f0e2bbfe7b448622bde52713ee8140f12 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期三, 17 四月 2024 11:43:31 +0800
Subject: [PATCH] 通用版本V1.6  注: 修复用户验证,新增默认增加用户,展示所有导航

---
 src/main/java/com/hxzk/controller/UserController.java           |   23 +++++++
 src/main/webapp/HouTai/User/User.jsp                            |   97 ++++++++++++++++++++++++++------
 src/main/java/com/hxzk/controller/DaoHangController.java        |    2 
 src/main/webapp/Home/HomeJs/images/perMsg.png                   |    0 
 src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java     |    6 ++
 src/main/java/com/hxzk/service/impl/DaoHangUserServiceImpl.java |    6 ++
 src/main/webapp/Home/HomeImg/perMsg.png                         |    0 
 src/main/java/com/hxzk/service/DaoHangUserService.java          |    2 
 src/main/webapp/Home/Home.jsp                                   |    2 
 src/main/java/com/hxzk/service/TbDaoHangService.java            |    2 
 10 files changed, 119 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/hxzk/controller/DaoHangController.java b/src/main/java/com/hxzk/controller/DaoHangController.java
index c9dd7e9..b283d7d 100644
--- a/src/main/java/com/hxzk/controller/DaoHangController.java
+++ b/src/main/java/com/hxzk/controller/DaoHangController.java
@@ -44,6 +44,8 @@
         return resultutil.returnSuccess(cz.getTotal(), cz.getList());
     }
 
+
+
     //鑾峰彇缁欑敤鎴疯缃殑瀵艰埅淇℃伅
     @PostMapping("UpUserDaoHang")
     public void upUserDaoHang(String menuTests,String username){
diff --git a/src/main/java/com/hxzk/controller/UserController.java b/src/main/java/com/hxzk/controller/UserController.java
index 21f7131..180a21d 100644
--- a/src/main/java/com/hxzk/controller/UserController.java
+++ b/src/main/java/com/hxzk/controller/UserController.java
@@ -56,6 +56,11 @@
     @Autowired
     SmsLogService smsLogService;
 
+    @Autowired
+    TbDaoHangService daoHangService;
+    @Autowired
+    DaoHangUserService daoHangUserService;
+
 
     @Autowired
     SystemLogService systemLogService;
@@ -145,7 +150,7 @@
     }
 
     @PostMapping("addUser")
-    public void addUser(TbUser user,HttpServletResponse response,String caozuoName) throws IOException {
+    public int addUser(TbUser user,HttpServletResponse response,String caozuoName) throws IOException {
         user.setTime(gettime());
         if (user.getUadd() == null || user.getUadd() ==  ""){
             user.setUadd("No");
@@ -174,7 +179,21 @@
         systemOperationLog.setTime(gettime());
         systemOperationLog.setContent("娣诲姞浜嗕竴涓敤鎴�,璇ョ敤鎴蜂负锛�"+user.getUsername());
         systemLogService.insertSystem(systemOperationLog);
-        response.sendRedirect("/hxzkuwb/HouTai/User/User.jsp");
+        //缁欒鐢ㄦ埛璁剧疆榛樿鏌ョ湅鎵�鏈夊鑸�
+        List<TbDaohang> daohangs = daoHangService.findAll();
+        for (int i = 0 ; i < daohangs.size();i++){
+            TbDaohangUser daohangUser = new TbDaohangUser();
+            daohangUser.setSrc(daohangs.get(i).getSrc());
+            daohangUser.setIshow("1");
+            daohangUser.setParent(daohangs.get(i).getParent());
+            daohangUser.setParents(daohangs.get(i).getParents());
+            daohangUser.setName(daohangs.get(i).getName());
+            daohangUser.setLevel(daohangs.get(i).getLevel());
+            daohangUser.setIcon(daohangs.get(i).getIcon());
+            daohangUser.setUsername(user.getUsername());
+            daoHangUserService.UserAdd(daohangUser);
+        }
+        return 1;
     }
     @PostMapping("updateUser")
     public void updateUser(TbUser user,HttpServletResponse response) throws IOException {
diff --git a/src/main/java/com/hxzk/service/DaoHangUserService.java b/src/main/java/com/hxzk/service/DaoHangUserService.java
index 5c6e68c..7086883 100644
--- a/src/main/java/com/hxzk/service/DaoHangUserService.java
+++ b/src/main/java/com/hxzk/service/DaoHangUserService.java
@@ -8,4 +8,6 @@
     void addDaoHangUser(TbDaohangUser daohangUser);
 
     void deleteDaoHangUser(TbDaohangUser daohangUser);
+
+    void UserAdd(TbDaohangUser daohangUser);
 }
diff --git a/src/main/java/com/hxzk/service/TbDaoHangService.java b/src/main/java/com/hxzk/service/TbDaoHangService.java
index d20b945..06a6160 100644
--- a/src/main/java/com/hxzk/service/TbDaoHangService.java
+++ b/src/main/java/com/hxzk/service/TbDaoHangService.java
@@ -24,4 +24,6 @@
 
     List<MenuTest> findUserDaoHang(String username);
 
+
+    List<TbDaohang> findAll();
 }
diff --git a/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java b/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
index d955d83..0df4509 100644
--- a/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
@@ -127,4 +127,10 @@
         }
         return menuTests;
     }
+
+    @Override
+    public List<TbDaohang> findAll() {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectList(queryWrapper);
+    }
 }
diff --git a/src/main/java/com/hxzk/service/impl/DaoHangUserServiceImpl.java b/src/main/java/com/hxzk/service/impl/DaoHangUserServiceImpl.java
index 0bf8dc7..712acbf 100644
--- a/src/main/java/com/hxzk/service/impl/DaoHangUserServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/DaoHangUserServiceImpl.java
@@ -21,4 +21,10 @@
         queryWrapper.eq("username",daohangUser.getUsername());
         baseMapper.delete(queryWrapper);
     }
+
+    @Override
+    public void UserAdd(TbDaohangUser daohangUser) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        baseMapper.insert(daohangUser);
+    }
 }
diff --git a/src/main/webapp/Home/Home.jsp b/src/main/webapp/Home/Home.jsp
index ebced23..5a9a5f1 100644
--- a/src/main/webapp/Home/Home.jsp
+++ b/src/main/webapp/Home/Home.jsp
@@ -828,7 +828,7 @@
     function Qh1(){
         mapess++;
         $("#maps").empty();
-        $("#maps").append('<li class="MapType" onclick="inits()" style="cursor: pointer;font-size: 12px;width: 100px;display: inline-block;color: '+data[0].color+'"><a href="javascript:;" style="font-size: 12px;cursor:pointer;color: '+data[0].color+'" title=""><img src="/hxzkuwb/Icon/GIS鍦板浘.png" width="55"><br><span style="color: #07F4F6">鐧惧害鍦板浘</span></a></li>')
+        $("#maps").append('<li class="MapType" onclick="inits()" style="cursor: pointer;font-size: 12px;width: 100px;display: inline-block;color: '+data[0].color+'"><a href="javascript:;" style="font-size: 12px;cursor:pointer;color: '+data[0].color+'" title=""><img src="/hxzkuwb/Icon/GIS鍦板浘.png" style="width: 40%"><br><span style="color: #07F4F6">鐧惧害鍦板浘</span></a></li>')
         $(".qhWeiLan").css("display","none");
         $("#ditu2").hide();
         $("#ChaXuns").hide();
diff --git a/src/main/webapp/Home/HomeImg/perMsg.png b/src/main/webapp/Home/HomeImg/perMsg.png
new file mode 100644
index 0000000..f2eef13
--- /dev/null
+++ b/src/main/webapp/Home/HomeImg/perMsg.png
Binary files differ
diff --git a/src/main/webapp/Home/HomeJs/images/perMsg.png b/src/main/webapp/Home/HomeJs/images/perMsg.png
new file mode 100644
index 0000000..9e9184d
--- /dev/null
+++ b/src/main/webapp/Home/HomeJs/images/perMsg.png
Binary files differ
diff --git a/src/main/webapp/HouTai/User/User.jsp b/src/main/webapp/HouTai/User/User.jsp
index cbe96ec..43592bf 100644
--- a/src/main/webapp/HouTai/User/User.jsp
+++ b/src/main/webapp/HouTai/User/User.jsp
@@ -22,12 +22,12 @@
         </div>
     </div>
     <div class="add" style="display: none;width: 600px;background-color: #f6f6f6;border: 1px solid #cccccc;padding: 50px;position: fixed;top: 50px;left: 450px;z-index: 99999">
-        <form class="layui-form" action="/hxzkuwb/addUser" method="post" lay-filter="example" onsubmit="return checkup()">
+        <form class="layui-form" action="javascript:;" method="post" lay-filter="example">
             <input type="hidden" id="caozuoName" name="caozuoName"/>
             <div class="layui-form-item">
                 <label class="layui-form-label">鐢ㄦ埛鍚�</label>
                 <div class="layui-input-block">
-                    <input type="text"  lay-verify="title" name="username" required autocomplete="off" id="UserName"  class="layui-input">
+                    <input type="text"  lay-verify="title" name="username"  required autocomplete="off" id="UserName"  class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
@@ -69,7 +69,7 @@
             </div>
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="" id="baocun">绔嬪嵆鎻愪氦</button>
+                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="" onclick="addUser()" id="baocun">绔嬪嵆鎻愪氦</button>
                     <button type="button" class="layui-btn layui-btn-normal" lay-filter="" onclick="quxiao()"  style="margin-left: 200px">鍙栨秷</button>
                 </div>
             </div>
@@ -199,12 +199,15 @@
     })
 
 
-    function checkup(){
+    function addUser(){
         var flag = true;
-        var personName = $("#UserName").val();
+        var personName = $("#UserName").val();//鐢ㄦ埛鍚�
         var pattern = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/;
-        var password = $("#password").val();
-        var phone = $("#phone").val();
+        var password = $("#password").val();//瀵嗙爜
+        var phone = $("#phone").val();  //鐢佃瘽
+        var gsmc = $("#gsmc").val();    //鍏徃鍚嶇О
+        var juese = $("#js").val();    //瑙掕壊
+        var caozuoName = $("#caozuoName").val();
         var data = "name="+personName;
         var dats = "phone="+phone
         $.ajax({
@@ -212,20 +215,22 @@
             data:dats,
             async:false,
             success:function (data){
-               if (data!=""){
-                   layer.msg("褰撳墠杈撳叆鐨勬墜鏈哄彿宸茬粡瀛樺湪锛佽鏇存崲鎵嬫満鍙枫��")
-                   flag = false;
-               }
-               if (phone.length != 11){
-                   layer.msg("褰撳墠杈撳叆鐨勬墜鏈哄彿鐮佷笉姝g‘锛佽閲嶆柊杈撳叆銆�")
-                   flag = false;
-               }
+                if (data!=""){
+                    layer.msg("褰撳墠杈撳叆鐨勬墜鏈哄彿宸茬粡瀛樺湪锛佽鏇存崲鎵嬫満鍙枫��")
+                    flag = false;
+                }
+                if (phone.length != 11){
+                    layer.msg("褰撳墠杈撳叆鐨勬墜鏈哄彿鐮佷笉姝g‘锛佽閲嶆柊杈撳叆銆�")
+                    flag = false;
+                }
             }
         })
+
         if (!pattern.test(password)){
             flag = false;
             layer.msg("瀵嗙爜璁剧疆蹇呴』鍖呭惈鏁板瓧鍜屽瓧姣嶅苟涓斾笉鑳藉皬浜�8浣�")
         }
+
         $.ajax({
             url: "/hxzkuwb/findNameUser",
             data: data,
@@ -234,12 +239,68 @@
                 if (data > 0) {
                     layer.msg('褰撳墠鐢ㄦ埛宸茬粡瀛樺湪锛佽閲嶆柊娣诲姞銆�');
                     flag = false;
-                }else{
-                    flag = true;
                 }
             }
         });
-        return flag
+
+        // 鑾峰彇鎵�鏈夊悕涓� "fruits" 鐨勫閫夋
+        const uadd1 = document.querySelectorAll('input[name="uadd"]:checked');
+        const uupdate1 = document.querySelectorAll('input[name="uupdate"]:checked');
+        const udelete1 = document.querySelectorAll('input[name="udelete"]:checked');
+        const ujoin1 = document.querySelectorAll('input[name="ujoin"]:checked');
+
+// 鍒涘缓绌烘暟缁勬潵瀛樺偍閫変腑鐨勫��
+        var uadd;
+        var uupdate;
+        var udelete;
+        var ujoin;
+
+// 閬嶅巻閫変腑鐨勫閫夋骞跺皢鍏跺�兼坊鍔犲埌瀵瑰簲鐨勬暟缁勪腑
+        uadd1.forEach((checkbox) => {
+            uadd= checkbox.value;
+        });
+
+        uupdate1.forEach((checkbox) => {
+            uupdate= checkbox.value;
+        });
+
+        udelete1.forEach((checkbox) => {
+            udelete= checkbox.value;
+        });
+        ujoin1.forEach((checkbox) => {
+            ujoin= checkbox.value;
+        });
+// 杈撳嚭閫変腑鐨勫��
+        if (uadd == undefined){
+            uadd = ""
+        }
+        if (uupdate == undefined){
+            uupdate = ""
+        }
+        if (udelete == undefined){
+            udelete = ""
+        }
+        if (ujoin == undefined){
+            ujoin = ""
+        }
+        console.log(flag)
+        if (flag){
+            var data = "uadd="+uadd+"&uupdate="+uupdate+"&udelete="+udelete+"&ujoin="+ujoin+"&caozuoName="+caozuoName+"&username="+personName+"&password="+password+"&phone="+phone+"&company="+gsmc+"&juese="+juese
+            $.ajax({
+                url: "/hxzkuwb/addUser",
+                type:"post",
+                data: data,
+                async: false, // Setting async to false makes the request synchronous
+                success: function (data) {
+                    if (data == 1) {
+                        layer.msg('鎻愪氦鎴愬姛')
+                        setTimeout(function (){
+                            location.reload();
+                        },1000)
+                    }
+                }
+            });
+        }
     }
 
 

--
Gitblit v1.10.0