|
|
@ -33,6 +33,8 @@ import com.yxt.supervise.system.sysuserrole.SysUserRole; |
|
|
|
import com.yxt.supervise.system.sysuserrole.SysUserRoleService; |
|
|
|
import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuth; |
|
|
|
import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuthService; |
|
|
|
import com.yxt.supervise.system.useropenid.UserOpenid; |
|
|
|
import com.yxt.supervise.system.useropenid.UserOpenidService; |
|
|
|
import org.apache.ibatis.annotations.Param; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
@ -109,6 +111,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
private SysRoleService sysRoleService; |
|
|
|
@Autowired |
|
|
|
private SysUserRoleService userRoleService; |
|
|
|
@Autowired |
|
|
|
private UserOpenidService userOpenidService; |
|
|
|
|
|
|
|
|
|
|
|
public PagerVo<SysUser> listPage(PagerQuery<SysUserQuery> pq) { |
|
|
@ -1188,19 +1192,31 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
if (!jsonObject.containsKey("openid")){ |
|
|
|
return rb.setMsg("未获得openid,请联系管理员"); |
|
|
|
} |
|
|
|
// String unionid = jsonObject.get("unionid").toString();
|
|
|
|
String unionid = jsonObject.get("unionid").toString(); |
|
|
|
String openid = jsonObject.get("openid").toString(); |
|
|
|
Map<String,String>map=new HashMap<>(); |
|
|
|
map.put("unionid",unionid); |
|
|
|
map.put("openid",openid); |
|
|
|
// 判断用户登陆授权表是否存在该用户unionid和openid,如果不存在就增加一条返回
|
|
|
|
SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("appletOpenid",openid)); |
|
|
|
// Map<String,String> map=new HashMap<>();
|
|
|
|
// map.put("openid",openid);
|
|
|
|
// map.put("unionid",unionid);
|
|
|
|
if(sysUser==null){ |
|
|
|
return rb.setMsg("此微信没有绑定用户").setCode("100").setData(openid); |
|
|
|
}else{ |
|
|
|
|
|
|
|
List<SysUserWxAuth> sysUserWxAuths = sysUserWxAuthService.fetchByUnionid(unionid); |
|
|
|
if(sysUserWxAuths.size()==0){ |
|
|
|
return rb.setMsg("此微信没有绑定用户信息,请先去绑定用户").setCode("110").setData(map); |
|
|
|
} |
|
|
|
|
|
|
|
SysUserWxAuth sysUserWxAuth = sysUserWxAuthService.fetchByUnionidAndOpenid(unionid,openid); |
|
|
|
if (sysUserWxAuth == null) { |
|
|
|
// 添加一个新用户授权记录
|
|
|
|
SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); |
|
|
|
sysUserWxAuth1.setUnionid(unionid); |
|
|
|
sysUserWxAuth1.setOpenid(openid); |
|
|
|
sysUserWxAuth1.setSysUserSid(sysUserWxAuths.get(0).getSysUserSid()); |
|
|
|
boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); |
|
|
|
if ( !isSave ){ |
|
|
|
return rb.setMsg("登陆:新增用户授权表失败"); |
|
|
|
} |
|
|
|
//return rb.setMsg(SysUserWxAuth_Not_Exist.getMsg()).setCode(SysUserWxAuth_Not_Exist.getCode());
|
|
|
|
} |
|
|
|
String sysUserSid = sysUserWxAuths.get(0).getSysUserSid(); |
|
|
|
SysUser sysUser = fetchBySid(sysUserSid); |
|
|
|
// 重置Token失效时间
|
|
|
|
// {写代码}
|
|
|
|
SysUserVo sysUserVo=setUserRedisSessionToken(sysUser); |
|
|
@ -1221,8 +1237,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
*/ |
|
|
|
public ResultBean<SysUserLoginVo> vSilentLogin(String wxCode){ |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
// 通过wxCode获取unionid,失败返回微信的错误提示。
|
|
|
|
// ResultBean<JSONObject> rbJsonObject = getCode2Session(wxCode,APP_ID,SECRET);
|
|
|
|
ResultBean<JSONObject> rbJsonObject = wxLogin(wxCode,APP_ID,SECRET); |
|
|
|
if (!rbJsonObject.getSuccess()){ |
|
|
|
JSONObject jsonObject = rbJsonObject.getData(); |
|
|
@ -1240,7 +1254,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
// 判断用户登陆授权表是否存在该用户unionid和openid,如果不存在就增加一条返回
|
|
|
|
List<SysUserWxAuth> sysUserWxAuths = sysUserWxAuthService.fetchByUnionid(unionid); |
|
|
|
if(sysUserWxAuths.size()==0){ |
|
|
|
return rb.setMsg("此微信没有绑定用户信息,请先去绑定用户"); |
|
|
|
return rb.setMsg("此微信没有绑定用户信息,请先去绑定用户").setCode("110"); |
|
|
|
} |
|
|
|
SysUserWxAuth sysUserWxAuth = sysUserWxAuthService.fetchByUnionidAndOpenid(unionid,openid); |
|
|
|
if (sysUserWxAuth == null) { |
|
|
@ -1308,17 +1322,12 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
if (!jsonObject.containsKey("openid")){ |
|
|
|
return rb.setMsg("未获得openid,请联系管理员"); |
|
|
|
} |
|
|
|
// String unionid = jsonObject.get("unionid").toString();
|
|
|
|
String unionid = jsonObject.get("unionid").toString(); |
|
|
|
String openid = jsonObject.get("openid").toString(); |
|
|
|
// 判断用户登陆授权表是否存在该用户unionid和openid,如果不存在就增加一条返回
|
|
|
|
// SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("appletOpenid",openid));
|
|
|
|
// Map<String,String> map=new HashMap<>();
|
|
|
|
// map.put("openid",openid);
|
|
|
|
// map.put("unionid",unionid);
|
|
|
|
// if(sysUser==null){
|
|
|
|
// return rb.setMsg("此微信没有绑定用户").setCode("100").setData(openid);
|
|
|
|
// }
|
|
|
|
return rb.success().setData(openid); |
|
|
|
Map<String,String> map=new HashMap<>(); |
|
|
|
map.put("unionid",unionid); |
|
|
|
map.put("openid",openid); |
|
|
|
return rb.success().setData(map); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@ -1396,14 +1405,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
if(!vali.get("code").equals("200")){ |
|
|
|
return rb.setMsg(vali.get("details").toString()); |
|
|
|
} |
|
|
|
sysUserSid = sysUser.getSid(); |
|
|
|
sysUser.setAppletOpenid(sysUserWxBindMobileDto.getOpenid()); |
|
|
|
sysUser.setUnionid(sysUserWxBindMobileDto.getUnionid()); |
|
|
|
int i= baseMapper.updateById(sysUser); |
|
|
|
if (i>0){ |
|
|
|
SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); |
|
|
|
sysUserWxAuth1.setUnionid(sysUserWxBindMobileDto.getUnionid()); |
|
|
|
sysUserWxAuth1.setOpenid(sysUserWxBindMobileDto.getOpenid()); |
|
|
|
sysUserWxAuth1.setSysUserSid(sysUser.getSid()); |
|
|
|
boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); |
|
|
|
if (true==isSave){ |
|
|
|
return rb.success().setMsg("绑定成功").setData(sysUser); |
|
|
|
} |
|
|
|
else{ |
|
|
|
}else{ |
|
|
|
return rb.setMsg("绑定失败"); |
|
|
|
} |
|
|
|
}else{ |
|
|
@ -1434,8 +1443,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
return rb.setMsg("绑定成功"); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
return rb.setMsg("您的平台应用未被授权,请联系工作人员。"); |
|
|
|
//注册用户
|
|
|
|
UserOpenid user=new UserOpenid(); |
|
|
|
user.setSid(UUID.randomUUID().toString()); |
|
|
|
user.setMobile(sysUserWxBindMobileDto.getMobile()); |
|
|
|
user.setOpenid(sysUserWxBindMobileDto.getOpenid()); |
|
|
|
user.setUnionid(sysUserWxBindMobileDto.getUnionid()); |
|
|
|
userOpenidService.save(user); |
|
|
|
return rb.setMsg("注册信息已提交,请耐心等待审核"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |