Просмотр исходного кода

公司管理员,设备管理,员工管理,数据权限

lyhzzz 2 лет назад
Родитель
Сommit
d8b7508c2e

+ 10 - 28
src/main/java/com/fdkankan/manage_jp/controller/BaseController.java

@@ -1,6 +1,9 @@
 package com.fdkankan.manage_jp.controller;
 
 import com.fdkankan.common.util.DateEditor;
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.manage_jp.entity.User;
+import com.fdkankan.manage_jp.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.web.bind.WebDataBinder;
@@ -19,38 +22,15 @@ public class BaseController {
     @Autowired
     protected HttpServletResponse response;
 
+    @Autowired
+    IUserService userService;
+
     @InitBinder
     protected void initBinder(WebDataBinder webDataBinder) {
         webDataBinder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
         webDataBinder.registerCustomEditor(Date.class, new DateEditor(true));
     }
 
-    /**
-     * 带参重定向
-     *
-     * @param path
-     * @return
-     */
-    protected String redirect(String path) {
-        return "redirect:" + path;
-    }
-
-    /**
-     * 不带参重定向
-     *
-     * @param response
-     * @param path
-     * @return
-     */
-    protected String redirect(HttpServletResponse response, String path) {
-        try {
-            response.sendRedirect(path);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
 
 
     public static void output(HttpServletResponse resp, File file) {
@@ -79,8 +59,10 @@ public class BaseController {
     protected String getToken(){
         return request.getHeader("token");
     }
-    protected String getSign(){
-        return request.getHeader("sign");
+    protected User getUser(){
+        String token = getToken();
+        String username = JwtUtil.getUsername(getToken());
+        return  userService.getByUserName(username);
     }
 
 }

+ 2 - 2
src/main/java/com/fdkankan/manage_jp/controller/CameraController.java

@@ -22,14 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/manage_jp/camera")
-public class CameraController {
+public class CameraController extends BaseController{
 
     @Autowired
     ICameraService cameraService;
 
     @PostMapping("/list")
     public Result list(@RequestBody CameraListParam param){
-        return Result.success(cameraService.pageList(param));
+        return Result.success(cameraService.pageList(param,getUser()));
     }
 
     @PostMapping("/add")

+ 1 - 2
src/main/java/com/fdkankan/manage_jp/controller/UserController.java

@@ -55,8 +55,7 @@ public class UserController extends BaseController {
      */
     @PostMapping("/list")
     public Result list(@RequestBody UserListParam param){
-
-        return Result.success(userService.pageList(param));
+        return Result.success(userService.pageList(param,getUser()));
     }
 
     @PostMapping("/updatePassword")

+ 2 - 1
src/main/java/com/fdkankan/manage_jp/service/ICameraService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage_jp.service;
 
 import com.fdkankan.manage_jp.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.github.yulichang.base.MPJBaseService;
@@ -20,7 +21,7 @@ public interface ICameraService extends MPJBaseService<Camera> {
 
     Camera findByChildName(String childName);
 
-    Object pageList(CameraListParam param);
+    Object pageList(CameraListParam param, User user);
 
     void add(CameraAddParam param);
 

+ 1 - 1
src/main/java/com/fdkankan/manage_jp/service/IUserService.java

@@ -34,7 +34,7 @@ public interface IUserService extends IService<User> {
 
     Object getUserInfo(String username);
 
-    Object pageList(UserListParam param);
+    Object pageList(UserListParam param,User user);
 
     void updatePassword(UserParam param);
 

+ 9 - 5
src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage_jp.service.impl;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,11 +17,8 @@ import com.fdkankan.manage_jp.entity.Company;
 import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.mapper.ICameraMapper;
-import com.fdkankan.manage_jp.service.ICameraDetailService;
-import com.fdkankan.manage_jp.service.ICameraService;
+import com.fdkankan.manage_jp.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage_jp.service.ICompanyService;
-import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
@@ -48,6 +46,8 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
     ICompanyService companyService;
     @Autowired
     IUserService userService;
+    @Autowired
+    IUserRoleService userRoleService;
 
     @Override
     public Camera findByChildName(String childName) {
@@ -57,7 +57,11 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
     }
 
     @Override
-    public Object pageList(CameraListParam param) {
+    public Object pageList(CameraListParam param,User user) {
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        if(roleIds.contains(6L)){
+            param.setCompanyId(user.getCompanyId());
+        }
         Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (ResponseCamera record : page.getRecords()) {
             record.setCameraType(record.getType());

+ 6 - 1
src/main/java/com/fdkankan/manage_jp/service/impl/UserServiceImpl.java

@@ -151,11 +151,16 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public Object pageList(UserListParam param) {
+    public Object pageList(UserListParam param,User user) {
         LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(param.getPhoneNum())){
             wrapper.like(User::getUserName,param.getPhoneNum());
         }
+
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        if(roleIds.contains(6L)){
+            wrapper.eq(User::getCompanyId,user.getCompanyId());
+        }
         wrapper.orderByDesc(User::getCreateTime);
         Page<User> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<UserVo> userVos = new ArrayList<>();

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/vo/request/CameraListParam.java

@@ -6,4 +6,5 @@ import lombok.Data;
 @Data
 public class CameraListParam extends RequestBase {
     private String searchKey;
+    private Long companyId;
 }

+ 5 - 0
src/main/resources/mapper/manage_jp/CameraMapper.xml

@@ -9,11 +9,16 @@
             left join t_company com on d.company_id = com.id
             left join t_user u on com.manager_id = u.id
         where  c.rec_status = 'A'
+
         <if test="param.searchKey!=null and param.searchKey !=''">
             and ( c.child_name like concat ('%',#{param.searchKey},'%')
             or c.sn_code like concat ('%',#{param.searchKey},'%')
             or u.user_name like concat ('%',#{param.searchKey},'%') )
         </if>
+        <if test="param.companyId!=null ">
+            and  d.company_id =#{param.companyId}
+
+        </if>
         order by c.create_time desc
     </select>
 </mapper>