Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_d...

liujie

2025-09-28 81e50dcfc1bbcc97298fa08cb27a91f2e4759a58

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching

 generator/src/test/java/com/laboratory/CodeGeneratorTests.java

@@ -144,7 +144,7 @@
//         strategy.setTablePrefix(pc.getModuleName() + "");
//        strategy.setLikeTable(new LikeTable("room"));
        //strategy.setLikeTable(new LikeTable("member"));
        strategy.setLikeTable(new LikeTable("t_"));// 生成表名
        strategy.setLikeTable(new LikeTable("t_user_major"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
//        strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java

File was deleted

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDivisionTeamController.java

@@ -1,8 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TDivisionTeam;
import com.ruoyi.system.query.TDivisionTeamQuery;
import com.ruoyi.system.service.TDivisionTeamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -12,9 +25,94 @@
 * @author xiaochen
 * @since 2025-09-28
 */
@Api(tags = "分队管理")
@RestController
@RequestMapping("/t-division-team")
@RequestMapping("")
public class TDivisionTeamController {

    private final TDivisionTeamService divisionTeamService;
    private final TokenService tokenService;
    @Autowired
    public TDivisionTeamController(TDivisionTeamService divisionTeamService, TokenService tokenService) {
        this.divisionTeamService = divisionTeamService;
        this.tokenService = tokenService;
    }

    /**
     * 分队管理列表
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:list')")
    @ApiOperation(value = "分队管理分页列表", response = TDivisionTeamQuery.class)
    @PostMapping(value = "/api/t-division-team/pageList")
    public R<PageInfo<TDivisionTeam>> pageList(@RequestBody String param) {
        TDivisionTeamQuery query = JSON.parseObject(param, TDivisionTeamQuery.class);
        return R.ok(divisionTeamService.pageList(query));
    }

    /**
     * 添加分队管理管理
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:add')")
    @Log(title = "分队管理信息-新增分队管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加分队管理",response = TDivisionTeam.class)
    @PostMapping(value = "/api/t-division-team/add")
    public R<Boolean> add(@RequestBody String param) {
        TDivisionTeam dto = JSON.parseObject(param,TDivisionTeam.class);
        if (divisionTeamService.isExit(dto)) {
            return R.fail("该分队已存在");
        }
        divisionTeamService.save(dto);
        return R.ok();
    }

    /**
     * 修改分队管理
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:edit')")
    @Log(title = "分队管理信息-修改分队管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改分队管理")
    @PostMapping(value = "/api/t-division-team/update")
    public R<Boolean> update(@RequestBody String param) {
        TDivisionTeam dto = JSON.parseObject(param,TDivisionTeam.class);
        if (divisionTeamService.isExit(dto)) {
            return R.fail("该分队已存在");
        }
        divisionTeamService.updateById(dto);
        return R.ok();
    }

    /**
     * 查看分队管理详情
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:detail')")
    @ApiOperation(value = "查看分队管理详情")
    @GetMapping(value = "/open/t-division-team/getDetailById")
    public R<TDivisionTeam> getDetailById(@RequestParam String id) {
        TDivisionTeam equipment = divisionTeamService.getById(id);
        return R.ok(equipment);
    }

    /**
     * 删除分队管理
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:delete')")
    @Log(title = "分队管理信息-删除分队管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除分队管理")
    @DeleteMapping(value = "/open/t-division-team/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(divisionTeamService.removeById(id));
    }

    /**
     * 批量删除分队管理
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:delete')")
    @Log(title = "分队管理信息-删除分队管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除分队管理")
    @DeleteMapping(value = "/open/t-division-team/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(divisionTeamService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEquipmentController.java

@@ -58,6 +58,9 @@
    @PostMapping(value = "/api/t-equipment/add")
    public R<Boolean> add(@RequestBody String param) {
        TEquipment dto = JSON.parseObject(param,TEquipment.class);
        if (equipmentService.isExit(dto)) {
            return R.fail("该装备库已存在");
        }
        equipmentService.save(dto);
        return R.ok();
    }
@@ -71,6 +74,9 @@
    @PostMapping(value = "/api/t-equipment/update")
    public R<Boolean> update(@RequestBody String param) {
        TEquipment dto = JSON.parseObject(param,TEquipment.class);
        if (equipmentService.isExit(dto)) {
            return R.fail("该装备库已存在");
        }
        equipmentService.updateById(dto);
        return R.ok();
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java

@@ -1,8 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import com.ruoyi.system.service.TMajorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -12,9 +25,94 @@
 * @author xiaochen
 * @since 2025-09-28
 */
@Api(tags = "专业管理")
@RestController
@RequestMapping("/t-major")
@RequestMapping("")
public class TMajorController {

    private final TMajorService majorService;
    private final TokenService tokenService;
    @Autowired
    public TMajorController(TMajorService majorService, TokenService tokenService) {
        this.majorService = majorService;
        this.tokenService = tokenService;
    }

    /**
     * 专业管理列表
     */
    //@PreAuthorize("@ss.hasPermi('system:major:list')")
    @ApiOperation(value = "专业管理分页列表", response = TMajorQuery.class)
    @PostMapping(value = "/api/t-division-team/pageList")
    public R<PageInfo<TMajor>> pageList(@RequestBody String param) {
        TMajorQuery query = JSON.parseObject(param, TMajorQuery.class);
        return R.ok(majorService.pageList(query));
    }

    /**
     * 添加专业管理管理
     */
    //@PreAuthorize("@ss.hasPermi('system:major:add')")
    @Log(title = "专业管理信息-新增专业管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加专业管理",response = TMajor.class)
    @PostMapping(value = "/api/t-division-team/add")
    public R<Boolean> add(@RequestBody String param) {
        TMajor dto = JSON.parseObject(param,TMajor.class);
        if(majorService.isExit(dto)){
            return R.fail("该专业已存在");
        }
        majorService.save(dto);
        return R.ok();
    }

    /**
     * 修改专业管理
     */
    //@PreAuthorize("@ss.hasPermi('system:major:edit')")
    @Log(title = "专业管理信息-修改专业管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改专业管理")
    @PostMapping(value = "/api/t-division-team/update")
    public R<Boolean> update(@RequestBody String param) {
        TMajor dto = JSON.parseObject(param,TMajor.class);
        if(majorService.isExit(dto)){
            return R.fail("该专业已存在");
        }
        majorService.updateById(dto);
        return R.ok();
    }

    /**
     * 查看专业管理详情
     */
    //@PreAuthorize("@ss.hasPermi('system:major:detail')")
    @ApiOperation(value = "查看专业管理详情")
    @GetMapping(value = "/open/t-division-team/getDetailById")
    public R<TMajor> getDetailById(@RequestParam String id) {
        TMajor equipment = majorService.getById(id);
        return R.ok(equipment);
    }

    /**
     * 删除专业管理
     */
    //@PreAuthorize("@ss.hasPermi('system:major:delete')")
    @Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除专业管理")
    @DeleteMapping(value = "/open/t-division-team/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(majorService.removeById(id));
    }

    /**
     * 批量删除专业管理
     */
    //@PreAuthorize("@ss.hasPermi('system:major:delete')")
    @Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除专业管理")
    @DeleteMapping(value = "/open/t-division-team/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(majorService.removeByIds(ids));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionUserController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 任务用户 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@RestController
@RequestMapping("/t-mission-user")
public class TMissionUserController {

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserMajorController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 用户专业 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@RestController
@RequestMapping("/t-user-major")
public class TUserMajorController {

}


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TDivisionTeamMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TDivisionTeam;
import com.ruoyi.system.query.TDivisionTeamQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,12 @@
 */
public interface TDivisionTeamMapper extends BaseMapper<TDivisionTeam> {

    /**
     * 分队管理列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TDivisionTeam> pageList(@Param("query") TDivisionTeamQuery query, @Param("pageInfo")PageInfo<TDivisionTeam> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TMajorMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,11 @@
 */
public interface TMajorMapper extends BaseMapper<TMajor> {

    /**
     * 分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TMajor> pageList(@Param("query") TMajorQuery query, @Param("pageInfo")PageInfo<TMajor> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TMissionUserMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TMissionUser;

/**
 * <p>
 * 任务用户 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TMissionUserMapper extends BaseMapper<TMissionUser> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMajorMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TUserMajor;

/**
 * <p>
 * 用户专业 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TUserMajorMapper extends BaseMapper<TUserMajor> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java

New file
@@ -0,0 +1,45 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 任务用户
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_mission_user")
@ApiModel(value="TMissionUser对象", description="任务用户")
public class TMissionUser implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    private String id;

    @ApiModelProperty(value = "接单用户")
    @TableField("app_user_id")
    private String appUserId;

    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "任务id")
    @TableField("mission_id")
    private String missionId;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java

New file
@@ -0,0 +1,45 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

/**
 * <p>
 * 用户专业
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_major")
@ApiModel(value="TUserMajor对象", description="用户专业")
public class TUserMajor implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    private String id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private String appUserId;

    @ApiModelProperty(value = "专业id")
    @TableField("major_id")
    private String majorId;

    @ApiModelProperty(value = "人数")
    @TableField("user_number")
    private Integer userNumber;


}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TDivisionTeamQuery.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@Data
@ApiModel(value = "分队管理查询参数query")
public class TDivisionTeamQuery extends BasePage {

    @ApiModelProperty(value = "分队名称")
    private String teamName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TMajorQuery.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "专业管理查询参数query")
public class TMajorQuery extends BasePage {

    @ApiModelProperty(value = "专业名称")
    private String majorName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TDivisionTeamService.java

@@ -1,7 +1,9 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TDivisionTeam;
import com.ruoyi.system.query.TDivisionTeamQuery;

/**
 * <p>
@@ -13,4 +15,16 @@
 */
public interface TDivisionTeamService extends IService<TDivisionTeam> {

    /**
     * 分队管理分页列表
     * @param query
     * @return
     */
    PageInfo<TDivisionTeam> pageList(TDivisionTeamQuery query);
    /**
     * 判断分类是否存在
     * @param dto
     * @return
     */
    boolean isExit(TDivisionTeam dto);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TEquipmentService.java

@@ -19,5 +19,10 @@
     * 装备库管理列表
     */
    PageInfo<TEquipment> pageList(TEquipmentQuery query);

    /**
     * 判断装备库是否存在
     * @param dto
     * @return
     */
    boolean isExit(TEquipment dto);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TMajorService.java

@@ -1,7 +1,9 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;

/**
 * <p>
@@ -13,4 +15,16 @@
 */
public interface TMajorService extends IService<TMajor> {

    /**
     * 专业管理分页列表
     * @param query
     * @return
     */
    PageInfo<TMajor> pageList(TMajorQuery query);
    /**
     * 判断专业是否存在
     * @param dto
     * @return
     */
    boolean isExit(TMajor dto);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionUserService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TMissionUser;

/**
 * <p>
 * 任务用户 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TMissionUserService extends IService<TMissionUser> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TUserMajorService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TUserMajor;

/**
 * <p>
 * 用户专业 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
public interface TUserMajorService extends IService<TUserMajor> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDivisionTeamServiceImpl.java

@@ -1,10 +1,16 @@
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.TDivisionTeamMapper;
import com.ruoyi.system.model.TDivisionTeam;
import com.ruoyi.system.query.TDivisionTeamQuery;
import com.ruoyi.system.service.TDivisionTeamService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,21 @@
@Service
public class TDivisionTeamServiceImpl extends ServiceImpl<TDivisionTeamMapper, TDivisionTeam> implements TDivisionTeamService {

    @Override
    public PageInfo<TDivisionTeam> pageList(TDivisionTeamQuery query) {
        PageInfo<TDivisionTeam> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TDivisionTeam> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public boolean isExit(TDivisionTeam dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TDivisionTeam.class).ne(TDivisionTeam::getId, dto.getId()).eq(TDivisionTeam::getTeamName, dto.getTeamName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TDivisionTeam.class).eq(TDivisionTeam::getTeamName, dto.getTeamName())) > 0;
        }
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEquipmentServiceImpl.java

@@ -1,12 +1,13 @@
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.TEquipmentMapper;
import com.ruoyi.system.model.TEquipment;
import com.ruoyi.system.query.TEquipmentQuery;
import com.ruoyi.system.service.TEquipmentService;
import com.ruoyi.system.vo.SysOperLogVO;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -29,4 +30,15 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public boolean isExit(TEquipment dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TEquipment.class).ne(TEquipment::getId, dto.getId()).eq(TEquipment::getEquipmentName, dto.getEquipmentName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TEquipment.class).eq(TEquipment::getEquipmentName, dto.getEquipmentName())) > 0;
        }
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMajorServiceImpl.java

@@ -1,10 +1,16 @@
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.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import com.ruoyi.system.service.TMajorService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,22 @@
@Service
public class TMajorServiceImpl extends ServiceImpl<TMajorMapper, TMajor> implements TMajorService {

    @Override
    public PageInfo<TMajor> pageList(TMajorQuery query) {
        PageInfo<TMajor> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TMajor> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public boolean isExit(TMajor dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TMajor.class).ne(TMajor::getId, dto.getId()).eq(TMajor::getMajorName, dto.getMajorName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TMajor.class).eq(TMajor::getMajorName, dto.getMajorName())) > 0;
        }
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionUserServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TMissionUserMapper;
import com.ruoyi.system.model.TMissionUser;
import com.ruoyi.system.service.TMissionUserService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 任务用户 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Service
public class TMissionUserServiceImpl extends ServiceImpl<TMissionUserMapper, TMissionUser> implements TMissionUserService {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserMajorServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TUserMajorMapper;
import com.ruoyi.system.model.TUserMajor;
import com.ruoyi.system.service.TUserMajorService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 用户专业 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@Service
public class TUserMajorServiceImpl extends ServiceImpl<TUserMajorMapper, TUserMajor> implements TUserMajorService {

}

 ruoyi-system/src/main/resources/mapper/system/TDivisionTeamMapper.xml

@@ -17,5 +17,17 @@
    <sql id="Base_Column_List">
        id, team_name, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TDivisionTeam">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_division_team
        <where>
            <if test="query.teamName != null and query.teamName != ''">
                and team_name like concat('%',#{query.teamName},'%')
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        order by create_time desc
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TMajorMapper.xml

@@ -17,5 +17,17 @@
    <sql id="Base_Column_List">
        id, major_name, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TMajor">
        select
        <include refid="Base_Column_List"/>
            from t_major
        <where>
            <if test="query.majorName != null and query.majorName != ''">
                and major_name like concat('%',#{query.majorName},'%')
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        order by create_time desc
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TMissionUserMapper.xml

New file
@@ -0,0 +1,18 @@
<?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.TMissionUserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TMissionUser">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="create_time" property="createTime" />
        <result column="mission_id" property="missionId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, create_time, mission_id
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TUserMajorMapper.xml

New file
@@ -0,0 +1,18 @@
<?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.TUserMajorMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TUserMajor">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="major_id" property="majorId" />
        <result column="user_number" property="userNumber" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, major_id, user_number
    </sql>

</mapper>