Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaRoleController.java

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 前端控制器
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRoleController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRoleController.class);
@@ -36,14 +38,17 @@ public class TaRoleController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRole",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taRole",method= RequestMethod.GET)
     public ResponseBean taRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
             //使用分页插件
 		    IPage<TaRole> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRole> result = iTaRoleService.page(pg, queryWrapper);
@@ -140,4 +145,29 @@ public class TaRoleController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 修改角色状态--停用
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/admin/taRole/stop/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleStop(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TaRole taRole = new TaRole();
+        taRole = iTaRoleService.getById(id);
+        taRole.setStatus(taRole.getStatus().equals(0)?1:0);
+        iTaRoleService.updateById(taRole);
+        return responseBean;
+    }
+
+    /**
+     * 查询当前角色信息
+     */
+    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleDetails(@PathVariable Integer id,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+       TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/service/ITaRoleService.java

@@ -15,4 +15,11 @@ import java.util.List;
  */
 public interface ITaRoleService extends IService<TaRole> {
     List<TaRole> getRolesByUser(Integer userId);
+
+    /**
+     * 查询当前角色的所有信息
+     * @param id
+     * @return
+     */
+    TaRole taRoleDetails(Integer id,Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.TaRoleMenu;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.mapper.TaRoleMenuMapper;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,8 +25,21 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     TaRoleMapper taRoleMapper;
 
+    @Autowired
+    TaRoleMenuMapper taRoleMenuMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
     }
+
+    @Override
+    public TaRole taRoleDetails(Integer id,Integer orgId) {
+        TaRole taRole = taRoleMapper.selectById(id);
+        // 查询当前角色的所有菜单
+        QueryWrapper<TaRoleMenu> taRoleMenu= new QueryWrapper<>();
+        taRoleMenu.eq("role_id",id);
+        taRoleMenuMapper.selectList(taRoleMenu);
+        return taRole;
+    }
 }