liujie
昨天 761bea9251b3ed5c44d021ed8359a0d3ee49ec62
app任务
2个文件已修改
6个文件已添加
199 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateDetailTeamDto.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserLocationMapper.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUserLocation.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserLocationService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserLocationServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TAppUserLocationMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -5,7 +5,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.UpdateDetailTeamDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TAppUserEquipment;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.service.TAppUserEquipmentService;
import com.ruoyi.system.service.TAppUserLocationService;
import com.ruoyi.system.service.TAppUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,11 +34,15 @@
    private final TAppUserService appUserService;
    private final TokenService tokenService;
    private final PasswordEncoder passwordEncoder;
    private final TAppUserEquipmentService appUserEquipmentService;
    private final TAppUserLocationService appUserLocationService;
    @Autowired
    public TAppUserController(TAppUserService appUserService, TokenService tokenService, PasswordEncoder passwordEncoder) {
    public TAppUserController(TAppUserService appUserService, TokenService tokenService, PasswordEncoder passwordEncoder, TAppUserEquipmentService appUserEquipmentService, TAppUserLocationService appUserLocationService) {
        this.appUserService = appUserService;
        this.tokenService = tokenService;
        this.passwordEncoder = passwordEncoder;
        this.appUserEquipmentService = appUserEquipmentService;
        this.appUserLocationService = appUserLocationService;
    }
    /**
@@ -65,5 +74,48 @@
        return R.ok(appUser);
    }
    /**
     * 查看人员管理详情--队伍情况
     */
    @ApiOperation(value = "查看人员管理详情--队伍情况",response = TAppUserEquipment.class)
    @GetMapping(value = "/open/t-app-user/getDetailTeam")
    public R<TAppUserEquipment> getDetailTeam() {
        String userId = tokenService.getLoginUserApplet().getUserId();
        TAppUserEquipment tAppUserEquipment = appUserEquipmentService.getOne(Wrappers.lambdaQuery(TAppUserEquipment.class).eq(TAppUserEquipment::getAppUserId, userId));
        return R.ok(tAppUserEquipment);
    }
    /**
     * 查看人员管理详情--修改队伍情况
     */
    @ApiOperation(value = "查看人员管理详情--修改队伍情况",response = TAppUserEquipment.class)
    @PostMapping(value = "/open/t-app-user/updateDetailTeam")
    public R<?> updateDetailTeam(@RequestBody String param) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        UpdateDetailTeamDto dto = JSON.parseObject(param, UpdateDetailTeamDto.class);
        TAppUserEquipment tAppUserEquipment = appUserEquipmentService.getOne(Wrappers.lambdaQuery(TAppUserEquipment.class).eq(TAppUserEquipment::getAppUserId, userId));
        tAppUserEquipment.setPersonCount(dto.getPersonCount());
        tAppUserEquipment.setEquipmentCount(dto.getEquipmentCount());
        appUserEquipmentService.updateById(tAppUserEquipment);
        return R.ok();
    }
    /**
     * 用户打点
     */
    @ApiOperation(value = "用户打点",response = TAppUserLocation.class)
    @PostMapping(value = "/open/t-app-user/appUserLocation")
    public R<?> appUserLocation(@RequestBody String param) {
        TAppUserLocation location = JSON.parseObject(param,TAppUserLocation.class);
        String userId = tokenService.getLoginUserApplet().getUserId();
        location.setAppUserId(userId);
        appUserLocationService.save(location);
        return R.ok();
    }
}
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -23,7 +23,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.List;
/**
@@ -158,7 +160,10 @@
    }
    public static void main(String[] args) {
        LocalDate now = LocalDate.now();
        System.out.println(LocalDate.now().minusMonths(5) + " 00:00:00");
    }
    /**
ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateDetailTeamDto.java
New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("修改装备情况Dto")
public class UpdateDetailTeamDto {
    @ApiModelProperty(value = "人数量")
    private Integer personCount;
    @ApiModelProperty(value = "装备情况json[{\"id\":\"********\",\"count\":3}]")
    private String equipmentCount;
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserLocationMapper.java
New file
@@ -0,0 +1,22 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * <p>
 * 用户轨迹 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TAppUserLocationMapper extends BaseMapper<TAppUserLocation> {
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUserLocation.java
New file
@@ -0,0 +1,49 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * <p>
 * 专业管理
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_location")
@ApiModel(value="TAppUserLocation对象", description="用户轨迹点位")
public class TAppUserLocation {
    private static final long serialVersionUID = 1L;
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;
    @ApiModelProperty(value = "app用户id")
    @TableField("app_user_id")
    private String appUserId;
    @ApiModelProperty(value = "经度")
    @TableField("lon")
    private String lon;
    @ApiModelProperty(value = "纬度")
    @TableField("lat")
    private String lat;
    @ApiModelProperty(value = "用户执行任务id")
    @TableField("mission_user_id")
    private String missionUserId;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserLocationService.java
New file
@@ -0,0 +1,19 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
/**
 * <p>
 * 用户轨迹 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TAppUserLocationService extends IService<TAppUserLocation> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserLocationServiceImpl.java
New file
@@ -0,0 +1,27 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TMajorMapper;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import com.ruoyi.system.service.TAppUserLocationService;
import com.ruoyi.system.service.TMajorService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * <p>
 * 用户轨迹 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Service
public class TAppUserLocationServiceImpl extends ServiceImpl<TAppUserLocationMapper, TAppUserLocation> implements TAppUserLocationService {
}
ruoyi-system/src/main/resources/mapper/system/TAppUserLocationMapper.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TAppUserLocationMapper">
</mapper>