From ad85aa61b0f7eba7a0ddad82eba784b015b8413a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 17:54:13 +0800
Subject: [PATCH] 小程序用户id完善
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 27 -------------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 18 +++-----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 11 ++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 13 ++++--
4 files changed, 24 insertions(+), 45 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
index 277bfdd..6b4046f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.service.TAppUserAddressService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.security.service.TokenService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,10 +26,12 @@
public class TAppUserAddressController {
private final TAppUserAddressService appUserAddressService;
+ private final TokenService tokenService;
@Autowired
- public TAppUserAddressController(TAppUserAddressService appUserAddressService) {
+ public TAppUserAddressController(TAppUserAddressService appUserAddressService, TokenService tokenService) {
this.appUserAddressService = appUserAddressService;
+ this.tokenService = tokenService;
}
/**
@@ -37,8 +40,9 @@
@ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址列表")
@GetMapping(value = "/queryAddress")
public AjaxResult<List<TAppUserAddress>> queryAddress() {
- // TODO 用户id
- return AjaxResult.ok(appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, null)));
+ // 用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ return AjaxResult.ok(appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)));
}
@@ -48,7 +52,8 @@
@ApiOperation(tags = {"小程序-用户地址"},value = "添加用户地址")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TAppUserAddress dto) {
- // TODO 用户id
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
// 修改用户默认地址
appUserAddressService.updateDefaultAddress(dto.getDefaultAddress(),dto.getAppUserId());
return AjaxResult.ok(appUserAddressService.save(dto));
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 8e3444d..dd60931 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -113,33 +113,6 @@
return AjaxResult.ok(0);
}
}
- @ApiOperation(value = "通过code获得openid, 1 --->对应的appid：wx4c405fa42539fc21 2---->对应的appid:wx02d9f6c92e6d3c86")
- @GetMapping("openId-by-jscode2session/{code}")
- public AjaxResult<Map<String, Object>> jscode2session(@PathVariable String code) {
- log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", code);
- WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig);
- Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(code));
- String openid = body.getOpenid();
- String sessionKey = body.getSessionKey();
- TAppUser appUser = appUserService.getOne(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getWxOpenid, openid).last("limit 1"));
- if (Objects.isNull(appUser)) {
- appUser = new TAppUser();
- appUser.setWxOpenid(openid);
- appUserService.save(appUser);
- }
- // 提前对sessionKey进行删除
- log.info("换取sessionKey:{}", sessionKey);
- // 将sessionKey进行存储,后续获取信息需要
- redisService.setCacheObject(openid, sessionKey);
- LoginUserApplet loginUserApplet = new LoginUserApplet();
- if(ObjectUtils.isNotNull(appUser)){
- loginUserApplet.setUserId(appUser.getId());
- }
- HashMap<String, Object> tokenInfos = new HashMap<>();
- tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
- tokenInfos.put("info",loginUserApplet);
- return AjaxResult.ok(tokenInfos);
- }
@ApiOperation(value = "管理后台-根据手机号查询用户ids", tags = {"管理后台-活动费用统计"})
@PostMapping(value = "/user/getUserIdsByPhone")
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 86aa7ab..e91f208 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -5,21 +5,15 @@
import com.ruoyi.chargingPile.api.dto.ApplyChargingQuery;
import com.ruoyi.chargingPile.api.dto.ApplyChargingRemarkDto;
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
-import com.ruoyi.chargingPile.api.model.TCarport;
-import com.ruoyi.chargingPile.api.vo.TCarportVO;
-import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.service.TApplyChargingPileService;
-import com.ruoyi.chargingPile.service.TCarportService;
-import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.service.TokenService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* <p>
@@ -34,10 +28,12 @@
public class TApplyChargingPileController {
private final TApplyChargingPileService applyChargingPileService;
+ private final TokenService tokenService;
@Autowired
- public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService) {
+ public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService, TokenService tokenService) {
this.applyChargingPileService = applyChargingPileService;
+ this.tokenService = tokenService;
}
/**
@@ -47,15 +43,15 @@
@ApiOperation(tags = {"小程序-建桩申请"},value = "建桩申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TApplyChargingPile dto) {
- // TODO 用户id
- dto.setAppUserId(null);
+ // 用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ dto.setAppUserId(userId);
return AjaxResult.ok(applyChargingPileService.save(dto));
}
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "列表")
@PostMapping(value = "/page")
public AjaxResult<Page<TApplyChargingPile>> page(ApplyChargingQuery applyChargingQuery) {
- // TODO 用户id
Page<TApplyChargingPile> page = applyChargingPileService.lambdaQuery()
.like(applyChargingQuery.getName() != null && !applyChargingQuery.getName().equals(""), TApplyChargingPile::getAgentPhone, applyChargingQuery.getName())
.page(Page.of(applyChargingQuery.getPageCurr(), applyChargingQuery.getPageSize()));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
index f11efbe..113df1d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
import io.swagger.annotations.ApiOperation;
@@ -27,10 +28,12 @@
public class TEnterpriseUserApplicationController {
private final TEnterpriseUserApplicationService enterpriseUserApplicationService;
+ private final TokenService tokenService;
@Autowired
- public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService) {
+ public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService, TokenService tokenService) {
this.enterpriseUserApplicationService = enterpriseUserApplicationService;
+ this.tokenService = tokenService;
}
/**
@@ -40,14 +43,16 @@
@ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
- // TODO 用户id
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
@PostMapping(value = "/page")
public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) {
- // TODO 用户id
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
--
Gitblit v1.7.1