用户角色的权限管理完成

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysUserMapper.java

@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.vo.UserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,4 +27,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 //	List<Map<String,Object>> exportList(@Param("params") Map<String,Object> params);
 
+	@Delete("delete from sys_role_user where user_id = #{userId}")
+	int deleteUserRole(Integer userId);
+
+
+	int saveUserRoles(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysUserMapper.xml

@@ -38,6 +38,11 @@
         where su.id = #{id}
     </select>
 
+    <insert id="saveUserRoles">
+        insert into sys_role_user(role_id, user_id) values
+            (#{roleId}, #{userId})
+    </insert>
+
 
     <!--    <select id="exportList" resultType="java.util.HashMap">-->
     <!--        SELECT-->

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/UserQuery.java

@@ -68,4 +68,7 @@ public class UserQuery {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	@ApiModelProperty("角色id")
+	private Integer roleId;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/UserServiceImpl.java

@@ -114,6 +114,9 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
 		if (StringUtils.isEmpty(query.getPhone())) {
 			return BaseResponse.errorMsg("手机号码不可为空!");
 		}
+		if(query.getRoleId() == null){
+			return BaseResponse.errorMsg("请选择角色信息!");
+		}
 		QueryWrapper<SysUser> qw = new QueryWrapper<>();
 		qw.eq("phone", query.getPhone());
 		int count = userMapper.selectCount(qw);
@@ -124,6 +127,8 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
 		BeanUtils.copyProperties(query, user);
 		user.setStatus(1).setIsDelete(1).setCreateTime(LocalDateTime.now());
 		userMapper.insert(user);
+
+		saveUserRoles(user.getId(), query.getRoleId());
 		return BaseResponse.okData(user);
 	}
 
@@ -139,6 +144,9 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
 		if (StringUtils.isEmpty(query.getPhone())) {
 			return BaseResponse.errorMsg("手机号码不可为空!");
 		}
+		if(query.getRoleId() == null){
+			return BaseResponse.errorMsg("请选择角色信息!");
+		}
 		QueryWrapper<SysUser> qw = new QueryWrapper<>();
 		qw.eq("phone", query.getPhone());
 		qw.ne("id", query.getId());
@@ -150,9 +158,25 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
 		BeanUtils.copyProperties(query, user);
 		user.setId(query.getId());
 		userMapper.updateById(user);
+
+		saveUserRoles(user.getId(), query.getRoleId());
 		return BaseResponse.okData(user);
 	}
 
+	/**
+	 * 保存用户和角色信息
+	 * @param userId
+	 * @param roleId
+	 */
+	private void saveUserRoles(Integer userId, Integer roleId) {
+		if (userId != null) {
+			userMapper.deleteUserRole(userId);
+			if (roleId != null) {
+				userMapper.saveUserRoles(userId, roleId);
+			}
+		}
+	}
+
 	/**
 	 * 禁用启用
 	 *

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java

@@ -47,7 +47,7 @@ public class WeiXinService {
         System.out.println("==================code===================");
         System.out.println(code);
         try {
-            String accessToken = null;
+           /* String accessToken = null;
             if (type.equals("PC")) {
                 accessToken = getAccessToken();
             } else if (type.equals("APP")) {
@@ -64,10 +64,10 @@ public class WeiXinService {
             String UserId = jsonObject.getString("UserId");
             System.out.println("==================UserId===================");
             System.out.println(UserId);
-            JSONObject userJson = getUser(accessToken, UserId);
+            JSONObject userJson = getUser(accessToken, UserId);*/
             QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-            wrapper.eq("phone", userJson.get("mobile"));
-//            wrapper.eq("phone", code);  //暂时用手机号代替code
+//            wrapper.eq("phone", userJson.get("mobile"));
+            wrapper.eq("phone", code);  //暂时用手机号代替code
             SysUser sysUser = userService.getOne(wrapper);
             if (sysUser == null) {
                 return BaseResponse.errorMsg("非系统用户不允许登录!");
@@ -83,8 +83,8 @@ public class WeiXinService {
                     sysUser.getName(), sysUser.getPhone());
             System.out.println(token);
             redisUtil.setString(sysUser.getId().toString(), token, 3600);
-            sysUser.setWxId(UserId);
-            userService.updateById(sysUser);
+//            sysUser.setWxId(UserId);
+//            userService.updateById(sysUser);
             return BaseResponse.okData(token);
         } catch (Exception e) {
             return BaseResponse.errorMsg(e.getMessage());

cement-business/src/main/java/cn/wise/sc/cement/business/util/weixin/Global.java

@@ -12,7 +12,7 @@ public interface Global {
 
 	//企业应用的id，整型。可在应用的设置页面查看
 	public final static int agentId = 1000002;
-
+	public final static int agentIdPC = 1000003;
 	//企业ID
 	public final static String corpId = "ww348f91b2573c1867";
 

cement-business/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     # 192.168.110.85   admin!@#123
     url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    #url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#    url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver