From 18f2afc8319a9c11382cbdfbd5f984958eb99a6b Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期三, 22 十月 2025 11:22:01 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java index 2a840f4..89b9447 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java @@ -2,12 +2,14 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.UpdateDetailTeamDto; +import com.ruoyi.system.dto.UserIdDto; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.model.TAppUserEquipment; import com.ruoyi.system.model.TAppUserLocation; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDate; + +import java.util.List; /** * <p> @@ -143,5 +147,28 @@ return R.ok(); } + /** + * 用户打点 + */ + @ApiOperation(value = "获取用户打点数据",response = TAppUserLocation.class) + @GetMapping(value = "/open/t-app-user/getAppUserLocation") + public R<List<TAppUserLocation>> getAppUserLocation() { + String userId = tokenService.getLoginUserApplet().getUserId(); + List<TAppUserLocation> list = appUserLocationService.list(new LambdaQueryWrapper<TAppUserLocation>().eq(TAppUserLocation::getAppUserId, userId).orderByDesc(TAppUserLocation::getTime)); + return R.ok(list); + } + + /** + * 用户打点 + */ + @ApiOperation(value = "获取用户打点数据--详情",response = TAppUserLocation.class) + @PostMapping(value = "/open/t-app-user/getAppUserLocationFromId") + public R<TAppUserLocation> getAppUserLocationFromId(@RequestBody String param) { + UserIdDto dto = JSON.parseObject(param, UserIdDto.class); + TAppUserLocation location = appUserLocationService.getById(dto.getId()); + return R.ok(location); + } + + } -- Gitblit v1.7.1