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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthButtonController.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.center.taUser.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
@@ -56,8 +58,11 @@ public class TaUserAuthButtonController extends BaseController {
      */
     @RequestMapping(value="/admin/updateAuthButton",method= RequestMethod.PUT)
     public ResponseBean updateUserAuthMenu(HttpServletRequest request,
-                                           @RequestBody List<SysButtonInMenu> sysButtonList){
+                                           @RequestBody String sysButton){
         Integer userId = getUserId(request);
-        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonList);
+        JSONObject Object = JSONObject.parseObject(sysButton);
+        JSONArray JSONArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = JSONArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonInMenuList);
     }
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.center.taUser.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -53,10 +57,14 @@ public class TaUserAuthMenuController extends BaseController {
      * 用户授权菜单
      * @return
      */
-    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.POST)
     public ResponseBean updateUserAuthMenu(HttpServletRequest request,
-                                           @RequestBody List<SysMenu> sysMenuList){
-        Integer userId = getUserId(request);
-        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList);
+                                           @RequestBody String sysMenu){
+        JSONObject Object = JSONObject.parseObject(sysMenu);
+        String name = Object.getString("name");
+        Integer userId = Object.getInteger("id");
+        JSONArray JSONArray = Object.getJSONArray("sysMenu");
+        List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request));
     }
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -323,6 +323,7 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
             taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
             taUserQueryWrapper.eq(null != status,"status",status);
+            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
             IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -18,5 +18,5 @@ public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
     ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
 
-    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList);
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -72,6 +72,7 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
             return responseBean;
         }
 
+
         try{
             //授权菜单按钮，先删除在新增
             taUserAuthButtonMapper.deleteUserAuthButton(userId);

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -10,7 +10,9 @@ import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.entity.SysMenu;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +38,9 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private  TaRoleMapper taRoleMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
@@ -72,28 +77,56 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList) {
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgid) {
         ResponseBean responseBean = new ResponseBean();
-
-        // 人员
-        TaUser taUser = taUserMapper.selectById(userId);
-        if (null == taUser) {
-            responseBean.addError("授权人不存在");
+        if (null == roleId){
+            Boolean isA = addUserAuthMenu( sysMenuList,name,orgid);
+            responseBean.addSuccess(isA==true?"成功":"失败");
             return responseBean;
         }
-
-        try{
+        try {
             //授权菜单，先删除在新增
-            taUserAuthMenuMapper.deleteUserAuthMenu(userId);
-            taUserAuthMenuMapper.addUserAuthMenu(userId, sysMenuList);
+            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            for (SysMenu sysMenu: sysMenuList) {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(roleId);
+                taRoleMenu.setMenuId(sysMenu.getMenuId());
+                taRoleMenuMapper.insert(taRoleMenu);
+            }
+            // 更新Role
+            TaRole taRole = new TaRole();
+            taRole.setRoleId(roleId);
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgid);
+            taRoleMapper.updateById(taRole);
             responseBean.addSuccess("操作成功");
-            return  responseBean;
-        }catch (Exception e){
+            return responseBean;
+        } catch (Exception e) {
             responseBean.addSuccess("操作失败");
             e.printStackTrace();
             return responseBean;
         }
-
     }
 
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            TaRole taRole = new TaRole();
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgid);
+            taRoleMapper.insert(taRole);
+          for (SysMenu sysMenu: sysMenuList){
+              TaRoleMenu taRoleMenu = new TaRoleMenu();
+              taRoleMenu.setRoleId(taRole.getRoleId());
+              taRoleMenu.setMenuId(sysMenu.getMenuId());
+              taRoleMenuMapper.insert(taRoleMenu);
+          }
+            responseBean.addSuccess("操作成功");
+            return  true;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

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

@@ -416,13 +416,27 @@ public class TaPersonController extends BaseController {
         return taPersonService.editConsultant(id, paramStr);
     }
 
-    @PutMapping("/wx/editConsultant/{id}")
-    public ResponseBean editWxConsultant(@PathVariable String id, @RequestBody TaPerson taPerson) {
+    @PutMapping("/wx/editPerson")
+    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        if (!StringUtils.isEmpty(name)){
+            person.setName(name);
+        }
+        if (!StringUtils.isEmpty(avatar)){
+            person.setAvatarurl(avatar);
+        }
+        if (!StringUtils.isEmpty(phone)){
+            person.setTel(phone);
+        }
         try{
-            taPerson.setPersonId(id);
-            if(taPersonService.updateById(taPerson)){
-                responseBean.addSuccess(taPerson);
+            if(taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
             }else {
                 responseBean.addError("fail");
             }
@@ -563,6 +577,7 @@ public class TaPersonController extends BaseController {
 
         return ResponseBean.success(taPerson);
     }
+
     
     /**
      * 微信添加人员添加城市
@@ -594,4 +609,5 @@ public class TaPersonController extends BaseController {
         responseBean.addError("未找到城市");
         return responseBean;
     }
+
 }

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

@@ -336,11 +336,11 @@ public class TaRecommendCustomerController extends BaseController {
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
+    @RequestMapping(value="/wx/customer/recommend/edit/{customerId}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String customerId,
                                         @RequestBody TaRecommendCustomer taRecommendCustomer){
         ResponseBean responseBean = new ResponseBean();
-        taRecommendCustomer.setCustomerId(id);
+        taRecommendCustomer.setCustomerId(customerId);
         try {
             if (taRecommendCustomerService.updateById(taRecommendCustomer)){
                 responseBean.addSuccess(taRecommendCustomer);
@@ -399,8 +399,8 @@ public class TaRecommendCustomerController extends BaseController {
 //        return responseBean;
 //    }
 
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
-    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
+    @RequestMapping(value = "/wx/customer/recommend/get/{customerId}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "customerId") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));

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

@@ -66,7 +66,7 @@ public class TaRoleController extends BaseController {
      * @param taRole 实体对象
      * @return
      */
-    @RequestMapping(value="/taRole",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taRole",method= RequestMethod.POST)
     public ResponseBean taRoleAdd(@RequestBody TaRole taRole){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -111,24 +111,18 @@ public class TaRoleController extends BaseController {
      * @param taRole 实体对象
      * @return
      */
-    @RequestMapping(value="/taRole/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/editAndAddRole/{id}",method= RequestMethod.POST)
     public ResponseBean taRoleUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRole taRole){
+                                        @RequestBody TaRole taRole) {
         ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaRoleService.updateById(taRole)){
-                responseBean.addSuccess(taRole);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRoleUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
+        if (null==id){
+            iTaRoleService.save(taRole);
+        }else{
+            iTaRoleService.updateById(taRole);
         }
+        responseBean.addSuccess("成果");
         return responseBean;
     }
-
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -164,10 +158,11 @@ public class TaRoleController extends BaseController {
     /**
      * 查询当前角色信息
      */
-    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.GET)
     public ResponseBean taRoleDetails(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-       TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        responseBean.addSuccess(taRole);
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/entity/SysMenu.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,4 +83,10 @@ public class SysMenu implements Serializable {
      */
     @TableField(exist = false)
     private List<Integer> roles;
+
+    /**
+     * 菜单下的按钮
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> sysButtonInMenu;
 }

src/main/java/com/huiju/estateagents/entity/TaRole.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -55,5 +58,17 @@ public class TaRole implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 当前角色菜单
+     */
+    @TableField(exist = false)
+    private List<SysMenu> sysMenuList;
+
+    /**
+     * 当前按钮
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> sysButtonInMenu;
+
 
 }

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

@@ -2,14 +2,19 @@ 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.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.entity.TaRoleMenu;
+import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
+import com.huiju.estateagents.mapper.SysMenuMapper;
 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;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +33,12 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     TaRoleMenuMapper taRoleMenuMapper;
 
+    @Autowired
+    SysMenuMapper sysMenuMapper;
+
+    @Autowired
+    SysButtonInMenuMapper sysButtonInMenuMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
@@ -37,9 +48,22 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     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);
+        QueryWrapper<TaRoleMenu> taRoleMenuQuery= new QueryWrapper<>();
+        taRoleMenuQuery.eq("role_id",id);
+       List<TaRoleMenu> taRoleMenusList = taRoleMenuMapper.selectList(taRoleMenuQuery);
+       // 同过menu_id查询当前菜单
+         List<SysMenu> sysMenuList = new ArrayList<>();
+        for (TaRoleMenu taRoleMenu :taRoleMenusList){
+            SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
+            sysMenuList.add(sysMenu);
+            // 查询按钮
+            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+            sysButtonInMenuQuery.eq("menu_id",sysMenu.getMenuId());
+            List<SysButtonInMenu> sysButtonInMenuList= sysButtonInMenuMapper.selectList(sysButtonInMenuQuery);
+            sysMenu.setSysButtonInMenu(sysButtonInMenuList);
+
+        }
+        taRole.setSysMenuList(sysMenuList);
         return taRole;
     }
-}
+}