中间页样式接口修改1

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantConfigController.java

@@ -3,6 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.model.vo.SysTenantConfigVo;
 import com.bizmatics.service.SysTenantConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,14 +26,24 @@ public class SysTenantConfigController {
     private SysTenantConfigService sysTenantConfigService;
 
     /**
-     * 登录中间页-样式配置查询
+     * 登录页-样式配置查询
      *
      * @param url 域名
      * @return
      */
     @GetMapping("/getTenantConfig")
-    public ApiResult<List<SysTenantConfig>> getTenantConfig(@RequestParam String url) {
+    public ApiResult<List<SysTenantConfigVo>> getTenantConfig(@RequestParam String url) {
         return ApiResult.success(sysTenantConfigService.getTenantConfig(url));
     }
+
+
+
+    /**
+     * 中间页-样式配置查询
+     */
+    @GetMapping("/getMiddleConfig")
+    public ApiResult<List<SysTenantConfig>> getMiddleConfig() {
+        return ApiResult.success(sysTenantConfigService.getMiddleConfig());
+    }
 }
 

fiveep-model/src/main/java/com/bizmatics/model/system/SysUser.java

@@ -34,6 +34,9 @@ public class SysUser extends BaseEntity
     /** 用户昵称 */
     private String nickName;
 
+    /** 用户类型 */
+    private String userType;
+
     /** 用户邮箱 */
     private String email;
 
@@ -144,6 +147,17 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
+    public String getUserType()
+    {
+        return userType;
+    }
+
+    public void setUserType(String userType)
+    {
+        this.userType = userType;
+    }
+
+
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName()

fiveep-model/src/main/java/com/bizmatics/model/vo/SysTenantConfigVo.java

@@ -0,0 +1,63 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 租户配置表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenantConfigVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 租户名称
+     */
+    private String loginTitle;
+
+    /**
+     * 登录页log
+     */
+    private String loginLogo;
+
+    /**
+     * 登录页背景地址
+     */
+    private String loginBackUrl;
+
+    /**
+     * 登录页底部名称
+     */
+    private String loginFooter;
+
+    /**
+     * 登录类型
+     */
+    private String loginType;
+
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantConfigMapper.java

@@ -2,6 +2,7 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.vo.SysTenantConfigVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,5 +17,5 @@ import java.util.List;
  * @since 2022-05-06
  */
 public interface SysTenantConfigMapper extends CrudMapper<SysTenantConfig> {
-    List<SysTenantConfig> getTenantConfig(@Param("url") String url);
+    List<SysTenantConfigVo> getTenantConfig(@Param("url") String url);
 }

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantConfigMapper.xml

@@ -24,7 +24,7 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
     </resultMap>
-    <select id="getTenantConfig" resultType="com.bizmatics.model.SysTenantConfig">
+    <select id="getTenantConfig" resultType="com.bizmatics.model.vo.SysTenantConfigVo">
         SELECT
         b.*
         FROM

fiveep-persistence/src/main/resources/mapper/mysql/system/SysUserMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="deptId"       column="dept_id"      />
 		<result property="userName"     column="user_name"    />
 		<result property="nickName"     column="nick_name"    />
+		<result property="userType"     column="user_type"    />
 		<result property="email"        column="email"        />
 		<result property="phonenumber"  column="phonenumber"  />
 		<result property="sex"          column="sex"          />

fiveep-service/src/main/java/com/bizmatics/service/SysTenantConfigService.java

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.vo.SysTenantConfigVo;
 
 import java.util.List;
 
@@ -14,5 +15,7 @@ import java.util.List;
  * @since 2022-05-06
  */
 public interface SysTenantConfigService extends CrudService<SysTenantConfig> {
-    List<SysTenantConfig> getTenantConfig(String url);
+    List<SysTenantConfigVo> getTenantConfig(String url);
+
+    List<SysTenantConfig> getMiddleConfig();
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantConfigServiceImpl.java

@@ -1,9 +1,21 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.common.mvc.utils.ServletUtils;
+import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.SysTenantConfigVo;
 import com.bizmatics.persistence.mapper.SysTenantConfigMapper;
+import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.SysTenantConfigService;
+import com.bizmatics.service.config.security.LoginUser;
+import com.bizmatics.service.system.impl.TokenService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,10 +30,24 @@ import java.util.List;
  */
 @Service
 public class SysTenantConfigServiceImpl extends AbstractCrudService<SysTenantConfigMapper, SysTenantConfig> implements SysTenantConfigService {
+    @Autowired
+    private SysUserMapper userMapper;
 
     @Override
-    public List<SysTenantConfig> getTenantConfig(String url) {
-        List<SysTenantConfig> list = baseMapper.getTenantConfig(url);
+    public List<SysTenantConfigVo> getTenantConfig(String url) {
+        List<SysTenantConfigVo> list = baseMapper.getTenantConfig(url);
+        return list;
+    }
+
+    @Override
+    public List<SysTenantConfig> getMiddleConfig() {
+        List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getUser().getUserId());
+        if (tenantDaya.size()<0) {
+            throw new BusinessException("无此租户，请联系管理员");
+        }
+        LambdaQueryWrapper<SysTenantConfig> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SysTenantConfig::getTenantId, tenantDaya.get(0).getTenantId());
+        List<SysTenantConfig> list = this.list(queryWrapper);
         return list;
     }
 }

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysMenuServiceImpl.java

@@ -652,12 +652,25 @@ public class SysMenuServiceImpl implements ISysMenuService {
             throw new BusinessException("无此租户，请联系管理员");
         }
         List<SysMenu> menuList = null;
-        //全部目录查询
-        List<SysMenu> sysMenuListTwo = sysMenuListTwo = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "M",tenantDaya.get(0).getTenantId());
-        //全部菜单查询
-        List<SysMenu> sysMenuListOne = sysMenuListOne = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "C",tenantDaya.get(0).getTenantId());
-        //全部按钮列表
-        List<SysMenu> sysMenuListThree = sysMenuListThree = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "F",tenantDaya.get(0).getTenantId());
+        List<SysMenu> sysMenuListTwo = new ArrayList<>();
+        List<SysMenu> sysMenuListOne = new ArrayList<>();
+        List<SysMenu> sysMenuListThree = new ArrayList<>();
+        if (tenantDaya.get(0).getUserType().equals("01")) {
+            //全部目录查询
+            sysMenuListTwo = menuMapper.getSysMenuList("M");
+            //全部菜单查询
+            sysMenuListOne = menuMapper.getSysMenuList("C");
+            //全部按钮列表
+            sysMenuListThree = menuMapper.getSysMenuList("F");
+        } else {
+            //全部目录查询
+            sysMenuListTwo = sysMenuListTwo = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "M",tenantDaya.get(0).getTenantId());
+            //全部菜单查询
+            sysMenuListOne = sysMenuListOne = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "C",tenantDaya.get(0).getTenantId());
+            //全部按钮列表
+            sysMenuListThree = sysMenuListThree = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "F",tenantDaya.get(0).getTenantId());
+
+        }
         //已选中按钮列表
         List<SysMenu> sysMenuListFour = sysMenuListFour = menuMapper.getButtonlistTwo(0L, null, roleId);