From b55d396294c5fd66a384a1a542c5f250aaa7da08 Mon Sep 17 00:00:00 2001 From: weidong Date: Mon, 22 Jan 2024 13:27:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beidou/controller/BasicController.java | 10 +-- .../controller/GnssDeviceController.java | 21 +++++- .../controller/GnssStatusController.java | 8 ++- .../beidou/controller/LoginController.java | 5 +- .../resources/static/api/init_enterprise.json | 6 ++ .../src/main/resources/templates/index.html | 8 +-- .../templates/page/gnss_data_calc.html | 2 +- .../templates/page/gnss_dev_cfg.html | 2 +- .../templates/page/gnss_group_cfg.html | 64 ++++++++++++------- .../resources/templates/page/gnss_status.html | 9 +++ 10 files changed, 92 insertions(+), 43 deletions(-) diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/BasicController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/BasicController.java index 702e3c98..faaf5efd 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/BasicController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/BasicController.java @@ -10,14 +10,16 @@ import javax.servlet.http.HttpSession; */ public class BasicController { public static int QUERY_ALL = -1; + int tenantId; + String loginRole; public void initModel(Model m, HttpSession session) { - String role = (String) session.getAttribute(SessionUtils.SESSION_ROLE); - int tenant_id = (int) session.getAttribute(SessionUtils.SESSION_TENANT_ID); + loginRole = (String) session.getAttribute(SessionUtils.SESSION_ROLE); + tenantId = (int) session.getAttribute(SessionUtils.SESSION_TENANT_ID); m.addAttribute(SessionUtils.SESSION_CURRENT_USER, session.getAttribute(SessionUtils.SESSION_CURRENT_USER)); - m.addAttribute(SessionUtils.SESSION_ROLE, role); - m.addAttribute(SessionUtils.SESSION_TENANT_ID, tenant_id); + m.addAttribute(SessionUtils.SESSION_ROLE, loginRole); + m.addAttribute(SessionUtils.SESSION_TENANT_ID, tenantId); m.addAttribute(SessionUtils.SESSION_TENANT_NAME, session.getAttribute(SessionUtils.SESSION_TENANT_NAME)); } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java index 1226e8bc..9e40a436 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java @@ -1,5 +1,6 @@ package com.imdroid.beidou.controller; +import com.imdroid.beidou.common.Role; import com.imdroid.beidou.entity.TenantMapper; import com.imdroid.beidou.entity.Tenant; import com.imdroid.secapi.client.RtcmClient; @@ -48,7 +49,15 @@ public class GnssDeviceController extends BasicController{ @RequestMapping("/page/gnss_dev_cfg") public String gnssDevCfg(Model m, HttpSession session) { initModel(m, session); - List tenants = tenantMapper.selectList(null); + List tenants; + if(loginRole.equals(Role.SUPER_ADMIN) || loginRole.equals(Role.ADMIN)) { + tenants = tenantMapper.selectList(null); + } + else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", tenantId); + tenants = tenantMapper.selectList(queryWrapper); + } m.addAttribute("tenant_list", tenants); return "/page/gnss_dev_cfg"; @@ -60,8 +69,16 @@ public class GnssDeviceController extends BasicController{ List gnssGroups = gnssGroupMapper.selectList(null); List gnssGroupCalcs = gnssGroupCalcMapper.selectList(null); List gnssGroupFwds = gnssGroupFwdMapper.selectList(null); - List tenants = tenantMapper.selectList(null); + List tenants; + if(loginRole.equals(Role.SUPER_ADMIN) || loginRole.equals(Role.ADMIN)) { + tenants = tenantMapper.selectList(null); + } + else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", tenantId); + tenants = tenantMapper.selectList(queryWrapper); + } m.addAttribute("tenant_list", tenants); m.addAttribute("gnss_group_list", gnssGroups); m.addAttribute("gnss_group_calc_list", gnssGroupCalcs); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java index 0b3bdb45..8bd042fc 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java @@ -3,6 +3,8 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.query.MPJQueryWrapper; +import com.imdroid.beidou.entity.Tenant; +import com.imdroid.beidou.entity.TenantMapper; import com.imdroid.beidou.service.CommonExcelService; import com.imdroid.secapi.dto.GnssStatus; import com.imdroid.secapi.dto.GnssStatusJoin; @@ -15,17 +17,21 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.util.List; @Controller public class GnssStatusController extends BasicController implements CommonExcelService { @Autowired GnssStatusMapper gnssStatusMapper; + @Autowired + TenantMapper tenantMapper; /**** 推送页面 *****/ @RequestMapping("/page/gnss_status") public String gnssStatus(Model m, HttpSession session) { initModel(m, session); - + List tenants = tenantMapper.selectList(null); + m.addAttribute("tenant_list", tenants); return "/page/gnss_status"; } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java index 586b9e5f..14f1e6c1 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java @@ -75,7 +75,6 @@ public class LoginController { Tenant tenant = tenantMapper.selectById(user.getTenantid()); SessionUtils.setCurrentUser(request, user, tenant); //response.sendRedirect("/index"); //发这条没用，会导致login.html收不到应答，也跳转不了 - HttpResult rsp = HttpResult.success(null); return HttpResult.success(null); } } @@ -122,8 +121,8 @@ public class LoginController { } @RequestMapping(value = "/do_logout") - public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException { + public String logout(HttpServletRequest request) throws IOException { request.getSession().invalidate(); - response.sendRedirect("/login"); + return "/login"; } } diff --git a/sec-beidou/src/main/resources/static/api/init_enterprise.json b/sec-beidou/src/main/resources/static/api/init_enterprise.json index 0a683edd..9686ace0 100644 --- a/sec-beidou/src/main/resources/static/api/init_enterprise.json +++ b/sec-beidou/src/main/resources/static/api/init_enterprise.json @@ -53,6 +53,12 @@ "icon": "fa fa-gear", "target": "_self", "child": [ + { + "title": "通用参数", + "href": "page/gnss_group_cfg", + "icon": "fa fa-minus", + "target": "_self" + }, { "title": "设备参数", "href": "page/gnss_dev_cfg", diff --git a/sec-beidou/src/main/resources/templates/index.html b/sec-beidou/src/main/resources/templates/index.html index 080165e7..3fe977d9 100644 --- a/sec-beidou/src/main/resources/templates/index.html +++ b/sec-beidou/src/main/resources/templates/index.html @@ -67,7 +67,7 @@
- +
@@ -150,12 +150,6 @@ maxTabNum: 20, // 最大的tab打开数量 }; miniAdmin.render(options); - - $('.login-out').on("click", function () { - layer.msg('退出登录成功', function () { - window.location = 'login'; - }); - }); }); diff --git a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html index 30df9573..486a7783 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html +++ b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html @@ -24,7 +24,7 @@ -
+
-
+