From e098e89e2e358f73bdc3f8bf39b83371d70a1c34 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 14 五月 2025 17:13:04 +0800
Subject: [PATCH] 登录成功返回用户权限和用户信息
---
src/main/java/com/whyc/service/LoginService.java | 10 +++++-----
src/main/java/com/whyc/controller/PowerInfController.java | 8 ++++----
src/main/java/com/whyc/service/PowerInfService.java | 12 ++++++------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PowerInfController.java b/src/main/java/com/whyc/controller/PowerInfController.java
index 02d27ee..74094b0 100644
--- a/src/main/java/com/whyc/controller/PowerInfController.java
+++ b/src/main/java/com/whyc/controller/PowerInfController.java
@@ -17,25 +17,25 @@
private PowerInfService service;
- @ApiOperation(value = "娣诲姞鏈烘埧")
+ @ApiOperation(value = "娣诲姞鐢垫簮")
@PostMapping("addPower")
public Response addPower(@RequestBody PowerInf pinf){
return service.addPower(pinf);
}
- @ApiOperation(value = "鍒犻櫎鏈烘埧")
+ @ApiOperation(value = "鍒犻櫎鐢垫簮")
@GetMapping("delPower")
public Response delPower(@RequestParam Integer pid){
return service.delPower(pid);
}
- @ApiOperation(value = "淇敼鏈烘埧")
+ @ApiOperation(value = "淇敼鐢垫簮")
@PostMapping("updatePower")
public Response updatePower(@RequestBody PowerInf pinf){
return service.updatePower(pinf);
}
- @ApiOperation(value = "鏌ヨ鏈烘埧")
+ @ApiOperation(value = "鏌ヨ鐢垫簮")
@PostMapping("getPower")
public Response getPower(@RequestBody PowerDto dto){
return service.getPower(dto);
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 5be4b06..8c162e3 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -238,8 +238,8 @@
//鍥炲啓鐧诲綍鏃堕棿鍒版暟鎹簱
userService.updateLoginTime(userInf.getId());
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勬潈闄愮粍id骞惰繑鍥炵粰鍓嶇
- LinkedList<Object> dataList = new LinkedList<>();
- dataList.add(userInf);
+ Map<String,Object> map=new HashMap<>();
+ map.put("user",userInf);
PermitgroupUsr permitGroup = permitGroupUserService.getPermitGroup(userInf.getId());
if(permitGroup == null){
return response.set(1, false, "褰撳墠鐢ㄦ埛娌℃湁瀵瑰簲鐨勬潈闄愮粍,鐧诲綍澶辫触");
@@ -247,12 +247,12 @@
int permitGroupId = permitGroup.getPermitGroupId();
//鏌ヨ鏉冮檺缁勪俊鎭�
List<Permitgroup> permitgroupList=permitGroupService.getPermitGroup(permitGroupId);
- dataList.add(permitgroupList);
+ map.put("permit",permitgroupList);
}
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勭彮缁勬爣璇�
- dataList.add(bjService.getGroupFlag(userInf.getId().intValue()));
+ map.put("teamFlag",bjService.getGroupFlag(userInf.getId().intValue()));
CommonUtil.record( UserLogTypeEnum.CATEGORY_SYSTEM.getType(), UserLogTypeEnum.LOGIN.getType(),UserLogTypeEnum.LOGIN.getName(), UserLogTypeEnum.LOGIN.getName());
- return response.setII(1, true, dataList, "鐧诲綍鎴愬姛");
+ return response.setII(1, true, map, "鐧诲綍鎴愬姛");
}
return response.set(1, false,"璁よ瘉鏈�氳繃");
}
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index cbde0d3..2a3cc8e 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -24,7 +24,7 @@
@Autowired(required = false)
private StationInfMapper sinfMapper;
- //娣诲姞鏈烘埧
+ //娣诲姞鐢垫簮
public Response addPower(PowerInf addpinf) {
/* //鍒ゆ柇娣诲姞閿佺殑鏃跺�欐満鎴挎槸涓嶆槸鏂版満鎴�
String fullName=addpinf.getProvice()+"_"+addpinf.getCity()+"_"+addpinf.getCountry()+"_"+addsinf.getStationName();
@@ -52,16 +52,16 @@
newSinf.setCountry(addsinf.getCountry());
newSinf.setStationName(addsinf.getStationName());
mapper.insert(newSinf);*/
- return new Response().set(1,true,"娣诲姞鏈烘埧");
+ return new Response().set(1,true,"娣诲姞鐢垫簮");
}
- //鍒犻櫎鏈烘埧
+ //鍒犻櫎鐢垫簮
public Response delPower(Integer pid) {
/* UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("station_id",stationId);
mapper.delete(wrapper);*/
return new Response().set(1,true);
}
- //淇敼鏈烘埧
+ //淇敼鐢垫簮
public Response updatePower(PowerInf pinf) {
UpdateWrapper wrapper=new UpdateWrapper();
/*wrapper.eq("station_id",sinf.getStationId());
@@ -82,7 +82,7 @@
mapper.update((StationInf) ActionUtil.objeNull,wrapper);*/
return new Response().set(1,true);
}
- //鏌ヨ鏈烘埧
+ //鏌ヨ鐢垫簮
public Response getPower(PowerDto dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
QueryWrapper wrapper=new QueryWrapper();
@@ -100,7 +100,7 @@
}
List<StationInf> list=mapper.selectList(wrapper);
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鏈烘埧");
+ return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫簮");
}
}
\ No newline at end of file
--
Gitblit v1.9.1