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

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthButtonController
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthButtonController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthButtonService iTaUserAuthButtonService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthButton/{userId}",method= RequestMethod.GET)
+    public ResponseBean getButtonByUserId(@RequestParam("pageNum")Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @PathVariable String userId){
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId);
+    }
+
+
+    /**
+     * 获取所有的菜单按钮
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/buttonList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthButtonService.getAllButton(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权按钮
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthButton/{userId}",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+                                           @RequestBody List<SysButtonInMenu> sysButtonList){
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonList);
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuController
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthMenuController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthMenu/{userId}",method= RequestMethod.GET)
+    public ResponseBean  getMenuByUserId(@RequestParam("pageNum")Integer pageNum,
+                                         @RequestParam("pageSize")Integer pageSize,
+                                         @PathVariable String userId){
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId);
+    }
+
+    /**
+     * 获取所有菜单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权菜单
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthMenu/{userId}",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+                                           @RequestBody List<SysMenu> sysMenuList){
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList);
+    }
+}

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

@@ -11,19 +11,28 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.dc.pr.PRError;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.Response;
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,6 +55,14 @@ public class TaUserController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaRoleService iTaRoleService;
+
+    @Autowired
+    private ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    @Autowired
+    private ITaUserAuthButtonService iTaUserAuthButtonService;
 
     /**
      * 分页查询列表
@@ -188,11 +205,23 @@ public class TaUserController extends BaseController {
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
     public ResponseBean taUserGetCurrent(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Map userMap = new HashMap();
         Map map = JWTUtils.getUserIdAndOrgId(request);
         try {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
+            List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            taUser.setMenus((List<SysMenu>) authMenu.getData());
+            taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
+            taUser.setRoles(roles);
             taUser.setLoginPassword("");
-            responseBean.addSuccess(taUser);
+
+            //获取所有菜单
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            userMap.put("taUser", taUser);
+            userMap.put("menuList", allMenus);
+            responseBean.addSuccess(userMap);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserDelete -=- {}",e.toString());
@@ -228,6 +257,9 @@ public class TaUserController extends BaseController {
         if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+        taUser.setRoles(roles);
         taUser.setLoginPassword("");
         Map map = new HashMap();
         map.put("userId",taUser.getUserId().toString());

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -3,13 +3,17 @@ package com.huiju.estateagents.center.taUser.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaRole;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -119,4 +123,22 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
+
+    /**
+     * 授权按钮列表
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> buttons;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthButtonMapper.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonMapper
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Mapper
+public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
+    /**
+     * 根据用户Id查询按钮列表
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<SysButtonInMenu> sysButtonListByUserId(Page page, @Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询按钮列表
+     * @param page
+     * @return
+     */
+    IPage<SysButtonInMenu> sysButtonListByRoleId(Page page);
+
+    void deleteUserAuthButton(@Param("userId") Integer userId);
+
+    void addUserAuthButton(@Param("userId") Integer userId, @Param("sysButtons") List<SysButtonInMenu> sysButtonInMenus);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthMenuMapper.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuMapper
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Mapper
+public interface TaUserAuthMenuMapper extends BaseMapper<SysMenu> {
+    /**
+     * 根据用户Id查询菜单列表
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<SysMenu> sysMenuListByUserId(Page page, @Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询菜单列表
+     * @param page
+     * @return
+     */
+    IPage<SysMenu> sysMenuListByRoleId(Page page);
+
+    /**
+     * 删除授权的菜单
+     * @param userId
+     */
+    void deleteUserAuthMenu(@Param("userId") Integer userId);
+
+    /**
+     * 新增授权的菜单
+     * @param userId
+     */
+    void addUserAuthMenu(@Param("userId") Integer userId, @Param("sysMenus") List<SysMenu> sysMenuList);
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthButtonService
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
+
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllButton(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus);
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthMenuService
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+public interface ITaUserAuthMenuService extends IService<SysMenu> {
+
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList);
+}

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

@@ -0,0 +1,97 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonServiceImpl
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Service
+public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMapper, SysButtonInMenu> implements ITaUserAuthButtonService {
+
+    @Autowired
+    TaUserAuthButtonMapper taUserAuthButtonMapper;
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(page, userId).getRecords();
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
+        Page<SysButtonInMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysButtonInMenu> sysMenuIPage = taUserAuthButtonMapper.sysButtonListByRoleId(page);
+        List<SysButtonInMenu> records = sysMenuIPage.getRecords();
+
+        QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper();
+        List<TaRoleButton> taRoleButtons = taRoleButtonMapper.selectList(queryWrapper);
+
+        for (SysButtonInMenu sysButtonInMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleButton taRoleButton : taRoleButtons){
+                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId())){
+                    roles.add(taRoleButton.getBtnId());
+                }
+            }
+            sysButtonInMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+        try{
+            //授权菜单按钮，先删除在新增
+            taUserAuthButtonMapper.deleteUserAuthButton(userId);
+            taUserAuthButtonMapper.addUserAuthButton(userId, sysButtonInMenus);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+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.TaRoleMenu;
+import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuServiceImpl
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Service
+public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper, SysMenu> implements ITaUserAuthMenuService {
+
+
+    @Autowired
+    private TaUserAuthMenuMapper taUserAuthMenuMapper;
+    @Autowired
+    private TaRoleMenuMapper taRoleMenuMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    /**
+     * 根据用户id获取授权菜单
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @Override
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysMenu> sysMenuIPage = taUserAuthMenuMapper.sysMenuListByUserId(page, userId);
+        List<SysMenu> records = sysMenuIPage.getRecords();
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysMenu> sysMenuIPage = taUserAuthMenuMapper.sysMenuListByRoleId(page);
+        List<SysMenu> records = sysMenuIPage.getRecords();
+
+        QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
+        List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
+
+        for (SysMenu sysMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleMenu taRoleMenu : taRoleMenus){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId())){
+                    roles.add(taRoleMenu.getRoleId());
+                }
+            }
+            sysMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+        try{
+            //授权菜单，先删除在新增
+            taUserAuthMenuMapper.deleteUserAuthMenu(userId);
+            taUserAuthMenuMapper.addUserAuthMenu(userId, sysMenuList);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+
+}

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -2,67 +2,47 @@ package com.huiju.estateagents.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
 import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
-import com.huiju.estateagents.config.WxProperties;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.service.ITaBuildingService;
-import me.chanjar.weixin.common.error.WxErrorException;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-@Configuration
-@EnableConfigurationProperties(WxProperties.class)
+@Component
 public class WxUtils {
-    static WxMaService miniApp;
-
-    static WxProperties properties;
+    private ConcurrentHashMap<String, WxMaService> serives = new ConcurrentHashMap();
 
     @Autowired
-    public WxUtils(WxProperties properties) { WxUtils.properties = properties; }
+    IMiniAppService iMiniAppService;
 
-    public static WxMaService getMiniApp() {
-        return miniApp;
+    public WxMaService getMiniApp(String appid) {
+        return serives.get(appid);
     }
 
-    @Autowired
-    ITaBuildingService iTaBuildingService;
-
     @PostConstruct
     public void init() {
         System.out.println("-------------PostConstruct----------------");
 
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-
-        WxProperties.Miniapp miniProperty = WxUtils.properties.getMiniapp();
-
-        config.setAppid(miniProperty.getAppid());
-        config.setSecret(miniProperty.getSecret());
-        config.setToken(miniProperty.getToken());
-        config.setAesKey(miniProperty.getAesKey());
-        config.setMsgDataFormat(miniProperty.getMsgDataFormat());
-
-        WxUtils.miniApp = new WxMaServiceImpl();
-        WxUtils.miniApp.setWxMaConfig(config);
-        System.out.println("-------------PostConstruct- 222---------------");
-        System.out.println(WxUtils.miniApp);
-    }
+        List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
+        if (null != taMiniappList) {
+            return;
+        }
 
-    public static WxProperties.Tpl getTplByName(String name) {
-        for ( WxProperties.Tpl t: properties.getTpls()) {
-            if (t.getName().equals(name)) {
-                return t;
-            }
+        for (TaMiniapp taMiniapp : taMiniappList) {
+            WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+            config.setAppid(taMiniapp.getMiniappId());
+            config.setSecret(taMiniapp.getSecret());
+            config.setToken(taMiniapp.getToken());
+            config.setAesKey(taMiniapp.getAesKey());
+            config.setMsgDataFormat("JSON");
+
+            WxMaService service = new WxMaServiceImpl();
+            service.setWxMaConfig(config);
+            serives.put(taMiniapp.getMiniappId(), service);
         }
-        return null;
     }
 }

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

@@ -34,23 +34,15 @@ public class MiniAppController {
     @Autowired
     private ITaPersonService taPersonService;
 
-    final WxMaService wxService = WxUtils.getMiniApp();
-
     @Autowired
     private IMiniAppService miniAppService;
 
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
 
-    @Autowired
-    private ITaCustomerPersonService taCustomerPersonService;
-
     @Resource
     private ApplicationContext applicationContext;
 
-    @Autowired
-    private TaShareMapper taShareMapper;
-
     @Autowired
     private ITaOrgService taOrgService;
 
@@ -71,12 +63,23 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender,HttpServletRequest request) {
+    public ResponseBean login(
+            String code,
+            @RequestParam(required = false) String from,
+            @RequestParam(required = false)String recommender,
+            HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        if (StringUtils.isBlank(appid)) {
+            return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         try {
-            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
+
+            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
             Integer orgId =getOrgId(request);
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
@@ -93,7 +96,7 @@ public class MiniAppController {
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(),orgId);
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -109,6 +112,7 @@ public class MiniAppController {
                     }
                 }
             }
+            taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
             taPerson.setPassword(null);
@@ -155,6 +159,7 @@ public class MiniAppController {
      */
     @PostMapping("/signup")
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         TaPerson person = null;
 
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
@@ -178,12 +183,12 @@ public class MiniAppController {
             String iv = params.getString("iv");
 
             // 用户信息校验
-            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature)) {
+            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature, appid)) {
                 return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
 
             // 解密用户信息
-            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv);
+            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv, appid);
 
             // 更新或保存用户信息
             person = taPersonService.mergePersonWxInfo(userInfo);
@@ -208,6 +213,7 @@ public class MiniAppController {
      */
     @PostMapping("/userPhone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -218,7 +224,7 @@ public class MiniAppController {
         String iv = params.getString("iv");
 
         // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv);
+        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
 
         // 更新用户绑定手机
         String openid = JWTUtils.getSubject(request);
@@ -271,8 +277,9 @@ public class MiniAppController {
      * @return
      */
     @PostMapping("/qrcode")
-    public ResponseBean qrcode(@RequestBody String paramsStr) {
-        return miniAppService.getQrCode(paramsStr);
+    public ResponseBean qrcode(@RequestBody String paramsStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+        return miniAppService.getQrCode(paramsStr, appid);
     }
 
     /**

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

@@ -437,7 +437,7 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @GetMapping("/admin/customer/recommend/drift")
+    @GetMapping("/admin/customer/recommend/")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,

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

@@ -1,12 +1,14 @@
 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;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -46,5 +48,6 @@ public class SysButtonInMenu implements Serializable {
 
     private String code;
 
-
+    @TableField(exist = false)
+    private List<Integer> roles;
 }

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.List;
 
 /**
  * <p>
@@ -75,4 +76,10 @@ public class SysMenu implements Serializable {
      */
     @TableField(exist = false)
     private Boolean hasRights;
+
+    /**
+     * 是否有权限
+     */
+    @TableField(exist = false)
+    private List<Integer> roles;
 }

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

@@ -56,6 +56,9 @@ public class TaMiniapp implements Serializable {
      */
     private Integer orgId;
 
+
+    private String aesKey;
+
     @TableField(exist = false)
     private List<TaMiniappTemplate> tpls;
 }

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

@@ -259,6 +259,8 @@ public class TaPerson implements Serializable {
     @TableField(exist = false)
     private int inviteCount;
 
+    private String miniappId;
+
     @TableField(exist = false)
     private List<TaPoster> posters;
 

src/main/java/com/huiju/estateagents/mapper/TaMiniappMapper.java

@@ -2,8 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 小程序表  Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
 
+    List<TaMiniapp> getAllAvaliableMiniapps();
 }

src/main/java/com/huiju/estateagents/mapper/TaMiniappTemplateMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaMiniappTemplateMapper extends BaseMapper<TaMiniappTemplate> {
-
+    TaMiniappTemplate selectTplByType(@Param("type") String type, @Param("appid") String appid);
 }

src/main/java/com/huiju/estateagents/mapper/TaRoleMapper.java

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleMapper extends BaseMapper<TaRole> {
 
+    List<TaRole> getRolesByUser(@Param("user") Integer userId);
 }

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

@@ -4,27 +4,32 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
+import com.huiju.estateagents.entity.TaPerson;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 public interface IMiniAppService {
-    WxMaJscode2SessionResult getSessionInfo(String code) throws WxErrorException;
+    WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException;
 
-    boolean checkUserInfo(String sessionKey, String rawData, String signature);
+    boolean checkUserInfo(String sessionKey, String rawData, String signature, String appid);
 
-    WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv);
+    WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv, String appid);
 
-    WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv);
+    WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid);
 
-    void sendNoticeMessage(String toUser, String link, String name, String phone, String content, LocalDateTime dt);
+    void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt);
 
-    void sendMainBizMessage(String toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
+    void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
 
-    void sendNewCustomerMessage(String toUser, String link, String custName, String phone, String sex, String fromName);
+    void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName);
 
-    ResponseBean getQrCode(String paramsStr);
+    ResponseBean getQrCode(String paramsStr, String appid);
 
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
+
+    List<TaMiniapp> getAllAvaliableMiniapps();
 }

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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaRole;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务类
@@ -12,5 +14,5 @@ import com.huiju.estateagents.entity.TaRole;
  * @since 2019-09-11
  */
 public interface ITaRoleService extends IService<TaRole> {
-
+    List<TaRole> getRolesByUser(Integer userId);
 }

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

@@ -7,13 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.config.WxProperties;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaMiniFormidsMapper;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappQrcodeMapper;
+import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,34 +41,43 @@ public class MiniAppServiceImpl implements IMiniAppService {
     @Autowired
     ITaMiniFormidsService taMiniFormidsService;
 
+    @Autowired
+    TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    TaMiniappTemplateMapper taMiniappTemplateMapper;
+
+    @Autowired
+    WxUtils wxUtils;
+
     @Override
-    public WxMaJscode2SessionResult getSessionInfo(String code) throws WxErrorException {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         System.out.println(wxService);
         System.out.println(wxService.getUserService());
         return wxService.getUserService().getSessionInfo(code);
     }
 
     @Override
-    public boolean checkUserInfo(String sessionKey, String rawData, String signature) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public boolean checkUserInfo(String sessionKey, String rawData, String signature, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().checkUserInfo(sessionKey, rawData, signature);
     }
 
     @Override
-    public WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
     }
 
     @Override
-    public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
     }
 
     @Override
-    public void sendNoticeMessage(String toUser, String link, String name, String phone, String content, LocalDateTime dt) {
+    public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
@@ -73,7 +88,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public void sendMainBizMessage(String toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
+    public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
@@ -86,7 +101,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public void sendNewCustomerMessage(String toUser, String link, String custName, String phone, String sex, String fromName) {
+    public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
@@ -97,11 +112,10 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public ResponseBean getQrCode(String paramsStr) {
+    public ResponseBean getQrCode(String paramsStr, String appid) {
         if (null == paramsStr) return ResponseBean.error("请指定二维码生成参数", ResponseBean.ERROR_MISSING_PARAMS);
 
-        WxMaService wxService = WxUtils.getMiniApp();
-        String appid = wxService.getWxMaConfig().getAppid();
+        WxMaService wxService = wxUtils.getMiniApp(appid);
 
         // 先去数据库中查询
         QueryWrapper<TaMiniappQrcode> queryWrapper = new QueryWrapper<>();
@@ -166,29 +180,61 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappQrcodeMapper.selectById(id);
     }
 
-    private void sendMessage(String tplName, String toUser, String link, List<WxMaTemplateData> data) {
-        WxProperties.Tpl tpl = WxUtils.getTplByName(tplName);
+    @Override
+    public List<TaMiniapp> getAllAvaliableMiniapps() {
+        List<TaMiniapp> taMiniappList = taMiniappMapper.getAllAvaliableMiniapps();
+
+        if (null != taMiniappList) {
+            for (TaMiniapp miniapp : taMiniappList) {
+                QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("miniapp_id", miniapp.getMiniappId());
+                miniapp.setTpls(taMiniappTemplateMapper.selectList(queryWrapper));
+            }
+        }
+
+        return taMiniappList;
+    }
+
+    private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
+        String appid = toUser.getMiniappId();
+        if (StringUtils.isEmpty(appid)) {
+            log.error("人员 {} 无对应来源小程序信息", toUser);
+        }
+
+        TaMiniappTemplate tpl = getTplByType(tplName, toUser.getMiniappId());
         if (null == tpl) return ;
 
-        String formid = taMiniFormidsService.getFormidBy(toUser, true);
+        String formid = taMiniFormidsService.getFormidBy(toUser.getMiniOpenid(), true);
         if (StringUtils.isEmpty(formid)) {
-            log.error("發送消息失敗, 沒有有效的 formid");
+            log.error("发送消息失敗, 沒有有效的 formid");
             return;
         }
 
         WxMaTemplateMessage message = WxMaTemplateMessage.builder()
-                .templateId(tpl.getId())
+                .templateId(tpl.getTplId())
                 .data(data)
                 .formId(formid)
                 .page(StringUtils.ifNull(link, CommConstant.MINIAPP_INDEX))
-                .toUser(toUser)
+                .toUser(toUser.getMiniOpenid())
                 .build();
         try {
-
-            WxMaService wxService = WxUtils.getMiniApp();
+            WxMaService wxService = wxUtils.getMiniApp(appid);
             wxService.getMsgService().sendTemplateMsg(message);
         } catch (WxErrorException e) {
             e.printStackTrace();
         }
     }
+
+    private TaMiniappTemplate getTplByType(String type, String appid) {
+        TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
+        return tpl;
+    }
+
+    public TaMiniapp getMinappByOrg(Integer org) {
+        QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", org);
+        queryWrapper.last("limit 1");
+
+        return taMiniappMapper.selectOne(queryWrapper);
+    }
 }

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

@@ -15,6 +15,8 @@ import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Service;
@@ -58,6 +60,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private ITaSaveService iTaSaveService;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
@@ -114,6 +122,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
         for (TaBuildingDynamic taBuildingDynamic:records){
             setExtendInfo(taBuildingDynamic, taPerson);
+
         }
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", records);
@@ -288,6 +297,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
         int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
         taBuildingDynamic.setCount(applyCount);
+        taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+        taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
         // 是否收藏
         TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());

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

@@ -13,6 +13,8 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import jodd.util.CollectionUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.checkerframework.checker.units.qual.A;
@@ -68,6 +70,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
@@ -116,6 +124,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
         List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
         building.setBuildingProjectType(taBuildingProjectTypes);
+        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         return ResponseBean.success(building);
     }

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

@@ -147,7 +147,7 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
                 };
                 String link = "/pages/im/index?"+String.join("&", its);
 
-                miniAppService.sendNoticeMessage(to.getMiniOpenid(), link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
+                miniAppService.sendNoticeMessage(to, link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
             } else {
                 taChat.setIsRead(CommConstant.MESSAGE_READED);
             }

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

@@ -16,9 +16,7 @@ import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.mapper.TaSaveMapper;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaNewsService;
-import com.huiju.estateagents.service.ITaNewsTypeService;
+import com.huiju.estateagents.service.*;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +50,12 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
@@ -89,7 +93,10 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         if (null == newsId) {
             responseBean.addError("编号不能为空！");
         }
-        responseBean.addSuccess(this.getById(newsId));
+        TaNews data = this.getById(newsId);
+        data.setPosters(taPosterService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        data.setShareContents(taShareContentService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        responseBean.addSuccess(data);
         return  responseBean;
     }
 

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.MD5Utils;
@@ -14,10 +16,8 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.service.ITaPointsRecordsService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -76,6 +76,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private ITaPointsRecordsService pointsRecordsService;
 
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
 
     @Resource
     private ApplicationContext applicationContext;
@@ -217,8 +226,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 获取访问记录
         List<Map<String, Object>> visitors = taUvMapper.getLastVisitors(CommConstant.FAVOR_CONSULTANT, person.getPersonId(), 10);
 
+        TaUser user = taUserService.getById(person.getUserId());
         // 获取关联项目
-        List<TaPersonBuilding> buildingList = getPersonBuildings(person.getPersonId());
+        List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
         List<String> buildings = new ArrayList<>();
         if (null != buildingList && buildingList.size() > 0) {
             for(TaPersonBuilding b: buildingList) {
@@ -228,22 +238,24 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         Map<String, Object> result = new HashMap<>();
         result.put("id", person.getPersonId());
-        result.put("name", person.getName());
-        result.put("company", person.getCompany());
-        result.put("department", person.getDepartment());
+        result.put("name", user.getUserName());
+        result.put("company", user.getOrgName());
+        result.put("department", user.getDepartment());
         result.put("picture", person.getPhoto());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());
         result.put("post", person.getPost());
         result.put("phone", person.getTel());
-        result.put("avatar", person.getAvatarurl());
+        result.put("avatar",user.getAvatar());
         result.put("visitors", visitors);
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("projects", buildings);
         result.put("address", person.getAddress());
         result.put("personTags",person.getPersonTags());
+        result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
+        result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
         saveQueryWrapper.eq("tagert_type", "card");
         saveQueryWrapper.eq("person_id",personId);
@@ -605,9 +617,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getPersonByOpenId(openid);
     }
 
-    public List<TaPersonBuilding> getPersonBuildings(String personId) {
+    public List<TaPersonBuilding> getPersonBuildings(String userId) {
         QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("user_id", userId);
         return taPersonBuildingMapper.selectList(queryWrapper);
     }
 
@@ -651,7 +663,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Override
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNull("person_type");
+        queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         if(building.equals("") && null != building){
             queryWrapper.eq("building_id",building);
         }

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

@@ -290,7 +290,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPerson saleMan = taPersonMapper.getSalesExecutive();
         if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
             // 发送消息
-            iMiniAppService.sendNewCustomerMessage(saleMan.getMiniOpenid(), CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
         }
 
         return ResponseBean.success(taRecommendCustomer);

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务实现类
@@ -16,5 +19,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> implements ITaRoleService {
+    @Autowired
+    TaRoleMapper taRoleMapper;
 
+    @Override
+    public List<TaRole> getRolesByUser(Integer userId) {
+        return taRoleMapper.getRolesByUser(userId);
+    }
 }

src/main/resources/mapper/TaMiniappMapper.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaMiniappMapper">
-
+    <select id="getAllAvaliableMiniapps" resultType="com.huiju.estateagents.entity.TaMiniapp">
+        SELECT
+            s.*
+        FROM
+            ta_user t
+        INNER JOIN ta_miniapp s ON t.org_id = s.org_id
+        WHERE
+            t.`status` = 1
+        AND t.exp_date &gt;= now()
+    </select>
 </mapper>

src/main/resources/mapper/TaMiniappTemplateMapper.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaMiniappTemplateMapper">
-
+    <select id="selectTplByType" resultType="com.huiju.estateagents.entity.TaMiniappTemplate">
+        SELECT
+            s.*
+        FROM
+            ta_miniapp t
+        INNER JOIN ta_miniapp_template s ON t.miniapp_id = s.miniapp_id
+        WHERE
+            t.miniapp_id = #{appid}
+        AND s.tpl_type = #{type}
+    </select>
 </mapper>

src/main/resources/mapper/TaRoleMapper.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRoleMapper">
-
+    <select id="getRolesByUser" resultType="com.huiju.estateagents.entity.TaRole">
+        SELECT
+            t.*
+        FROM
+            ta_role t
+        INNER JOIN ta_user_role s ON t.role_id = s.role_id
+        WHERE
+            s.user_id = #{user}
+    </select>
 </mapper>

src/main/resources/mapper/TaUserAuthButtonMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper">
+
+    <sql id="queryColumn">
+		t.btn_id,
+		t.menu_id,
+		t.name,
+		t.status,
+		t.code
+	</sql>
+
+    <select id="sysButtonListByUserId" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+          sys_button_in_menu t
+        where
+            t.btn_id in (
+                SELECT
+                a.role_id
+                from
+                ta_role_button a
+                where
+                a.role_id in (
+                    select
+                    role_id
+                    from
+                    ta_user_role b
+                    where
+                    b.user_id = #{userId}
+                )
+            )
+    </select>
+
+    <select id="sysButtonListByRoleId" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+        sys_button_in_menu t
+    </select>
+
+    <delete id="deleteUserAuthButton">
+      delete from ta_role_button where role_id in (
+        select role_id from ta_user_role r where r.user_id = #{userId}
+      )
+    </delete>
+
+    <update id="addUserAuthButton">
+        <foreach item="item" index="index" collection="sysButtons" separator=";" >
+            insert into ta_role_button (role_id, btn_id)
+            values
+            (
+            (select role_id from ta_user_role u where u.user_id = #{userId}),
+            #{item.btnId}
+            )
+        </foreach>
+    </update>
+
+</mapper>

src/main/resources/mapper/TaUserAuthMenuMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper">
+
+    <sql id="queryColumn">
+		t.menu_id,
+		t.code,
+		t.name,
+		t.parent_code,
+		t.icon,
+		t.app_type,
+		t.status,
+		t.menu_root
+	</sql>
+
+    <select id="sysMenuListByUserId" resultType="com.huiju.estateagents.entity.SysMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+            sys_menu t
+        where
+            t.menu_id in (
+                SELECT
+                    a.menu_id
+                from
+                    ta_role_menu a
+                where
+                    a.role_id in (
+                        select
+                            role_id
+                        from
+                            ta_user_role b
+                        where
+                            b.user_id = #{userId}
+                    )
+            )
+        order by t.sort_num desc
+    </select>
+
+    <select id="sysMenuListByRoleId" resultType="com.huiju.estateagents.entity.SysMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+          sys_menu t
+        where
+          t.app_type = 'estateagent-admin'
+          order by t.sort_num
+    </select>
+
+    <delete id="deleteUserAuthMenu">
+      delete from ta_role_menu where role_id in (
+        select role_id from ta_user_role r where r.user_id = #{userId}
+      )
+    </delete>
+
+    <update id="addUserAuthMenu">
+        <foreach item="item" index="index" collection="sysMenus" separator=";" >
+            insert into ta_role_menu (role_id, menu_id)
+            values
+            (
+              (select role_id from ta_user_role u where u.user_id = #{userId}),
+               #{item.menuId}
+            )
+        </foreach>
+    </update>
+
+</mapper>