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/service/impl/DaoHangServiceImpl.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java b/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
index 7eb400b..0df4509 100644
--- a/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/DaoHangServiceImpl.java
@@ -6,6 +6,7 @@
 import com.github.pagehelper.PageInfo;
 import com.hxzk.mapper.DaoHangDao;
 import com.hxzk.pojo.*;
+import com.hxzk.service.DaoHangUserService;
 import com.hxzk.service.TbDaoHangService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,13 +20,15 @@
     @Autowired
     DaoHangDao daoHangDao;
 
+    @Autowired
+    DaoHangUserService daoHangUserService;
+
     @Override
-    public Init findDaoHangAll() {
+    public Init findDaoHangAll(String username) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        List<TbDaohang> daohangs = baseMapper.selectList(queryWrapper);
-        queryWrapper.eq("level","1");
-        queryWrapper.eq("ishow","1");
-        List<TbDaohang> Yidaohang = baseMapper.selectList(queryWrapper);
+        List<TbDaohang> daohangs = daoHangDao.find1(username);
+        System.out.println(daohangs);
+        List<TbDaohang> Yidaohang = daoHangDao.find2(username);
         Init init = new Init();
         homeInfo homeInfo = new homeInfo();
         homeInfo.setTitle("绠＄悊鍚庡彴");
@@ -37,8 +40,8 @@
         menuInfo.setHref("");
         menuInfo.setTarget("_self");
         init2 init2 = new init2();
-        init2.setHref(daohangs.get(0).getSrc());
-        init2.setTitle("<img src=../Icon/"+daohangs.get(0).getIcon()+" style=width:25px>&nbsp;"+daohangs.get(0).getName());
+        init2.setHref("../Home/Home.jsp");
+        init2.setTitle("<img src=../Icon/棣栭〉澶у睆.png style=width:25px>&nbsp;棣栭〉澶у睆");
         init2.setTarget("_blank");
         List child = new ArrayList<>();
         child.add(init2);
@@ -48,10 +51,7 @@
             //濡傛灉鏄竴绾ц彍鍗曪紝鍒欎笉娣诲姞璺宠浆鍔熻兘
                 init3.setTitle("<img src=../Icon/" + Yidaohang.get(i).getIcon() + " style=width:25px>&nbsp;" + Yidaohang.get(i).getName());                //鏍规嵁parent 鏌ヨ瀛愮骇鑿滃崟
                 List<TbDaohang> ErDaohang = new ArrayList<>();
-                QueryWrapper queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("parents",Yidaohang.get(i).getParent());
-                queryWrapper1.eq("ishow","1");
-                ErDaohang = baseMapper.selectList(queryWrapper1);
+                ErDaohang = daoHangDao.find3(Yidaohang.get(i).getParent(),username);
                 List<init2> ziint = new ArrayList<>();
                 for (int j = 0 ; j <ErDaohang.size();j++){
                     init2 ziji = new init2();
@@ -97,4 +97,40 @@
     public void UpDaoHangIshow(String parents) {
         daoHangDao.upDaoHangIshow(parents);
     }
+
+    @Override
+    public List<MenuTest> findUserDaoHang(String username) {
+        List<MenuTest> menuTests = new ArrayList<>();
+        List<TbDaohang> daohangs = daoHangDao.findTest1();
+        for (int i = 0 ; i < daohangs.size(); i++) {
+            MenuTest m1 = new MenuTest();
+            m1.setId(daohangs.get(i).getParent());
+            m1.setTitle(daohangs.get(i).getName());
+            List<TbDaohang> daohangs1 = daoHangDao.findTest2(daohangs.get(i).getParent());
+            List<TbDaohangUser> daohangss = daoHangDao.findTest3(daohangs.get(i).getParent(),username);
+            List<MenuTest1> menuTest1s = new ArrayList<>();
+            for (int j = 0; j <daohangs1.size();j++){
+                MenuTest1 m1s = new MenuTest1();
+                m1s.setId(String.valueOf(daohangs1.get(j).getParents()));
+                m1s.setTitle(daohangs1.get(j).getName());
+                m1s.setFiled(daohangs1.get(j).getSrc());
+                if (daohangss.size()!=0){
+                    if (daohangs1.get(j).getName().equals(daohangss.get(j).getName())){
+                        m1s.setChecked("true");
+                    }
+                }
+
+                menuTest1s.add(m1s);
+                m1.setChildren(menuTest1s);
+            }
+            menuTests.add(m1);
+        }
+        return menuTests;
+    }
+
+    @Override
+    public List<TbDaohang> findAll() {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectList(queryWrapper);
+    }
 }

--
Gitblit v1.10.0