tangzheng/totus-nline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
tangzh 2025-07-15 14:31:55 +08:00
parent 48a8e92631
commit 8c16585ae6
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java
View File

@ -53,19 +53,20 @@ public class BusUserController {
@GetMapping(value = "/info") @GetMapping(value = "/info")
public ResponseEntity<LoginVo> getLoginInfo() { public ResponseEntity<LoginVo> getLoginInfo() {
JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
BusUser busUser = busUserService.queryById(jwtUser.getUser().getId());
LoginVo loginVo = new LoginVo(); LoginVo loginVo = new LoginVo();
loginVo.setType("login"); loginVo.setType("login");
loginVo.setUid(jwtUser.getUser().getId()); loginVo.setUid(jwtUser.getUser().getId());
loginVo.setNikeName(jwtUser.getUser().getNickName()); loginVo.setNikeName(busUser.getNickname());
loginVo.setAvatar(jwtUser.getUser().getAvatarPath()); loginVo.setAvatar(busUser.getAvatar());
loginVo.setPhone(jwtUser.getUser().getPhone()); loginVo.setPhone(busUser.getPhone());
return new ResponseEntity<>(loginVo, HttpStatus.OK); return new ResponseEntity<>(loginVo, HttpStatus.OK);
} }
@Log("信息修改") @Log("信息修改")
@ApiOperation("修改用户信息") @ApiOperation("修改用户信息")
@PostMapping(value = "/update") @PostMapping(value = "/update")
public ResponseEntity<String> updateInfo(@Validated @RequestBody BusUserVo user) { public ResponseEntity<String> updateInfo(@RequestBody BusUserVo user) {
JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
BusUser upd = new BusUser(); BusUser upd = new BusUser();
upd.setId(jwtUser.getUser().getId()); upd.setId(jwtUser.getUser().getId());

6
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java
View File

@ -65,9 +65,9 @@ public class WeChatServiceImpl implements WeChatService {
@Override @Override
public LoginVo authorizeLogin(String code, HttpServletRequest request) { public LoginVo authorizeLogin(String code, HttpServletRequest request) {
LoginVo loginVo = new LoginVo(); LoginVo loginVo = new LoginVo();
WeChatMiniAuthorizeVo response = miniAuthCode(code); // WeChatMiniAuthorizeVo response = miniAuthCode(code);
// WeChatMiniAuthorizeVo response = new WeChatMiniAuthorizeVo(); WeChatMiniAuthorizeVo response = new WeChatMiniAuthorizeVo();
// response.setOpenId("123456"); response.setOpenId("123456");
String openId = response.getOpenId(); String openId = response.getOpenId();
String type = "login"; String type = "login";
BusUser BusUser = BusUserMapper.getUserByOpenId(openId); BusUser BusUser = BusUserMapper.getUserByOpenId(openId);

2
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/BusUserService.java
View File

@ -34,6 +34,8 @@ public interface BusUserService extends IService<BusUser> {
JwtUserDto addUserCache(BusUser BusUser); JwtUserDto addUserCache(BusUser BusUser);
BusUser queryById(Long id);
/** /**
* 查询数据分页 * 查询数据分页
* @param criteria 条件 * @param criteria 条件

7
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserServiceImpl.java
View File

@ -17,7 +17,6 @@ package me.zhengjie.modules.system.service.impl;
import me.zhengjie.modules.security.service.UserCacheManager; import me.zhengjie.modules.security.service.UserCacheManager;
import me.zhengjie.modules.security.service.dto.JwtUserDto; import me.zhengjie.modules.security.service.dto.JwtUserDto;
import me.zhengjie.modules.system.domain.BusDevice;
import me.zhengjie.modules.system.domain.BusUser; import me.zhengjie.modules.system.domain.BusUser;
import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.domain.User;
import me.zhengjie.modules.system.domain.dto.BusTreeVo; import me.zhengjie.modules.system.domain.dto.BusTreeVo;
@ -32,7 +31,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.PageUtil;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageResult;
@ -49,6 +47,11 @@ public class BusUserServiceImpl extends ServiceImpl<BusUserMapper, BusUser> impl
@Autowired private BusUserMapper busUserMapper; @Autowired private BusUserMapper busUserMapper;
@Autowired private UserCacheManager userCacheManager; @Autowired private UserCacheManager userCacheManager;
@Override
public BusUser queryById(Long id) {
return busUserMapper.selectById(id);
}
@Override @Override
public PageResult<BusUser> queryAll(BusUserQueryCriteria criteria, Page<Object> page){ public PageResult<BusUser> queryAll(BusUserQueryCriteria criteria, Page<Object> page){
return PageUtil.toPage(busUserMapper.findAll(criteria, page)); return PageUtil.toPage(busUserMapper.findAll(criteria, page));