feats

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.BaseController;
@@ -87,6 +88,18 @@ public class TaUserController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping(value = "/center/turn/taUser/{id}/{type}")
+    public ResponseBean turnUser(@PathVariable String type, @PathVariable Integer id) {
+        try {
+            iTaUserService.turnUserOnOrNot(id, "on".equals(type));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID
@@ -145,6 +158,28 @@ public class TaUserController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 重置密码
+     * @param plat
+     * @param id
+     * @return
+     */
+    @PutMapping(value = "/{plat}/password/taUser/{id}")
+    public ResponseBean resetPassword(@PathVariable String plat, @PathVariable Integer id, HttpServletRequest request) {
+        if (!"center".equals(plat) && !"admin".equals(plat)) {
+            return ResponseBean.error("您没有权限进行此操作", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
+
+        String newPass = plat.equals("center") ? "abc@123" : "123456";
+        try {
+            iTaUserService.resetPassword(id, newPass);
+            return ResponseBean.success("新密码为: " + newPass);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 获取当前用户信息
      * @param request

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

@@ -3,6 +3,7 @@ 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.TaMiniapp;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -92,4 +93,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String waterMark;
+
+    /**
+     * 关联小程序
+     */
+    @TableField(exist = false)
+    private TaMiniapp miniapp;
 }

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

@@ -23,4 +23,8 @@ public interface ITaUserService extends IService<TaUser> {
     TaUser getInfoWithOrg(Integer id);
 
     void updateInfoWithOrg(TaUser taUser) throws Exception;
+
+    void turnUserOnOrNot(Integer id, boolean isOn) throws Exception;
+
+    void resetPassword(Integer id, String newPass) throws Exception;
 }

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

@@ -7,9 +7,15 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +39,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private TaOrgMapper taOrgMapper;
+
+	@Autowired
+	private TaMiniappMapper taMiniappMapper;
+
+	@Autowired
+	private TaMiniappTemplateMapper taMiniappTemplateMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -94,6 +106,17 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setWaterMark(taOrg.getWaterMark());
 		}
 
+		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
+		wrapper.eq("org_id", taOrg.getOrgId());
+
+		TaMiniapp taMiniapp = taMiniappMapper.selectOne(wrapper);
+		if (null != taMiniapp) {
+			QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
+			query.eq("miniapp_id", taMiniapp.getMiniappId());
+			taMiniapp.setTpls(taMiniappTemplateMapper.selectList(query));
+		}
+
+		taUser.setMiniapp(taMiniapp);
 		taUser.setLoginPassword(null);
 		return taUser;
 	}
@@ -114,4 +137,38 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("更新用户信息失败");
 		}
 	}
+
+	@Override
+	public void turnUserOnOrNot(Integer id, boolean isOn) throws Exception {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			throw new Exception("未找到有效的用户信息");
+		}
+
+		Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
+		TaUser user = new TaUser();
+		user.setStatus(status);
+		user.setUserId(id);
+
+		if (!this.updateById(user)) {
+			throw new Exception("开启或禁用用户失败");
+		}
+	}
+
+	@Override
+	public void resetPassword(Integer id, String newPass) throws Exception {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			throw new Exception("未找到有效的用户信息");
+		}
+
+		String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+		TaUser user = new TaUser();
+		user.setLoginPassword(encryptPass);
+		user.setUserId(id);
+
+		if (!this.updateById(user)) {
+			throw new Exception("重置用户密码失败");
+		}
+	}
 }

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

@@ -43,6 +43,11 @@ public class CommConstant {
      */
     public final static int STATUS_DELETE = -1;
 
+    /**
+     * 状态: 关闭、禁用
+     */
+    public final static int STATUS_CLOSED = 9;
+
     /**
      * 消息未读
      */

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

@@ -103,6 +103,7 @@ public class JWTUtils {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+
         return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
     }
 }

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

@@ -6,6 +6,8 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -32,9 +34,13 @@ public class WxUtils {
         return miniApp;
     }
 
+    @Autowired
+    ITaBuildingService iTaBuildingService;
+
     @PostConstruct
     public void init() {
         System.out.println("-------------PostConstruct----------------");
+
         WxMaInMemoryConfig config = new WxMaInMemoryConfig();
 
         WxProperties.Miniapp miniProperty = WxUtils.properties.getMiniapp();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.service.ISysMenuService;
 import org.slf4j.Logger;
@@ -12,6 +13,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 菜单表 不同系统,菜单不一致 前端控制器
@@ -21,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class SysMenuController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(SysMenuController.class);
@@ -140,4 +146,29 @@ public class SysMenuController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取所有模块
+     * @return
+     */
+    @GetMapping(value = "/center/sysmodules")
+    public ResponseBean allModules(@RequestParam Integer userId) {
+        List<SysMenu> sysMenuList = iSysMenuService.getAllModules(userId);
+        return ResponseBean.success(sysMenuList);
+    }
+
+    @PostMapping(value = "/center/sysmodules")
+    public ResponseBean authorizeModules(@RequestBody Map<String, Object> data) {
+
+        Integer userId = (Integer) data.get("userId");
+        List<Integer> menuIds = (List<Integer>) data.get("menus");
+
+        try {
+            iSysMenuService.authorizeModules(userId, menuIds);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaMiniappController.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>
     * 小程序表  前端控制器
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaMiniappController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaMiniappController.class);
@@ -62,14 +64,12 @@ public class TaMiniappController extends BaseController {
      * @return
      */
     @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
-    public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp){
+    public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+
         try {
-            if (iTaMiniappService.save(taMiniapp)){
-                responseBean.addSuccess(taMiniapp);
-            }else {
-                responseBean.addError("fail");
-            }
+            iTaMiniappService.saveInfoWithTpls(taMiniapp);
+            responseBean.addSuccess(taMiniapp);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taMiniappAdd -=- {}",e.toString());

src/main/java/com/huiju/estateagents/entity/SysMenu.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;
@@ -59,5 +60,19 @@ public class SysMenu implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 模块ID, 也是根菜单ID
+     */
+    private Integer menuRoot;
 
+    /**
+     * 排序
+     */
+    private Integer sortNum;
+
+    /**
+     * 是否有权限
+     */
+    @TableField(exist = false)
+    private Boolean hasRights;
 }

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

@@ -1,10 +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>
@@ -24,6 +28,7 @@ public class TaMiniapp implements Serializable {
     /**
      * 小程序ID
      */
+    @TableId(value = "miniapp_id", type = IdType.INPUT)
     private String miniappId;
 
     /**
@@ -51,5 +56,6 @@ public class TaMiniapp implements Serializable {
      */
     private Integer orgId;
 
-
+    @TableField(exist = false)
+    private List<TaMiniappTemplate> tpls;
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,6 +26,7 @@ public class TaMiniappTemplate implements Serializable {
     /**
      * 序号
      */
+    @TableId(value = "serial_no", type = IdType.AUTO)
     private Integer serialNo;
 
     /**

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
+    List<SysMenu> getUserModules(@Param("userId") Integer userId);
+
+    Integer deleteAdminBtns(@Param("menus") List<Integer> menus, @Param("orgId") Integer orgId, @Param("roleId") Integer roleId);
+    Integer deleteAdminMenus(@Param("menus") List<Integer> menus, @Param("orgId") Integer orgId, @Param("roleId") Integer roleId);
 
+    Integer insertAdminMenus(@Param("menus") List<Integer> menus, @Param("roleId") Integer roleId);
+    Integer insertAdminBtns(@Param("menus") List<Integer> menus, @Param("roleId") Integer roleId);
 }

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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.SysMenu;
 
+import java.util.List;
+
 /**
  * <p>
  * 菜单表 不同系统,菜单不一致 服务类
@@ -13,4 +15,7 @@ import com.huiju.estateagents.entity.SysMenu;
  */
 public interface ISysMenuService extends IService<SysMenu> {
 
+    List<SysMenu> getAllModules(Integer userId);
+
+    void authorizeModules(Integer userId, List<Integer> menuIds) throws Exception;
 }

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

@@ -13,4 +13,5 @@ import com.huiju.estateagents.entity.TaMiniapp;
  */
 public interface ITaMiniappService extends IService<TaMiniapp> {
 
+    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception;
 }

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

@@ -1,11 +1,28 @@
 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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.entity.TaRoleMenu;
 import com.huiju.estateagents.mapper.SysMenuMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Array;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  * 菜单表 不同系统,菜单不一致 服务实现类
@@ -16,5 +33,88 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
+    @Autowired
+    SysMenuMapper sysMenuMapper;
+
+    @Autowired
+    TaRoleMapper taRoleMapper;
+
+    @Autowired
+    TaUserMapper taUserMapper;
+
+    @Autowired
+    TaUserRoleMapper taUserRoleMapper;
+
+    @Override
+    public List<SysMenu> getAllModules(Integer userId) {
+        return sysMenuMapper.getUserModules(userId);
+    }
+
+    @Override
+    public void authorizeModules(Integer userId, List<Integer> menuIds) throws Exception {
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            throw new Exception("授权人员不存在");
+        }
+
+        // 先更新角色, 如果没有就创建
+        QueryWrapper<TaRole> queryRole = new QueryWrapper<>();
+        queryRole.eq("org_id", taUser.getOrgId());
+        queryRole.eq("is_admin", true);
+        TaRole taRole = taRoleMapper.selectOne(queryRole);
+        if (null == taRole) {
+            taRole = new TaRole();
+            taRole.setOrgId(taUser.getOrgId());
+            taRole.setRoleName("管理员");
+            taRole.setIsAdmin(true);
+            taRole.setStatus(CommConstant.STATUS_NORMAL);
+            taRole.setCreateDate(LocalDateTime.now());
+            if (taRoleMapper.insert(taRole) < 1) {
+                throw new Exception("生成管理员角色字典失败");
+            }
+        }
+
+        QueryWrapper<TaUserRole> queryUserRole = new QueryWrapper<>();
+        queryUserRole.eq("user_id", taUser.getUserId());
+        queryUserRole.eq("role_id", taRole.getRoleId());
+        if (taUserRoleMapper.selectCount(queryUserRole) < 1) {
+            TaUserRole taUserRole = new TaUserRole();
+            taUserRole.setRoleId(taRole.getRoleId());
+            taUserRole.setUserId(taUser.getUserId());
+            if (taUserRoleMapper.insert(taUserRole) < 1) {
+                throw new Exception("生成管理员角色失败");
+            }
+        }
+
+        // 再更新角色授权菜单
+        // 处理菜单有个难点, 如果取消了某个模块. 那么需要把当前管理员所属 Org 的相关菜单，按钮都要取消
+        // 但是, 如果新增了, 暂时不处理
+        List<SysMenu> userModules = sysMenuMapper.getUserModules(taUser.getUserId());
+        List<Integer> subMenus = minusMenu(userModules, menuIds);
+        if (null != subMenus && subMenus.size() > 0) {
+            sysMenuMapper.deleteAdminBtns(subMenus, taUser.getOrgId(), null);
+            sysMenuMapper.deleteAdminMenus(subMenus, taUser.getOrgId(), null);
+        }
+
+        // 先删除授权模块, 再新增
+        sysMenuMapper.deleteAdminMenus(menuIds, null, taRole.getRoleId());
+        sysMenuMapper.insertAdminMenus(menuIds, taRole.getRoleId());
+
+        // 先删除授权按钮, 再新增
+        sysMenuMapper.deleteAdminBtns(menuIds, null, taRole.getRoleId());
+        sysMenuMapper.insertAdminBtns(menuIds, taRole.getRoleId());
+    }
+
+    private List<Integer> minusMenu(List<SysMenu> origin, List<Integer> menuList) {
+        List<Integer> notIn = new ArrayList<>();
+
+        for(SysMenu menu : origin) {
+            if (!menuList.contains(menu.getMenuId())) {
+                notIn.add(menu.getMenuId());
+            }
+        }
 
+        return notIn;
+    }
 }

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

@@ -1,9 +1,14 @@
 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.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +21,48 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp> implements ITaMiniappService {
+    @Autowired
+    TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Override
+    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception {
+        if (StringUtils.isEmpty(taMiniapp.getMiniappId())) {
+            throw new Exception("请填写小程序 AppID");
+        }
+
+        if (StringUtils.isEmpty(taMiniapp.getSecret())) {
+            throw new Exception("请填写小程序 Secret");
+        }
+
+        if (StringUtils.isEmpty(taMiniapp.getName())) {
+            throw new Exception("请填写小程序 名称");
+        }
+
+        if (null == taMiniapp.getOrgId() || taMiniapp.getOrgId() == 0) {
+            throw new Exception("未知的小程序所属对象");
+        }
+
+        TaMiniapp orign = this.getById(taMiniapp.getMiniappId());
+        if (null != orign) {
+            if (!this.updateById(taMiniapp)) {
+                throw new Exception("保存小程序信息出错");
+            }
+        } else if (!this.save(taMiniapp)) {
+            throw new Exception("保存小程序信息出错");
+        }
+
+        if (null != taMiniapp.getTpls()) {
+            // 插入之前先删除
+            QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("miniapp_id", taMiniapp.getMiniappId());
+            taMiniappTemplateMapper.delete(queryWrapper);
+
+            for(TaMiniappTemplate tpl: taMiniapp.getTpls()) {
+                tpl.setMiniappId(taMiniapp.getMiniappId());
+                taMiniappTemplateMapper.insert(tpl);
+            }
+        }
+
+        return taMiniapp;
+    }
 }

src/main/resources/mapper/SysMenuMapper.xml

@@ -1,5 +1,91 @@
 <?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.SysMenuMapper">
+    <select id="getUserModules" resultType="com.huiju.estateagents.entity.SysMenu">
+        SELECT
+            t.*,
+            IF(s.user_id IS NULL, 0, 1) AS has_rights
+        FROM
+            sys_menu t
+        LEFT JOIN (
+            SELECT
+                a.menu_id,
+                b.user_id
+            FROM
+                ta_role_menu a
+            INNER JOIN ta_user_role b ON a.role_id = b.role_id
+            AND b.user_id = #{userId}
+        ) s ON t.menu_id = s.menu_id
+        WHERE
+            t.menu_id = t.menu_root
+        AND t.`status` = 1
+        ORDER BY sort_num
+    </select>
 
+    <delete id="deleteAdminBtns">
+        DELETE t
+        FROM
+            ta_role_button t
+        INNER JOIN sys_button_in_menu b ON t.btn_id = b.btn_id
+        INNER JOIN sys_menu m ON m.menu_id = b.menu_id
+        INNER JOIN ta_role r ON t.role_id = r.role_id
+        WHERE
+            <if test="orgId != null">
+                r.org_id = #{orgId}
+            </if>
+            <if test="roleId != null">
+                r.role_id = #{roleId}
+            </if>
+        AND m.menu_root IN
+            <foreach item="item" index="index" collection="menus" open="(" separator="," close=")">
+              #{item}
+            </foreach>
+    </delete>
+
+    <delete id="deleteAdminMenus">
+        DELETE t
+        FROM
+            ta_role_menu t
+        INNER JOIN sys_menu m ON m.menu_id = t.menu_id
+        INNER JOIN ta_role r ON t.role_id = r.role_id
+        WHERE
+            <if test="orgId != null">
+                r.org_id = #{orgId}
+            </if>
+            <if test="roleId != null">
+                r.role_id = #{roleId}
+            </if>
+        AND m.menu_root IN
+            <foreach item="item" index="index" collection="menus" open="(" separator="," close=")">
+              #{item}
+            </foreach>
+    </delete>
+
+    <insert id="insertAdminMenus">
+        INSERT INTO ta_role_menu (role_id, menu_id)
+        SELECT
+            ${roleId},
+            s.menu_id
+        FROM
+            sys_menu s
+        WHERE
+            s.menu_root IN
+        <foreach item="item" index="index" collection="menus" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </insert>
+
+    <insert id="insertAdminBtns">
+        INSERT INTO ta_role_button (role_id, btn_id) SELECT
+            ${roleId},
+            m.btn_id
+        FROM
+            sys_menu s
+        INNER JOIN sys_button_in_menu m ON s.menu_id = m.menu_id
+        WHERE
+            s.menu_root IN
+        <foreach item="item" index="index" collection="menus" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </insert>
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -11,6 +11,7 @@
             t.phone,
             t.avatar,
             t.create_date AS createDate,
+            t.status,
             o.NAME AS orgName,
             o.address,
             o.logo,
@@ -18,7 +19,7 @@
             m.miniapp_id AS miniappId,
             m.secret,
             m.token,
-            m.NAME AS miniaooName,
+            m.NAME AS miniappName,
             m.qr_code AS qrCode
         FROM
             ta_user t