فهرست منبع

system-行业以及销售查询

yangzian 3 سال پیش
والد
کامیت
b430c3e529

+ 67 - 0
ruixuan-admin/src/main/java/com/ruixuan/web/controller/system/SysIndustryController.java

@@ -0,0 +1,67 @@
+package com.ruixuan.web.controller.system;
+
+import com.ruixuan.common.annotation.Log;
+import com.ruixuan.common.constant.UserConstants;
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.domain.ResultResponse;
+import com.ruixuan.common.core.domain.entity.SysRole;
+import com.ruixuan.common.core.domain.entity.SysUser;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.common.enums.BusinessType;
+import com.ruixuan.common.utils.SecurityUtils;
+import com.ruixuan.common.utils.StringUtils;
+import com.ruixuan.common.utils.poi.ExcelUtil;
+import com.ruixuan.system.domain.SysIndustryInfo;
+import com.ruixuan.system.service.ISysIndustryService;
+import com.ruixuan.system.service.ISysPostService;
+import com.ruixuan.system.service.ISysRoleService;
+import com.ruixuan.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ * 
+ * @author ruixuan
+ */
+@Api(tags = "系统设置-行业",description = "system-industry")
+@RestController
+@RequestMapping("/system/industry")
+public class SysIndustryController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysPostService postService;
+
+
+    @Autowired
+    private ISysIndustryService industryService;
+
+    @ApiOperation(value = "根据用户id查询用户以及角色信息",notes = "根据用户id查询用户以及角色信息")
+    @GetMapping("/getIndustryInfoList")
+    public ResultResponse<List<SysIndustryInfo>> getIndustryInfoList(){
+
+        return industryService.getIndustryInfoList();
+    }
+
+
+
+
+}

+ 24 - 8
ruixuan-admin/src/main/java/com/ruixuan/web/controller/system/SysUserController.java

@@ -3,18 +3,15 @@ package com.ruixuan.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruixuan.common.annotation.Log;
 import com.ruixuan.common.constant.UserConstants;
@@ -36,6 +33,7 @@ import com.ruixuan.system.service.ISysUserService;
  * 
  * @author ruixuan
  */
+@Api(tags = "系统设置-用户",description = "system-user")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController
@@ -234,4 +232,22 @@ public class SysUserController extends BaseController
         userService.insertUserAuth(userId, roleIds);
         return success();
     }
+
+
+    @ApiOperation(value = "根据用户id查询用户以及角色信息",notes = "根据用户id查询用户以及角色信息")
+    @GetMapping("/getUserRoleByUserId")
+    public AjaxResult getUserRoleByUserId( @ApiParam("用户id") @RequestParam(value = "userId")  Long userId) {
+        return AjaxResult.success("查询成功",userService.getUserRoleByUserId(userId));
+    }
+
+
+    @ApiOperation(value = "根据角色名称查询用户信息",notes = "根据角色名称查询用户信息")
+    @GetMapping("/getUserByRoleName")
+    public AjaxResult getUserByRoleName( @ApiParam("角色名称") @RequestParam(value = "roleName") String roleName) {
+        return AjaxResult.success("查询成功",userService.getUserByRoleName(roleName));
+    }
+
+
+
+
 }

+ 3 - 0
ruixuan-framework/src/main/java/com/ruixuan/framework/config/SecurityConfig.java

@@ -117,6 +117,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     .antMatchers("/demoController/**").permitAll()
                     .antMatchers("/sale/**").permitAll()
                     .antMatchers("/live/**").permitAll()
+                    .antMatchers("/system/user/getUserRoleByUserId").permitAll()
+                    .antMatchers("/system/user/getUserByRoleName").permitAll()
+                    .antMatchers("/system/industry/**").permitAll()
 
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

+ 0 - 7
ruixuan-system/src/main/java/com/ruixuan/system/domain/SysIndustryInfo.java

@@ -9,22 +9,15 @@ package com.ruixuan.system.domain;
  * @CreateDate: 2022-05-24
  * ****************************************************
  */
-
-
-
 public class SysIndustryInfo {
 
-
     private int id;
 
-
     //父id
     private int parentId;
 
-
     //行业名称
     private String name;
-
     //排序
     private int sort;
 

+ 6 - 0
ruixuan-system/src/main/java/com/ruixuan/system/mapper/SysIndustryInfoMapper.java

@@ -21,5 +21,11 @@ public interface SysIndustryInfoMapper{
      */
     public SysIndustryInfo getIndustryInfoByName(String name);
 
+    /**
+     * 查询全部行业
+     * @return
+     */
+    public List<SysIndustryInfo> getIndustryInfoList();
+
 
 }

+ 22 - 0
ruixuan-system/src/main/java/com/ruixuan/system/mapper/SysUserMapper.java

@@ -134,4 +134,26 @@ public interface SysUserMapper
      * @return 结果
      */
     List<JSONObject> queryRoles(String type);
+
+
+    /**
+     * 根据用户id 查询用户和角色信息
+     * @param userId
+     * @return
+     */
+    List<JSONObject> getUserRoleByUserId(Long userId);
+
+    /**
+     * 根据角色名称 查询用户信息
+     * @param roleName
+     * @return
+     */
+    List<JSONObject> getUserByRoleName(String roleName);
+
+
+
+
+
+
+
 }

+ 20 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/ISysIndustryService.java

@@ -0,0 +1,20 @@
+package com.ruixuan.system.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruixuan.common.core.domain.ResultResponse;
+import com.ruixuan.common.core.domain.entity.SysUser;
+
+import java.util.List;
+
+/**
+ * 行业分类
+ *
+ * @author zian Y
+ */
+public interface ISysIndustryService {
+
+
+
+    ResultResponse getIndustryInfoList();
+
+}

+ 6 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/ISysUserService.java

@@ -213,4 +213,10 @@ public interface ISysUserService
      * @return 结果
      */
     List<JSONObject> queryRoles(String type);
+
+
+    List<JSONObject> getUserRoleByUserId(Long userId);
+
+    List<JSONObject> getUserByRoleName(String roleName);
+
 }

+ 61 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/impl/SysIndustryServiceImpl.java

@@ -0,0 +1,61 @@
+package com.ruixuan.system.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruixuan.common.annotation.DataScope;
+import com.ruixuan.common.constant.UserConstants;
+import com.ruixuan.common.core.domain.ResultResponse;
+import com.ruixuan.common.core.domain.entity.SysRole;
+import com.ruixuan.common.core.domain.entity.SysUser;
+import com.ruixuan.common.exception.ServiceException;
+import com.ruixuan.common.utils.SecurityUtils;
+import com.ruixuan.common.utils.StringUtils;
+import com.ruixuan.common.utils.bean.BeanValidators;
+import com.ruixuan.common.utils.spring.SpringUtils;
+import com.ruixuan.system.domain.SysIndustryInfo;
+import com.ruixuan.system.domain.SysPost;
+import com.ruixuan.system.domain.SysUserPost;
+import com.ruixuan.system.domain.SysUserRole;
+import com.ruixuan.system.mapper.*;
+import com.ruixuan.system.service.ISysConfigService;
+import com.ruixuan.system.service.ISysIndustryService;
+import com.ruixuan.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.annotation.Resource;
+import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 行业分类
+ * 
+ * @author zian Y
+ */
+@Service
+public class SysIndustryServiceImpl implements ISysIndustryService
+{
+    private static final Logger log = LoggerFactory.getLogger(SysIndustryServiceImpl.class);
+
+
+    @Resource
+    private SysIndustryInfoMapper sysIndustryInfoMapper;
+
+
+    @Override
+    public ResultResponse getIndustryInfoList() {
+        List<SysIndustryInfo> list = sysIndustryInfoMapper.getIndustryInfoList();
+        return ResultResponse.successMsg("查询全部行业成功。",list);
+
+
+    }
+
+
+
+}

+ 25 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/impl/SysUserServiceImpl.java

@@ -566,4 +566,29 @@ public class SysUserServiceImpl implements ISysUserService
     public List<JSONObject> queryRoles(String type) {
         return userMapper.queryRoles(type);
     }
+
+
+    /**
+     * 根据用户id查询用户以及角色信息
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<JSONObject> getUserRoleByUserId(Long userId) {
+        return userMapper.getUserRoleByUserId(userId);
+    }
+
+
+    /**
+     * 根据角色名称查询用户信息
+     * @param roleName
+     * @return
+     */
+    @Override
+    public List<JSONObject> getUserByRoleName(String roleName) {
+        return userMapper.getUserByRoleName(roleName);
+    }
+
+
+
 }

+ 6 - 0
ruixuan-system/src/main/resources/mapper/system/SysIndustryMapper.xml

@@ -13,5 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 
+	<!-- 查询全部信息-->
+	<select id="getIndustryInfoList" resultType="com.ruixuan.system.domain.SysIndustryInfo">
+		select * from sys_industry_info
+	</select>
+
+
 
 </mapper> 

+ 40 - 0
ruixuan-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -296,4 +296,44 @@
             )
         </if>
     </select>
+
+
+
+    <!-- 根据用户id 查询用户和角色信息-->
+    <select id="getUserRoleByUserId" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            u.*,
+            r.role_name,
+            r.role_key
+        FROM
+            sys_user u
+                LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+                LEFT JOIN sys_role r ON r.role_id = ur.role_id
+        WHERE
+            r.del_flag = 0
+          AND u.del_flag = 0
+          AND u.STATUS = 0
+          AND u.user_id = #{userId}
+    </select>
+
+
+    <!-- 根据角色名称 查询用户信息-->
+    <select id="getUserByRoleName" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            u.*,
+            r.role_name,
+            r.role_key
+        FROM
+            sys_user u
+                LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+                LEFT JOIN sys_role r ON r.role_id = ur.role_id
+        WHERE
+            r.del_flag = 0
+          AND u.del_flag = 0
+          AND u.STATUS = 0
+          AND r.role_name = #{roleName}
+    </select>
+
+
+
 </mapper>