From 36f3fff571c8a66cb9a7841ca0ae5a71e918b543 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 十二月 2025 16:12:27 +0800
Subject: [PATCH] 后台接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
index 6748a98..3232611 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
@@ -8,6 +8,7 @@
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -125,7 +126,7 @@
user.setPassword(company.getPassword());
user.setPhonenumber(company.getChargePersonPhone());
user.setNickName(company.getChargePerson());
- user.setRoleId(1l);
+ user.setRoleId(2l);
if (!userService.checkUserNameUnique(user)) {
return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
@@ -199,7 +200,7 @@
@GetMapping(value = "/getQrcode")
public R<String> getQrcode(@RequestParam Long userId) {
SysUser sysUser = userService.selectUserById(userId);
- Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + sysUser.getCode());
+ Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + sysUser.getUserId());
if(o!=null){
return R.ok(o.toString());
}
@@ -208,12 +209,13 @@
Map<String, Object> param = new HashMap<>();
param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
- param.put("scene", "userId=" + userId); //二维码尺寸
+ param.put("scene", "code=" + sysUser.getCode()+"&type=1"); //二维码尺寸
param.put("env_version", "trial"); //二维码尺寸
+ param.put("check_path", false); //二维码尺寸
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
-
- byte[] result = post.execute().bodyBytes();
+ HttpResponse execute = post.execute();
+ byte[] result =execute .bodyBytes();
// base64
String img = Base64.getEncoder().encodeToString(result);
// 后台用户的小程序码
@@ -267,6 +269,9 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+
+ user.setRoleType(3);
+ user.setRoleId(1l);
// 随机10数数字
userService.insertUser(user);
if(user.getCompanyId()!=null){
@@ -284,7 +289,7 @@
// base64
String img = Base64.getEncoder().encodeToString(result);
// 后台用户的小程序码
- redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getCode(), img);
+ redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getUserId(), img);
}
return R.ok();
}
@@ -305,11 +310,12 @@
{
return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
-
user.setUpdateBy(getUsername());
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
+ // 移除之前的二维码
+ redisTemplate.delete("ADMIN_WX_IMG" + user.getUserId());
return R.ok(userService.updateUser(user));
}
@@ -402,7 +408,7 @@
sysUser.setCreateBy(getUsername());
sysUser.setRoleType(3);
- sysUser.setRoleId(1L);
+ sysUser.setRoleId(2L);
// sysUsers.add(sysUser);
userService.insertUser(sysUser);
i++;
--
Gitblit v1.7.1