init

backend/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -0,0 +1,23 @@
+package org.dromara;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+
+/**
+ * 启动程序
+ *
+ * @author Lion Li
+ */
+
+@SpringBootApplication
+public class DromaraApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(DromaraApplication.class);
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        application.run(args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  RuoYi-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java

@@ -0,0 +1,18 @@
+package org.dromara;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ *
+ * @author Lion Li
+ */
+public class DromaraServletInitializer extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(DromaraApplication.class);
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/controller/XgStuMsgController.java

@@ -0,0 +1,105 @@
+package org.dromara.test.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.test.domain.vo.XgStuMsgVo;
+import org.dromara.test.domain.bo.XgStuMsgBo;
+import org.dromara.test.service.IXgStuMsgService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生信息
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/test/stuMsg")
+public class XgStuMsgController extends BaseController {
+
+    private final IXgStuMsgService xgStuMsgService;
+
+    /**
+     * 查询学生信息列表
+     */
+    @SaCheckPermission("test:stuMsg:list")
+    @GetMapping("/list")
+    public TableDataInfo<XgStuMsgVo> list(XgStuMsgBo bo, PageQuery pageQuery) {
+        return xgStuMsgService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生信息列表
+     */
+    @SaCheckPermission("test:stuMsg:export")
+    @Log(title = "学生信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XgStuMsgBo bo, HttpServletResponse response) {
+        List<XgStuMsgVo> list = xgStuMsgService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生信息", XgStuMsgVo.class, response);
+    }
+
+    /**
+     * 获取学生信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("test:stuMsg:query")
+    @GetMapping("/{id}")
+    public R<XgStuMsgVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(xgStuMsgService.queryById(id));
+    }
+
+    /**
+     * 新增学生信息
+     */
+    @SaCheckPermission("test:stuMsg:add")
+    @Log(title = "学生信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XgStuMsgBo bo) {
+        return toAjax(xgStuMsgService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生信息
+     */
+    @SaCheckPermission("test:stuMsg:edit")
+    @Log(title = "学生信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XgStuMsgBo bo) {
+        return toAjax(xgStuMsgService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("test:stuMsg:remove")
+    @Log(title = "学生信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(xgStuMsgService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/domain/XgStuMsg.java

@@ -0,0 +1,41 @@
+package org.dromara.test.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生信息对象 xg_stu_msg
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xg_stu_msg")
+public class XgStuMsg extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 学生姓名
+     */
+    private String stuName;
+
+    /**
+     * 学生工号
+     */
+    private Long stuNo;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/domain/bo/XgStuMsgBo.java

@@ -0,0 +1,42 @@
+package org.dromara.test.domain.bo;
+
+import org.dromara.test.domain.XgStuMsg;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生信息业务对象 xg_stu_msg
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XgStuMsg.class, reverseConvertGenerate = false)
+public class XgStuMsgBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 学生姓名
+     */
+    @NotBlank(message = "学生姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String stuName;
+
+    /**
+     * 学生工号
+     */
+    @NotNull(message = "学生工号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long stuNo;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/domain/vo/XgStuMsgVo.java

@@ -0,0 +1,50 @@
+package org.dromara.test.domain.vo;
+
+import org.dromara.test.domain.XgStuMsg;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生信息视图对象 xg_stu_msg
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XgStuMsg.class)
+public class XgStuMsgVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 学生姓名
+     */
+    @ExcelProperty(value = "学生姓名")
+    private String stuName;
+
+    /**
+     * 学生工号
+     */
+    @ExcelProperty(value = "学生工号")
+    private Long stuNo;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/mapper/XgStuMsgMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.test.mapper;
+
+import org.dromara.test.domain.XgStuMsg;
+import org.dromara.test.domain.vo.XgStuMsgVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+public interface XgStuMsgMapper extends BaseMapperPlus<XgStuMsg, XgStuMsgVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/service/IXgStuMsgService.java

@@ -0,0 +1,68 @@
+package org.dromara.test.service;
+
+import org.dromara.test.domain.vo.XgStuMsgVo;
+import org.dromara.test.domain.bo.XgStuMsgBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+public interface IXgStuMsgService {
+
+    /**
+     * 查询学生信息
+     *
+     * @param id 主键
+     * @return 学生信息
+     */
+    XgStuMsgVo queryById(Long id);
+
+    /**
+     * 分页查询学生信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生信息分页列表
+     */
+    TableDataInfo<XgStuMsgVo> queryPageList(XgStuMsgBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的学生信息列表
+     *
+     * @param bo 查询条件
+     * @return 学生信息列表
+     */
+    List<XgStuMsgVo> queryList(XgStuMsgBo bo);
+
+    /**
+     * 新增学生信息
+     *
+     * @param bo 学生信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XgStuMsgBo bo);
+
+    /**
+     * 修改学生信息
+     *
+     * @param bo 学生信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XgStuMsgBo bo);
+
+    /**
+     * 校验并批量删除学生信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/test/service/impl/XgStuMsgServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.test.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.test.domain.bo.XgStuMsgBo;
+import org.dromara.test.domain.vo.XgStuMsgVo;
+import org.dromara.test.domain.XgStuMsg;
+import org.dromara.test.mapper.XgStuMsgMapper;
+import org.dromara.test.service.IXgStuMsgService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-06-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class XgStuMsgServiceImpl implements IXgStuMsgService {
+
+    private final XgStuMsgMapper baseMapper;
+
+    /**
+     * 查询学生信息
+     *
+     * @param id 主键
+     * @return 学生信息
+     */
+    @Override
+    public XgStuMsgVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询学生信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生信息分页列表
+     */
+    @Override
+    public TableDataInfo<XgStuMsgVo> queryPageList(XgStuMsgBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XgStuMsg> lqw = buildQueryWrapper(bo);
+        Page<XgStuMsgVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的学生信息列表
+     *
+     * @param bo 查询条件
+     * @return 学生信息列表
+     */
+    @Override
+    public List<XgStuMsgVo> queryList(XgStuMsgBo bo) {
+        LambdaQueryWrapper<XgStuMsg> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XgStuMsg> buildQueryWrapper(XgStuMsgBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XgStuMsg> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(XgStuMsg::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getStuName()), XgStuMsg::getStuName, bo.getStuName());
+        lqw.eq(bo.getStuNo() != null, XgStuMsg::getStuNo, bo.getStuNo());
+        return lqw;
+    }
+
+    /**
+     * 新增学生信息
+     *
+     * @param bo 学生信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XgStuMsgBo bo) {
+        XgStuMsg add = MapstructUtils.convert(bo, XgStuMsg.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生信息
+     *
+     * @param bo 学生信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XgStuMsgBo bo) {
+        XgStuMsg update = MapstructUtils.convert(bo, XgStuMsg.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XgStuMsg entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除学生信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -0,0 +1,239 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.bo.SysTenantBo;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysTenantVo;
+import org.dromara.system.service.ISysClientService;
+import org.dromara.system.service.ISysConfigService;
+import org.dromara.system.service.ISysSocialService;
+import org.dromara.system.service.ISysTenantService;
+import org.dromara.web.domain.vo.LoginTenantVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.domain.vo.TenantListVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.dromara.web.service.SysRegisterService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 认证
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/auth")
+public class AuthController {
+
+    private final SocialProperties socialProperties;
+    private final SysLoginService loginService;
+    private final SysRegisterService registerService;
+    private final ISysConfigService configService;
+    private final ISysTenantService tenantService;
+    private final ISysSocialService socialUserService;
+    private final ISysClientService clientService;
+    private final ScheduledExecutorService scheduledExecutorService;
+
+
+    /**
+     * 登录方法
+     *
+     * @param body 登录信息
+     * @return 结果
+     */
+    @ApiEncrypt
+    @PostMapping("/login")
+    public R<LoginVo> login(@RequestBody String body) {
+        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        // 授权类型和客户端id
+        String clientId = loginBody.getClientId();
+        String grantType = loginBody.getGrantType();
+        SysClientVo client = clientService.queryByClientId(clientId);
+        // 查询不到 client 或 client 内不包含 grantType
+        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
+            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
+            return R.fail(MessageUtils.message("auth.grant.type.error"));
+        } else if (!SystemConstants.NORMAL.equals(client.getStatus())) {
+            return R.fail(MessageUtils.message("auth.grant.type.blocked"));
+        }
+        // 校验租户
+        loginService.checkTenant(loginBody.getTenantId());
+        // 登录
+        LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+
+        Long userId = LoginHelper.getUserId();
+        scheduledExecutorService.schedule(() -> {
+            SseMessageDto dto = new SseMessageDto();
+            dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
+            dto.setUserIds(List.of(userId));
+            SseMessageUtils.publishMessage(dto);
+        }, 5, TimeUnit.SECONDS);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 获取跳转URL
+     *
+     * @param source 登录来源
+     * @return 结果
+     */
+    @GetMapping("/binding/{source}")
+    public R<String> authBinding(@PathVariable("source") String source,
+                                 @RequestParam String tenantId, @RequestParam String domain) {
+        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+        if (ObjectUtil.isNull(obj)) {
+            return R.fail(source + "平台账号暂不支持");
+        }
+        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
+        Map<String, String> map = new HashMap<>();
+        map.put("tenantId", tenantId);
+        map.put("domain", domain);
+        map.put("state", AuthStateUtils.createState());
+        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));
+        return R.ok("操作成功", authorizeUrl);
+    }
+
+    /**
+     * 前端回调绑定授权(需要token)
+     *
+     * @param loginBody 请求体
+     * @return 结果
+     */
+    @PostMapping("/social/callback")
+    public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
+        // 校验token
+        StpUtil.checkLogin();
+        // 获取第三方登录信息
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
+        AuthUser authUserData = response.getData();
+        // 判断授权响应是否成功
+        if (!response.ok()) {
+            return R.fail(response.getMsg());
+        }
+        loginService.socialRegister(authUserData);
+        return R.ok();
+    }
+
+
+    /**
+     * 取消授权(需要token)
+     *
+     * @param socialId socialId
+     */
+    @DeleteMapping(value = "/unlock/{socialId}")
+    public R<Void> unlockSocial(@PathVariable Long socialId) {
+        // 校验token
+        StpUtil.checkLogin();
+        Boolean rows = socialUserService.deleteWithValidById(socialId);
+        return rows ? R.ok() : R.fail("取消授权失败");
+    }
+
+
+    /**
+     * 退出登录
+     */
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        loginService.logout();
+        return R.ok("退出成功");
+    }
+
+    /**
+     * 用户注册
+     */
+    @ApiEncrypt
+    @PostMapping("/register")
+    public R<Void> register(@Validated @RequestBody RegisterBody user) {
+        if (!configService.selectRegisterEnabled(user.getTenantId())) {
+            return R.fail("当前系统没有开启注册功能！");
+        }
+        registerService.register(user);
+        return R.ok();
+    }
+
+    /**
+     * 登录页面租户下拉框
+     *
+     * @return 租户列表
+     */
+    @GetMapping("/tenant/list")
+    public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
+        // 返回对象
+        LoginTenantVo result = new LoginTenantVo();
+        boolean enable = TenantHelper.isEnable();
+        result.setTenantEnabled(enable);
+        // 如果未开启租户这直接返回
+        if (!enable) {
+            return R.ok(result);
+        }
+
+        List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
+        List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
+        try {
+            // 如果只超管返回所有租户
+            if (LoginHelper.isSuperAdmin()) {
+                result.setVoList(voList);
+                return R.ok(result);
+            }
+        } catch (NotLoginException ignored) {
+        }
+
+        // 获取域名
+        String host;
+        String referer = request.getHeader("referer");
+        if (StringUtils.isNotBlank(referer)) {
+            // 这里从referer中取值是为了本地使用hosts添加虚拟域名，方便本地环境调试
+            host = referer.split("//")[1].split("/")[0];
+        } else {
+            host = new URL(request.getRequestURL().toString()).getHost();
+        }
+        // 根据域名进行筛选
+        List<TenantListVo> list = StreamUtils.filter(voList, vo ->
+            StringUtils.equalsIgnoreCase(vo.getDomain(), host));
+        result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+        return R.ok(result);
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -0,0 +1,154 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.captcha.AbstractCaptcha;
+import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.mail.config.properties.MailProperties;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.common.web.enums.CaptchaType;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.dromara.web.domain.vo.CaptchaVo;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+
+/**
+ * 验证码操作处理
+ *
+ * @author Lion Li
+ */
+@SaIgnore
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+public class CaptchaController {
+
+    private final CaptchaProperties captchaProperties;
+    private final MailProperties mailProperties;
+
+    /**
+     * 短信验证码
+     *
+     * @param phonenumber 用户手机号
+     */
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/resource/sms/code")
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        // 验证码模板id 自行处理 (查数据库或写死均可)
+        String templateId = "";
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("code", code);
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        if (!smsResponse.isSuccess()) {
+            log.error("验证码短信发送异常 => {}", smsResponse);
+            return R.fail(smsResponse.getData().toString());
+        }
+        return R.ok();
+    }
+
+    /**
+     * 邮箱验证码
+     *
+     * @param email 邮箱
+     */
+    @GetMapping("/resource/email/code")
+    public R<Void> emailCode(@NotBlank(message = "{user.email.not.blank}") String email) {
+        if (!mailProperties.getEnabled()) {
+            return R.fail("当前系统没有开启邮箱功能！");
+        }
+        SpringUtils.getAopProxy(this).emailCodeImpl(email);
+        return R.ok();
+    }
+
+    /**
+     * 邮箱验证码
+     * 独立方法避免验证码关闭之后仍然走限流
+     */
+    @RateLimiter(key = "#email", time = 60, count = 1)
+    public void emailCodeImpl(String email) {
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + email;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        try {
+            MailUtils.sendText(email, "登录验证码", "您本次验证码为：" + code + "，有效性为" + Constants.CAPTCHA_EXPIRATION + "分钟，请尽快填写。");
+        } catch (Exception e) {
+            log.error("验证码短信发送异常 => {}", e.getMessage());
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/auth/code")
+    public R<CaptchaVo> getCode() {
+        boolean captchaEnabled = captchaProperties.getEnable();
+        if (!captchaEnabled) {
+            CaptchaVo captchaVo = new CaptchaVo();
+            captchaVo.setCaptchaEnabled(false);
+            return R.ok(captchaVo);
+        }
+        return R.ok(SpringUtils.getAopProxy(this).getCodeImpl());
+    }
+
+    /**
+     * 生成验证码
+     * 独立方法避免验证码关闭之后仍然走限流
+     */
+    @RateLimiter(time = 60, count = 10, limitType = LimitType.IP)
+    public CaptchaVo getCodeImpl() {
+        // 保存验证码信息
+        String uuid = IdUtil.simpleUUID();
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid;
+        // 生成验证码
+        CaptchaType captchaType = captchaProperties.getType();
+        boolean isMath = CaptchaType.MATH == captchaType;
+        Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
+        CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
+        AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
+        captcha.setGenerator(codeGenerator);
+        captcha.createCode();
+        // 如果是数学验证码，使用SpEL表达式处理验证码结果
+        String code = captcha.getCode();
+        if (isMath) {
+            ExpressionParser parser = new SpelExpressionParser();
+            Expression exp = parser.parseExpression(StringUtils.remove(code, "="));
+            code = exp.getValue(String.class);
+        }
+        RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        CaptchaVo captchaVo = new CaptchaVo();
+        captchaVo.setUuid(uuid);
+        captchaVo.setImg(captcha.getImageBase64());
+        return captchaVo;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java

@@ -0,0 +1,28 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页
+ *
+ * @author Lion Li
+ */
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+public class IndexController {
+
+    /**
+     * 访问首页，提示语
+     */
+    @GetMapping("/")
+    public String index() {
+        return StringUtils.format("欢迎使用{}后台管理框架，请通过前端地址访问。", SpringUtils.getApplicationName());
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java

@@ -0,0 +1,25 @@
+package org.dromara.web.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 验证码信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class CaptchaVo {
+
+    /**
+     * 是否开启验证码
+     */
+    private Boolean captchaEnabled = true;
+
+    private String uuid;
+
+    /**
+     * 验证码图片
+     */
+    private String img;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java

@@ -0,0 +1,25 @@
+package org.dromara.web.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 登录租户对象
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class LoginTenantVo {
+
+    /**
+     * 租户开关
+     */
+    private Boolean tenantEnabled;
+
+    /**
+     * 租户对象列表
+     */
+    private List<TenantListVo> voList;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java

@@ -0,0 +1,54 @@
+package org.dromara.web.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 登录验证信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class LoginVo {
+
+    /**
+     * 授权令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 刷新令牌
+     */
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+
+    /**
+     * 授权令牌 access_token 的有效期
+     */
+    @JsonProperty("expire_in")
+    private Long expireIn;
+
+    /**
+     * 刷新令牌 refresh_token 的有效期
+     */
+    @JsonProperty("refresh_expire_in")
+    private Long refreshExpireIn;
+
+    /**
+     * 应用id
+     */
+    @JsonProperty("client_id")
+    private String clientId;
+
+    /**
+     * 令牌权限
+     */
+    private String scope;
+
+    /**
+     * 用户 openid
+     */
+    private String openid;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java

@@ -0,0 +1,31 @@
+package org.dromara.web.domain.vo;
+
+import org.dromara.system.domain.vo.SysTenantVo;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+/**
+ * 租户列表
+ *
+ * @author Lion Li
+ */
+@Data
+@AutoMapper(target = SysTenantVo.class)
+public class TenantListVo {
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 域名
+     */
+    private String domain;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java

@@ -0,0 +1,163 @@
+package org.dromara.web.listener;
+
+import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.domain.dto.UserOnlineDTO;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+/**
+ * 用户行为 侦听器的实现
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class UserActionListener implements SaTokenListener {
+
+    private final SysLoginService loginService;
+
+    /**
+     * 每次登录时触发
+     */
+    @Override
+    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
+        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = ServletUtils.getClientIP();
+        UserOnlineDTO dto = new UserOnlineDTO();
+        dto.setIpaddr(ip);
+        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        dto.setBrowser(userAgent.getBrowser().getName());
+        dto.setOs(userAgent.getOs().getName());
+        dto.setLoginTime(System.currentTimeMillis());
+        dto.setTokenId(tokenValue);
+        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
+        dto.setUserName(username);
+        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
+        dto.setDeviceType(loginParameter.getDeviceType());
+        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            if(loginParameter.getTimeout() == -1) {
+                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+            } else {
+                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+            }
+        });
+        // 记录登录日志
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+        // 更新登录信息
+        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
+        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次注销时触发
+     */
+    @Override
+    public void doLogout(String loginType, Object loginId, String tokenValue) {
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
+        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被踢下线时触发
+     */
+    @Override
+    public void doKickout(String loginType, Object loginId, String tokenValue) {
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
+        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被顶下线时触发
+     */
+    @Override
+    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
+        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被封禁时触发
+     */
+    @Override
+    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
+    }
+
+    /**
+     * 每次被解封时触发
+     */
+    @Override
+    public void doUntieDisable(String loginType, Object loginId, String service) {
+    }
+
+    /**
+     * 每次打开二级认证时触发
+     */
+    @Override
+    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
+    }
+
+    /**
+     * 每次创建Session时触发
+     */
+    @Override
+    public void doCloseSafe(String loginType, String tokenValue, String service) {
+    }
+
+    /**
+     * 每次创建Session时触发
+     */
+    @Override
+    public void doCreateSession(String id) {
+    }
+
+    /**
+     * 每次注销Session时触发
+     */
+    @Override
+    public void doLogoutSession(String id) {
+    }
+
+    /**
+     * 每次Token续期时触发
+     */
+    @Override
+    public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java

@@ -0,0 +1,46 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+
+/**
+ * 授权策略
+ *
+ * @author Michelle.Chung
+ */
+public interface IAuthStrategy {
+
+    String BASE_NAME = "AuthStrategy";
+
+    /**
+     * 登录
+     *
+     * @param body      登录对象
+     * @param client    授权管理视图对象
+     * @param grantType 授权类型
+     * @return 登录验证信息
+     */
+    static LoginVo login(String body, SysClientVo client, String grantType) {
+        // 授权类型和客户端id
+        String beanName = grantType + BASE_NAME;
+        if (!SpringUtils.containsBean(beanName)) {
+            throw new ServiceException("授权类型不正确!");
+        }
+        IAuthStrategy instance = SpringUtils.getBean(beanName);
+        return instance.login(body, client);
+    }
+
+    /**
+     * 登录
+     *
+     * @param body   登录对象
+     * @param client 授权管理视图对象
+     * @return 登录验证信息
+     */
+    LoginVo login(String body, SysClientVo client);
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -0,0 +1,251 @@
+package org.dromara.web.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Opt;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.lock.annotation.Lock4j;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.constant.TenantConstants;
+import org.dromara.common.core.domain.dto.PostDTO;
+import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.exception.TenantException;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.vo.*;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class SysLoginService {
+
+    @Value("${user.password.maxRetryCount}")
+    private Integer maxRetryCount;
+
+    @Value("${user.password.lockTime}")
+    private Integer lockTime;
+
+    private final ISysTenantService tenantService;
+    private final ISysPermissionService permissionService;
+    private final ISysSocialService sysSocialService;
+    private final ISysRoleService roleService;
+    private final ISysDeptService deptService;
+    private final ISysPostService postService;
+    private final SysUserMapper userMapper;
+
+
+    /**
+     * 绑定第三方用户
+     *
+     * @param authUserData 授权响应实体
+     */
+    @Lock4j
+    public void socialRegister(AuthUser authUserData) {
+        String authId = authUserData.getSource() + authUserData.getUuid();
+        // 第三方用户信息
+        SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class);
+        BeanUtil.copyProperties(authUserData.getToken(), bo);
+        Long userId = LoginHelper.getUserId();
+        bo.setUserId(userId);
+        bo.setAuthId(authId);
+        bo.setOpenId(authUserData.getUuid());
+        bo.setUserName(authUserData.getUsername());
+        bo.setNickName(authUserData.getNickname());
+        List<SysSocialVo> checkList = sysSocialService.selectByAuthId(authId);
+        if (CollUtil.isNotEmpty(checkList)) {
+            throw new ServiceException("此三方账号已经被绑定!");
+        }
+        // 查询是否已经绑定用户
+        SysSocialBo params = new SysSocialBo();
+        params.setUserId(userId);
+        params.setSource(bo.getSource());
+        List<SysSocialVo> list = sysSocialService.queryList(params);
+        if (CollUtil.isEmpty(list)) {
+            // 没有绑定用户, 新增用户信息
+            sysSocialService.insertByBo(bo);
+        } else {
+            // 更新用户信息
+            bo.setId(list.get(0).getId());
+            sysSocialService.updateByBo(bo);
+            // 如果要绑定的平台账号已经被绑定过了 是否抛异常自行决断
+            // throw new ServiceException("此平台账号已经被绑定!");
+        }
+    }
+
+
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            if (ObjectUtil.isNull(loginUser)) {
+                return;
+            }
+            if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+                // 超级管理员 登出清除动态租户
+                TenantHelper.clearDynamic();
+            }
+            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+        } catch (NotLoginException ignored) {
+        } finally {
+            try {
+                StpUtil.logout();
+            } catch (NotLoginException ignored) {
+            }
+        }
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     */
+    public void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+    /**
+     * 构建登录用户
+     */
+    public LoginUser buildLoginUser(SysUserVo user) {
+        LoginUser loginUser = new LoginUser();
+        Long userId = user.getUserId();
+        loginUser.setTenantId(user.getTenantId());
+        loginUser.setUserId(userId);
+        loginUser.setDeptId(user.getDeptId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType(user.getUserType());
+        loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
+        loginUser.setRolePermission(permissionService.getRolePermission(userId));
+        if (ObjectUtil.isNotNull(user.getDeptId())) {
+            Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
+            loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
+            loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
+        }
+        List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        List<SysPostVo> posts = postService.selectPostsByUserId(userId);
+        loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
+        return loginUser;
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param userId 用户ID
+     */
+    public void recordLoginInfo(Long userId, String ip) {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(userId);
+        sysUser.setLoginIp(ip);
+        sysUser.setLoginDate(DateUtils.getNowDate());
+        sysUser.setUpdateBy(userId);
+        DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser));
+    }
+
+    /**
+     * 登录校验
+     */
+    public void checkLogin(LoginType loginType, String tenantId, String username, Supplier<Boolean> supplier) {
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
+        String loginFail = Constants.LOGIN_FAIL;
+
+        // 获取用户登录错误次数，默认为0 (可自定义限制策略 例如: key + username + ip)
+        int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
+        // 锁定时间内登录 则踢出
+        if (errorNumber >= maxRetryCount) {
+            recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+        }
+
+        if (supplier.get()) {
+            // 错误次数递增
+            errorNumber++;
+            RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+            // 达到规定错误次数 则锁定登录
+            if (errorNumber >= maxRetryCount) {
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+            } else {
+                // 未达到规定错误次数
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
+                throw new UserException(loginType.getRetryLimitCount(), errorNumber);
+            }
+        }
+
+        // 登录成功 清空错误次数
+        RedisUtils.deleteObject(errorKey);
+    }
+
+    /**
+     * 校验租户
+     *
+     * @param tenantId 租户ID
+     */
+    public void checkTenant(String tenantId) {
+        if (!TenantHelper.isEnable()) {
+            return;
+        }
+        if (StringUtils.isBlank(tenantId)) {
+            throw new TenantException("tenant.number.not.blank");
+        }
+        if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+            return;
+        }
+        SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
+        if (ObjectUtil.isNull(tenant)) {
+            log.info("登录租户：{} 不存在.", tenantId);
+            throw new TenantException("tenant.not.exists");
+        } else if (SystemConstants.DISABLE.equals(tenant.getStatus())) {
+            log.info("登录租户：{} 已被停用.", tenantId);
+            throw new TenantException("tenant.blocked");
+        } else if (ObjectUtil.isNotNull(tenant.getExpireTime())
+            && new Date().after(tenant.getExpireTime())) {
+            log.info("登录租户：{} 已超过有效期.", tenantId);
+            throw new TenantException("tenant.expired");
+        }
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -0,0 +1,115 @@
+package org.dromara.web.service;
+
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 注册校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class SysRegisterService {
+
+    private final ISysUserService userService;
+    private final SysUserMapper userMapper;
+    private final CaptchaProperties captchaProperties;
+
+    /**
+     * 注册
+     */
+    public void register(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getUsername();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        boolean captchaEnabled = captchaProperties.getEnable();
+        // 验证码开关
+        if (captchaEnabled) {
+            validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid());
+        }
+        SysUserBo sysUser = new SysUserBo();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPassword(BCrypt.hashpw(password));
+        sysUser.setUserType(userType);
+
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUserName, sysUser.getUserName()));
+        });
+        if (exist) {
+            throw new UserException("user.register.save.error", username);
+        }
+        boolean regFlag = userService.registerUser(sysUser, tenantId);
+        if (!regFlag) {
+            throw new UserException("user.register.error");
+        }
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    public void validateCaptcha(String tenantId, String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java

@@ -0,0 +1,102 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.EmailLoginBody;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 邮件认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("email" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class EmailAuthStrategy implements IAuthStrategy {
+
+    private final SysLoginService loginService;
+    private final SysUserMapper userMapper;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
+        String email = loginBody.getEmail();
+        String emailCode = loginBody.getEmailCode();
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByEmail(email);
+            loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验邮箱验证码
+     */
+    private boolean validateEmailCode(String tenantId, String email, String emailCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
+        if (StringUtils.isBlank(code)) {
+            loginService.recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(emailCode);
+    }
+
+    private SysUserVo loadUserByEmail(String email) {
+        SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getEmail, email));
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", email);
+            throw new UserException("user.not.exists", email);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", email);
+            throw new UserException("user.blocked", email);
+        }
+        return user;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -0,0 +1,123 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 密码认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("password" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class PasswordAuthStrategy implements IAuthStrategy {
+
+    private final CaptchaProperties captchaProperties;
+    private final SysLoginService loginService;
+    private final SysUserMapper userMapper;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
+        String username = loginBody.getUsername();
+        String password = loginBody.getPassword();
+        String code = loginBody.getCode();
+        String uuid = loginBody.getUuid();
+
+        boolean captchaEnabled = captchaProperties.getEnable();
+        // 验证码开关
+        if (captchaEnabled) {
+            validateCaptcha(tenantId, username, code, uuid);
+        }
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByUsername(username);
+            loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword()));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser
+            return loginService.buildLoginUser(user);
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    private void validateCaptcha(String tenantId, String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    private SysUserVo loadUserByUsername(String username) {
+        SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, username));
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", username);
+            throw new UserException("user.not.exists", username);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", username);
+            throw new UserException("user.blocked", username);
+        }
+        return user;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java

@@ -0,0 +1,102 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SmsLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 短信认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("sms" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class SmsAuthStrategy implements IAuthStrategy {
+
+    private final SysLoginService loginService;
+    private final SysUserMapper userMapper;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
+        String phonenumber = loginBody.getPhonenumber();
+        String smsCode = loginBody.getSmsCode();
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByPhonenumber(phonenumber);
+            loginService.checkLogin(LoginType.SMS, tenantId, user.getUserName(), () -> !validateSmsCode(tenantId, phonenumber, smsCode));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    private SysUserVo loadUserByPhonenumber(String phonenumber) {
+        SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", phonenumber);
+            throw new UserException("user.not.exists", phonenumber);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", phonenumber);
+            throw new UserException("user.blocked", phonenumber);
+        }
+        return user;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java

@@ -0,0 +1,131 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.http.Method;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysSocialVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysSocialService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 第三方授权策略
+ *
+ * @author thiszhc is 三三
+ */
+@Slf4j
+@Service("social" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class SocialAuthStrategy implements IAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final ISysSocialService sysSocialService;
+    private final SysUserMapper userMapper;
+    private final SysLoginService loginService;
+
+    /**
+     * 登录-第三方授权登录
+     *
+     * @param body     登录信息
+     * @param client   客户端信息
+     */
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
+        if (!response.ok()) {
+            throw new ServiceException(response.getMsg());
+        }
+        AuthUser authUserData = response.getData();
+        if ("GITEE".equals(authUserData.getSource())) {
+            // 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖
+            HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus")
+                    .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
+                    .executeAsync();
+            HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus")
+                    .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
+                    .executeAsync();
+        }
+
+        List<SysSocialVo> list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
+        if (CollUtil.isEmpty(list)) {
+            throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！");
+        }
+        SysSocialVo social;
+        if (TenantHelper.isEnable()) {
+            Optional<SysSocialVo> opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(loginBody.getTenantId()));
+            if (opt.isEmpty()) {
+                throw new ServiceException("对不起，你没有权限登录当前租户！");
+            }
+            social = opt.get();
+        } else {
+            social = list.get(0);
+        }
+        LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> {
+            SysUserVo user = loadUser(social.getUserId());
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    private SysUserVo loadUser(Long userId) {
+        SysUserVo user = userMapper.selectVoById(userId);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", "");
+            throw new UserException("user.not.exists", "");
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", "");
+            throw new UserException("user.blocked", "");
+        }
+        return user;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java

@@ -0,0 +1,111 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.request.AuthWechatMiniProgramRequest;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.XcxLoginBody;
+import org.dromara.common.core.domain.model.XcxLoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 小程序认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("xcx" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class XcxAuthStrategy implements IAuthStrategy {
+
+    private final SysLoginService loginService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        // xcxCode 为 小程序调用 wx.login 授权后获取
+        String xcxCode = loginBody.getXcxCode();
+        // 多个小程序识别使用
+        String appid = loginBody.getAppid();
+
+        // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
+        AuthRequest authRequest = new AuthWechatMiniProgramRequest(AuthConfig.builder()
+            .clientId(appid).clientSecret("自行填写密钥 可根据不同appid填入不同密钥")
+            .ignoreCheckRedirectUri(true).ignoreCheckState(true).build());
+        AuthCallback authCallback = new AuthCallback();
+        authCallback.setCode(xcxCode);
+        AuthResponse<AuthUser> resp = authRequest.login(authCallback);
+        String openid, unionId;
+        if (resp.ok()) {
+            AuthToken token = resp.getData().getToken();
+            openid = token.getOpenId();
+            // 微信小程序只有关联到微信开放平台下之后才能获取到 unionId，因此unionId不一定能返回。
+            unionId = token.getUnionId();
+        } else {
+            throw new ServiceException(resp.getMsg());
+        }
+        // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
+        SysUserVo user = loadUserByOpenid(openid);
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        XcxLoginUser loginUser = new XcxLoginUser();
+        loginUser.setTenantId(user.getTenantId());
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType(user.getUserType());
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        loginUser.setOpenid(openid);
+
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        loginVo.setOpenid(openid);
+        return loginVo;
+    }
+
+    private SysUserVo loadUserByOpenid(String openid) {
+        // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
+        // todo 自行实现 userService.selectUserByOpenid(openid);
+        SysUserVo user = new SysUserVo();
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", openid);
+            // todo 用户不存在 业务逻辑自行实现
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", openid);
+            // todo 用户已被停用 业务逻辑自行实现
+        }
+        return user;
+    }
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqHallInfoVo;
+import org.dromara.zhxy.domain.bo.HqHallInfoBo;
+import org.dromara.zhxy.service.IHqHallInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 报告厅信息
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/hallInfo")
+public class HqHallInfoController extends BaseController {
+
+    private final IHqHallInfoService hqHallInfoService;
+
+    /**
+     * 查询报告厅信息列表
+     */
+    @SaCheckPermission("hq:hallInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqHallInfoVo> list(HqHallInfoBo bo, PageQuery pageQuery) {
+        return hqHallInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出报告厅信息列表
+     */
+    @SaCheckPermission("hq:hallInfo:export")
+    @Log(title = "报告厅信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqHallInfoBo bo, HttpServletResponse response) {
+        List<HqHallInfoVo> list = hqHallInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "报告厅信息", HqHallInfoVo.class, response);
+    }
+
+    /**
+     * 获取报告厅信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:hallInfo:query")
+    @GetMapping("/{id}")
+    public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqHallInfoService.queryById(id));
+    }
+
+    /**
+     * 新增报告厅信息
+     */
+    @SaCheckPermission("hq:hallInfo:add")
+    @Log(title = "报告厅信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqHallInfoBo bo) {
+        return toAjax(hqHallInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改报告厅信息
+     */
+    @SaCheckPermission("hq:hallInfo:edit")
+    @Log(title = "报告厅信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqHallInfoBo bo) {
+        return toAjax(hqHallInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除报告厅信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:hallInfo:remove")
+    @Log(title = "报告厅信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqHallInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallReservationController.java

@@ -0,0 +1,115 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqHallReservationVo;
+import org.dromara.zhxy.domain.bo.HqHallReservationBo;
+import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo;
+import org.dromara.zhxy.service.IHqHallReservationService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 报告厅预约
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/hallReservation")
+public class HqHallReservationController extends BaseController {
+
+    private final IHqHallReservationService hqHallReservationService;
+
+    /**
+     * 查询报告厅预约列表
+     */
+    @SaCheckPermission("hq:hallReservation:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqHallReservationVo> list(HqHallReservationBo bo, PageQuery pageQuery) {
+        return hqHallReservationService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出报告厅预约列表
+     */
+    @SaCheckPermission("hq:hallReservation:export")
+    @Log(title = "报告厅预约", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqHallReservationBo bo, HttpServletResponse response) {
+        List<HqHallReservationVo> list = hqHallReservationService.queryList(bo);
+        ExcelUtil.exportExcel(list, "报告厅预约", HqHallReservationVo.class, response);
+    }
+
+    /**
+     * 获取报告厅预约详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:hallReservation:query")
+    @GetMapping("/{id}")
+    public R<HqHallReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(hqHallReservationService.queryById(id));
+    }
+
+    /**
+     * 新增报告厅预约
+     */
+    @SaCheckPermission("hq:hallReservation:add")
+    @Log(title = "报告厅预约", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqHallReservationBo bo) {
+        return toAjax(hqHallReservationService.insertByBo(bo));
+    }
+
+    /**
+     * 修改报告厅预约
+     */
+    @SaCheckPermission("hq:hallReservation:edit")
+    @Log(title = "报告厅预约", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqHallReservationBo bo) {
+        return toAjax(hqHallReservationService.updateByBo(bo));
+    }
+
+    /**
+     * 删除报告厅预约
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:hallReservation:remove")
+    @Log(title = "报告厅预约", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(hqHallReservationService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 审核报告厅预约（批准/拒绝）
+     */
+    @SaCheckPermission("hq:hallReservation:audit")
+    @Log(title = "报告厅预约审核", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/audit")
+    public R<Void> audit(@RequestBody HqHallReservationAuditBo auditBo) {
+        return toAjax(hqHallReservationService.auditByIds(auditBo));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatCategoryController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatCategoryVo;
+import org.dromara.zhxy.domain.bo.HqSatCategoryBo;
+import org.dromara.zhxy.service.IHqSatCategoryService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 题目分类
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satCategory")
+public class HqSatCategoryController extends BaseController {
+
+    private final IHqSatCategoryService hqSatCategoryService;
+
+    /**
+     * 查询题目分类列表
+     */
+    @SaCheckPermission("hq:satCategory:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatCategoryVo> list(HqSatCategoryBo bo, PageQuery pageQuery) {
+        return hqSatCategoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出题目分类列表
+     */
+    @SaCheckPermission("hq:satCategory:export")
+    @Log(title = "题目分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatCategoryBo bo, HttpServletResponse response) {
+        List<HqSatCategoryVo> list = hqSatCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "题目分类", HqSatCategoryVo.class, response);
+    }
+
+    /**
+     * 获取题目分类详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satCategory:query")
+    @GetMapping("/{id}")
+    public R<HqSatCategoryVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqSatCategoryService.queryById(id));
+    }
+
+    /**
+     * 新增题目分类
+     */
+    @SaCheckPermission("hq:satCategory:add")
+    @Log(title = "题目分类", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatCategoryBo bo) {
+        return toAjax(hqSatCategoryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改题目分类
+     */
+    @SaCheckPermission("hq:satCategory:edit")
+    @Log(title = "题目分类", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatCategoryBo bo) {
+        return toAjax(hqSatCategoryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除题目分类
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satCategory:remove")
+    @Log(title = "题目分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqSatCategoryService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatDetailController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatDetailVo;
+import org.dromara.zhxy.domain.bo.HqSatDetailBo;
+import org.dromara.zhxy.service.IHqSatDetailService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 答题详情
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satDetail")
+public class HqSatDetailController extends BaseController {
+
+    private final IHqSatDetailService hqSatDetailService;
+
+    /**
+     * 查询答题详情列表
+     */
+    @SaCheckPermission("hq:satDetail:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatDetailVo> list(HqSatDetailBo bo, PageQuery pageQuery) {
+        return hqSatDetailService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出答题详情列表
+     */
+    @SaCheckPermission("hq:satDetail:export")
+    @Log(title = "答题详情", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatDetailBo bo, HttpServletResponse response) {
+        List<HqSatDetailVo> list = hqSatDetailService.queryList(bo);
+        ExcelUtil.exportExcel(list, "答题详情", HqSatDetailVo.class, response);
+    }
+
+    /**
+     * 获取答题详情详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satDetail:query")
+    @GetMapping("/{id}")
+    public R<HqSatDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqSatDetailService.queryById(id));
+    }
+
+    /**
+     * 新增答题详情
+     */
+    @SaCheckPermission("hq:satDetail:add")
+    @Log(title = "答题详情", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatDetailBo bo) {
+        return toAjax(hqSatDetailService.insertByBo(bo));
+    }
+
+    /**
+     * 修改答题详情
+     */
+    @SaCheckPermission("hq:satDetail:edit")
+    @Log(title = "答题详情", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatDetailBo bo) {
+        return toAjax(hqSatDetailService.updateByBo(bo));
+    }
+
+    /**
+     * 删除答题详情
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satDetail:remove")
+    @Log(title = "答题详情", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqSatDetailService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatOptionController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatOptionVo;
+import org.dromara.zhxy.domain.bo.HqSatOptionBo;
+import org.dromara.zhxy.service.IHqSatOptionService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 评分选项
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satOption")
+public class HqSatOptionController extends BaseController {
+
+    private final IHqSatOptionService hqSatOptionService;
+
+    /**
+     * 查询评分选项列表
+     */
+    @SaCheckPermission("hq:satOption:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatOptionVo> list(HqSatOptionBo bo, PageQuery pageQuery) {
+        return hqSatOptionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出评分选项列表
+     */
+    @SaCheckPermission("hq:satOption:export")
+    @Log(title = "评分选项", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatOptionBo bo, HttpServletResponse response) {
+        List<HqSatOptionVo> list = hqSatOptionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "评分选项", HqSatOptionVo.class, response);
+    }
+
+    /**
+     * 获取评分选项详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satOption:query")
+    @GetMapping("/{id}")
+    public R<HqSatOptionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqSatOptionService.queryById(id));
+    }
+
+    /**
+     * 新增评分选项
+     */
+    @SaCheckPermission("hq:satOption:add")
+    @Log(title = "评分选项", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatOptionBo bo) {
+        return toAjax(hqSatOptionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改评分选项
+     */
+    @SaCheckPermission("hq:satOption:edit")
+    @Log(title = "评分选项", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatOptionBo bo) {
+        return toAjax(hqSatOptionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除评分选项
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satOption:remove")
+    @Log(title = "评分选项", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqSatOptionService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatQuestionController.java

@@ -0,0 +1,123 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatQuestionVo;
+import org.dromara.zhxy.domain.bo.HqSatQuestionBo;
+import org.dromara.zhxy.service.IHqSatQuestionService;
+import org.dromara.zhxy.service.IHqSatOptionService;
+import org.dromara.zhxy.domain.vo.HqSatOptionVo;
+import org.dromara.zhxy.domain.bo.HqSatOptionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 题库
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satQuestion")
+public class HqSatQuestionController extends BaseController {
+
+    private final IHqSatQuestionService hqSatQuestionService;
+    private final IHqSatOptionService hqSatOptionService;
+
+    /**
+     * 查询题库列表
+     */
+    @SaCheckPermission("hq:satQuestion:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatQuestionVo> list(HqSatQuestionBo bo, PageQuery pageQuery) {
+        return hqSatQuestionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出题库列表
+     */
+    @SaCheckPermission("hq:satQuestion:export")
+    @Log(title = "题库", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatQuestionBo bo, HttpServletResponse response) {
+        List<HqSatQuestionVo> list = hqSatQuestionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "题库", HqSatQuestionVo.class, response);
+    }
+
+    /**
+     * 获取题库详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satQuestion:query")
+    @GetMapping("/{id}")
+    public R<HqSatQuestionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(hqSatQuestionService.queryById(id));
+    }
+
+    /**
+     * 新增题库
+     */
+    @SaCheckPermission("hq:satQuestion:add")
+    @Log(title = "题库", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatQuestionBo bo) {
+        return toAjax(hqSatQuestionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改题库
+     */
+    @SaCheckPermission("hq:satQuestion:edit")
+    @Log(title = "题库", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatQuestionBo bo) {
+        return toAjax(hqSatQuestionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除题库
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satQuestion:remove")
+    @Log(title = "题库", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(hqSatQuestionService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 获取题目的选项列表
+     * 注：选项针对所有单选题和多选题通用，不区分具体题目
+     *
+     * @param questionId 题目ID（预留参数，当前不使用）
+     */
+    @SaCheckPermission("hq:satQuestion:query")
+    @GetMapping("/{questionId}/options")
+    public R<List<HqSatOptionVo>> getQuestionOptions(@PathVariable Long questionId) {
+        // 获取所有启用状态的选项
+        HqSatOptionBo bo = new HqSatOptionBo();
+        bo.setStatus("0"); // 启用状态
+        List<HqSatOptionVo> options = hqSatOptionService.queryList(bo);
+        return R.ok(options);
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatRecordController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatRecordVo;
+import org.dromara.zhxy.domain.bo.HqSatRecordBo;
+import org.dromara.zhxy.service.IHqSatRecordService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 答题记录
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satRecord")
+public class HqSatRecordController extends BaseController {
+
+    private final IHqSatRecordService hqSatRecordService;
+
+    /**
+     * 查询答题记录列表
+     */
+    @SaCheckPermission("hq:satRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatRecordVo> list(HqSatRecordBo bo, PageQuery pageQuery) {
+        return hqSatRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出答题记录列表
+     */
+    @SaCheckPermission("hq:satRecord:export")
+    @Log(title = "答题记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatRecordBo bo, HttpServletResponse response) {
+        List<HqSatRecordVo> list = hqSatRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "答题记录", HqSatRecordVo.class, response);
+    }
+
+    /**
+     * 获取答题记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satRecord:query")
+    @GetMapping("/{id}")
+    public R<HqSatRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqSatRecordService.queryById(id));
+    }
+
+    /**
+     * 新增答题记录
+     */
+    @SaCheckPermission("hq:satRecord:add")
+    @Log(title = "答题记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatRecordBo bo) {
+        return toAjax(hqSatRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改答题记录
+     */
+    @SaCheckPermission("hq:satRecord:edit")
+    @Log(title = "答题记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatRecordBo bo) {
+        return toAjax(hqSatRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除答题记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satRecord:remove")
+    @Log(title = "答题记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqSatRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyController.java

@@ -0,0 +1,180 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatSurveyVo;
+import org.dromara.zhxy.domain.bo.HqSatSurveyBo;
+import org.dromara.zhxy.service.IHqSatSurveyService;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 问卷
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satSurvey")
+public class HqSatSurveyController extends BaseController {
+
+    private final IHqSatSurveyService hqSatSurveyService;
+
+    /**
+     * 查询问卷列表
+     */
+    @SaCheckPermission("hq:satSurvey:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatSurveyVo> list(HqSatSurveyBo bo, PageQuery pageQuery) {
+        // 从params中获取权限过滤参数
+        if (bo.getParams() != null) {
+            // 处理目标群体IN查询
+            if (bo.getParams().containsKey("targetGroupIn")) {
+                Object targetGroupInObj = bo.getParams().get("targetGroupIn");
+                if (targetGroupInObj instanceof List<?>) {
+                    @SuppressWarnings("unchecked")
+                    List<String> targetGroups = (List<String>) targetGroupInObj;
+                    bo.setTargetGroupIn(targetGroups);
+                }
+            }
+
+            // 处理状态IN查询
+            if (bo.getParams().containsKey("statusIn")) {
+                Object statusInObj = bo.getParams().get("statusIn");
+                if (statusInObj instanceof List<?>) {
+                    @SuppressWarnings("unchecked")
+                    List<String> statuses = (List<String>) statusInObj;
+                    bo.setStatusIn(statuses);
+                }
+            }
+        }
+
+        return hqSatSurveyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出问卷列表
+     */
+    @SaCheckPermission("hq:satSurvey:export")
+    @Log(title = "问卷", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatSurveyBo bo, HttpServletResponse response) {
+        List<HqSatSurveyVo> list = hqSatSurveyService.queryList(bo);
+        ExcelUtil.exportExcel(list, "问卷", HqSatSurveyVo.class, response);
+    }
+
+    /**
+     * 获取问卷详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satSurvey:query")
+    @GetMapping("/{id}")
+    public R<HqSatSurveyVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(hqSatSurveyService.queryById(id));
+    }
+
+    /**
+     * 新增问卷
+     */
+    @SaCheckPermission("hq:satSurvey:add")
+    @Log(title = "问卷", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatSurveyBo bo) {
+        return toAjax(hqSatSurveyService.insertByBo(bo));
+    }
+
+    /**
+     * 修改问卷
+     */
+    @SaCheckPermission("hq:satSurvey:edit")
+    @Log(title = "问卷", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatSurveyBo bo) {
+        return toAjax(hqSatSurveyService.updateByBo(bo));
+    }
+
+    /**
+     * 删除问卷
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satSurvey:remove")
+    @Log(title = "问卷", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(hqSatSurveyService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 获取问卷关联的题目列表
+     *
+     * @param surveyId 问卷ID
+     */
+    @SaCheckPermission("hq:satSurvey:question")
+    @GetMapping("/{surveyId}/questions")
+    public R<List<HqSatSurveyQuestionVo>> getSurveyQuestions(
+            @NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
+        return R.ok(hqSatSurveyService.getSurveyQuestions(surveyId));
+    }
+
+    /**
+     * 批量更新问卷题目关联
+     *
+     * @param surveyId  问卷ID
+     * @param questions 题目列表
+     */
+    @SaCheckPermission("hq:satSurvey:question")
+    @Log(title = "问卷题目管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/{surveyId}/questions")
+    public R<Void> updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId,
+            @RequestBody List<Object> questions) {
+        return toAjax(hqSatSurveyService.updateSurveyQuestions(surveyId, questions));
+    }
+
+    /**
+     * 发布问卷
+     *
+     * @param id 问卷ID
+     */
+    @SaCheckPermission("hq:satSurvey:publish")
+    @Log(title = "发布问卷", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/{id}/publish")
+    public R<Void> publishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
+        return toAjax(hqSatSurveyService.publishSurvey(id));
+    }
+
+    /**
+     * 撤销发布问卷
+     *
+     * @param id 问卷ID
+     */
+    @SaCheckPermission("hq:satSurvey:unpublish")
+    @Log(title = "撤销发布问卷", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/{id}/unpublish")
+    public R<Void> unpublishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
+        return toAjax(hqSatSurveyService.unpublishSurvey(id));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyQuestionController.java

@@ -0,0 +1,105 @@
+package org.dromara.zhxy.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo;
+import org.dromara.zhxy.service.IHqSatSurveyQuestionService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 问卷题目关联
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/hq/satSurveyQuestion")
+public class HqSatSurveyQuestionController extends BaseController {
+
+    private final IHqSatSurveyQuestionService hqSatSurveyQuestionService;
+
+    /**
+     * 查询问卷题目关联列表
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:list")
+    @GetMapping("/list")
+    public TableDataInfo<HqSatSurveyQuestionVo> list(HqSatSurveyQuestionBo bo, PageQuery pageQuery) {
+        return hqSatSurveyQuestionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出问卷题目关联列表
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:export")
+    @Log(title = "问卷题目关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HqSatSurveyQuestionBo bo, HttpServletResponse response) {
+        List<HqSatSurveyQuestionVo> list = hqSatSurveyQuestionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "问卷题目关联", HqSatSurveyQuestionVo.class, response);
+    }
+
+    /**
+     * 获取问卷题目关联详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:query")
+    @GetMapping("/{id}")
+    public R<HqSatSurveyQuestionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(hqSatSurveyQuestionService.queryById(id));
+    }
+
+    /**
+     * 新增问卷题目关联
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:add")
+    @Log(title = "问卷题目关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatSurveyQuestionBo bo) {
+        return toAjax(hqSatSurveyQuestionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改问卷题目关联
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:edit")
+    @Log(title = "问卷题目关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatSurveyQuestionBo bo) {
+        return toAjax(hqSatSurveyQuestionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除问卷题目关联
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("hq:satSurveyQuestion:remove")
+    @Log(title = "问卷题目关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hqSatSurveyQuestionService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallInfo.java

@@ -0,0 +1,53 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+
+/**
+ * 报告厅信息对象 hq_hall_info
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_hall_info")
+public class HqHallInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 报告厅名称
+     */
+    private String hallName;
+
+    /**
+     * 报告厅图片
+     */
+    private String hallImage;
+
+    /**
+     * 报告厅状态
+     */
+    private String hallStatus;
+
+    /**
+     * 报告厅描述
+     */
+    private String hallDescription;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallReservation.java

@@ -0,0 +1,97 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 报告厅预约对象 hq_hall_reservation
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_hall_reservation")
+public class HqHallReservation extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 报告厅ID
+     */
+    private Long hallId;
+
+    /**
+     * 报告厅名称
+     */
+    private String hallName;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 预约用途
+     */
+    private String reservationPurpose;
+
+    /**
+     * 申请人id
+     */
+    private Long applicantId;
+
+    /**
+     * 申请人姓名
+     */
+    private String applicantName;
+
+    /**
+     * 申请人电话
+     */
+    private String applicantPhone;
+
+    /**
+     * 预约状态
+     */
+    private String status;
+
+    /**
+     * 审核人id
+     */
+    private Long auditBy;
+
+    /**
+     * 审核人
+     */
+    private String auditName;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatCategory.java

@@ -0,0 +1,66 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 题目分类对象 hq_sat_category
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_category")
+public class HqSatCategory extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 分类描述
+     */
+    private String categoryDesc;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatDetail.java

@@ -0,0 +1,56 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 答题详情对象 hq_sat_detail
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_detail")
+public class HqSatDetail extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 答题记录ID
+     */
+    private Long recordId;
+
+    /**
+     * 题目ID
+     */
+    private Long questionId;
+
+    /**
+     * 答案分数
+     */
+    private Long answerScore;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatOption.java

@@ -0,0 +1,61 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 评分选项对象 hq_sat_option
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_option")
+public class HqSatOption extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 选项文本
+     */
+    private String optionText;
+
+    /**
+     * 选项分值
+     */
+    private Long optionValue;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatQuestion.java

@@ -0,0 +1,76 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 题库对象 hq_sat_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_question")
+public class HqSatQuestion extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 题目标题
+     */
+    private String questionTitle;
+
+    /**
+     * 题目内容
+     */
+    private String questionContent;
+
+    /**
+     * 所属分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 题目类型
+     */
+    private String questionType;
+
+    /**
+     * 是否必填
+     */
+    private Long isRequired;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatRecord.java

@@ -0,0 +1,78 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 答题记录对象 hq_sat_record
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_record")
+public class HqSatRecord extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    private Long surveyId;
+
+    /**
+     * 答题用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 用户部门
+     */
+    private String userDept;
+
+    /**
+     * 提交时间
+     */
+    private Date submitTime;
+
+    /**
+     * 总分
+     */
+    private Long totalScore;
+
+    /**
+     * 平均分
+     */
+    private Long avgScore;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurvey.java

@@ -0,0 +1,98 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 问卷对象 hq_sat_survey
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_survey")
+public class HqSatSurvey extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷编号
+     */
+    private String surveyCode;
+
+    /**
+     * 问卷标题
+     */
+    private String surveyTitle;
+
+    /**
+     * 问卷描述
+     */
+    private String surveyDesc;
+
+    /**
+     * 填写说明
+     */
+    private String surveyInstruction;
+
+    /**
+     * 目标群体
+     */
+    private String targetGroup;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 最大提交次数
+     */
+    private Long maxSubmitTimes;
+
+    /**
+     * 是否匿名
+     */
+    private Long isAnonymous;
+
+    /**
+     * 是否发布
+     */
+    private Long isPublished;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurveyQuestion.java

@@ -0,0 +1,66 @@
+package org.dromara.zhxy.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 问卷题目关联对象 hq_sat_survey_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hq_sat_survey_question")
+public class HqSatSurveyQuestion extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    private Long surveyId;
+
+    /**
+     * 题目ID
+     */
+    private Long questionId;
+
+    /**
+     * 题目顺序
+     */
+    private Long sortOrder;
+
+    /**
+     * 题目权重
+     */
+    private Long weight;
+
+    /**
+     * 是否必填
+     */
+    private Long isRequired;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallInfoBo.java

@@ -0,0 +1,54 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqHallInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+/**
+ * 报告厅信息业务对象 hq_hall_info
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqHallInfo.class, reverseConvertGenerate = false)
+public class HqHallInfoBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 报告厅名称
+     */
+    @NotBlank(message = "报告厅名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String hallName;
+
+    /**
+     * 报告厅图片
+     */
+    private String hallImage;
+
+    /**
+     * 报告厅状态
+     */
+    @NotBlank(message = "报告厅状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String hallStatus;
+
+    /**
+     * 报告厅描述
+     */
+    private String hallDescription;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationAuditBo.java

@@ -0,0 +1,33 @@
+package org.dromara.zhxy.domain.bo;
+
+import lombok.Data;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 报告厅预约审核业务对象
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+public class HqHallReservationAuditBo {
+
+    /**
+     * 预约记录ID列表
+     */
+    @NotEmpty(message = "预约记录ID不能为空")
+    private List<Long> ids;
+
+    /**
+     * 审核状态：1-批准，2-拒绝
+     */
+    @NotBlank(message = "审核状态不能为空")
+    private String status;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationBo.java

@@ -0,0 +1,116 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqHallReservation;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 报告厅预约业务对象 hq_hall_reservation
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqHallReservation.class, reverseConvertGenerate = false)
+public class HqHallReservationBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 报告厅ID
+     */
+    @NotNull(message = "报告厅ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hallId;
+
+    /**
+     * 报告厅名称
+     */
+    @NotBlank(message = "报告厅名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String hallName;
+
+    /**
+     * 开始时间（用于新增和编辑）
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 结束时间（用于新增和编辑）
+     */
+    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     * 开始时间查询参数（字符串格式）
+     */
+    private String startTimeStr;
+
+    /**
+     * 结束时间查询参数（字符串格式）
+     */
+    private String endTimeStr;
+
+    /**
+     * 预约用途
+     */
+    @NotBlank(message = "预约用途不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reservationPurpose;
+
+    /**
+     * 申请人id
+     */
+    @NotNull(message = "申请人id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long applicantId;
+
+    /**
+     * 申请人姓名
+     */
+    @NotBlank(message = "申请人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String applicantName;
+
+    /**
+     * 申请人电话
+     */
+    private String applicantPhone;
+
+    /**
+     * 预约状态
+     */
+    @NotBlank(message = "预约状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 审核人id
+     */
+    private Long auditBy;
+
+    /**
+     * 审核人
+     */
+    private String auditName;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatCategoryBo.java

@@ -0,0 +1,67 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatCategory;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 题目分类业务对象 hq_sat_category
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatCategory.class, reverseConvertGenerate = false)
+public class HqSatCategoryBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 分类编码
+     */
+    @NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+    @NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String categoryName;
+
+    /**
+     * 分类描述
+     */
+    private String categoryDesc;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatDetailBo.java

@@ -0,0 +1,57 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatDetail;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 答题详情业务对象 hq_sat_detail
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatDetail.class, reverseConvertGenerate = false)
+public class HqSatDetailBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 答题记录ID
+     */
+    @NotNull(message = "答题记录ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long recordId;
+
+    /**
+     * 题目ID
+     */
+    @NotNull(message = "题目ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long questionId;
+
+    /**
+     * 答案分数
+     */
+    private Long answerScore;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatOptionBo.java

@@ -0,0 +1,62 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatOption;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 评分选项业务对象 hq_sat_option
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatOption.class, reverseConvertGenerate = false)
+public class HqSatOptionBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 选项文本
+     */
+    @NotBlank(message = "选项文本不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String optionText;
+
+    /**
+     * 选项分值
+     */
+    @NotNull(message = "选项分值不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long optionValue;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatQuestionBo.java

@@ -0,0 +1,77 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatQuestion;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 题库业务对象 hq_sat_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatQuestion.class, reverseConvertGenerate = false)
+public class HqSatQuestionBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 题目标题
+     */
+    @NotBlank(message = "题目标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String questionTitle;
+
+    /**
+     * 题目内容
+     */
+    private String questionContent;
+
+    /**
+     * 所属分类ID
+     */
+    @NotNull(message = "所属分类ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long categoryId;
+
+    /**
+     * 题目类型
+     */
+    private String questionType;
+
+    /**
+     * 是否必填
+     */
+    private Long isRequired;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatRecordBo.java

@@ -0,0 +1,80 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 答题记录业务对象 hq_sat_record
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatRecord.class, reverseConvertGenerate = false)
+public class HqSatRecordBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    @NotNull(message = "问卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long surveyId;
+
+    /**
+     * 答题用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户类型
+     */
+    @NotBlank(message = "用户类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String userType;
+
+    /**
+     * 用户部门
+     */
+    private String userDept;
+
+    /**
+     * 提交时间
+     */
+    @NotNull(message = "提交时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date submitTime;
+
+    /**
+     * 总分
+     */
+    private Long totalScore;
+
+    /**
+     * 平均分
+     */
+    private Long avgScore;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyBo.java

@@ -0,0 +1,112 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatSurvey;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 问卷业务对象 hq_sat_survey
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatSurvey.class, reverseConvertGenerate = false)
+public class HqSatSurveyBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷编号
+     */
+    @NotBlank(message = "问卷编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String surveyCode;
+
+    /**
+     * 问卷标题
+     */
+    @NotBlank(message = "问卷标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String surveyTitle;
+
+    /**
+     * 问卷描述
+     */
+    private String surveyDesc;
+
+    /**
+     * 填写说明
+     */
+    private String surveyInstruction;
+
+    /**
+     * 目标群体
+     */
+    @NotBlank(message = "目标群体不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String targetGroup;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+    /**
+     * 最大提交次数
+     */
+    private Long maxSubmitTimes;
+
+    /**
+     * 是否匿名
+     */
+    private Long isAnonymous;
+
+    /**
+     * 是否发布
+     */
+    private Long isPublished;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 目标群体IN查询（用于权限过滤）
+     */
+    private List<String> targetGroupIn;
+
+    /**
+     * 状态IN查询（用于状态过滤）
+     */
+    private List<String> statusIn;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyQuestionBo.java

@@ -0,0 +1,67 @@
+package org.dromara.zhxy.domain.bo;
+
+import org.dromara.zhxy.domain.HqSatSurveyQuestion;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 问卷题目关联业务对象 hq_sat_survey_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HqSatSurveyQuestion.class, reverseConvertGenerate = false)
+public class HqSatSurveyQuestionBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    @NotNull(message = "问卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long surveyId;
+
+    /**
+     * 题目ID
+     */
+    @NotNull(message = "题目ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long questionId;
+
+    /**
+     * 题目顺序
+     */
+    private Long sortOrder;
+
+    /**
+     * 题目权重
+     */
+    private Long weight;
+
+    /**
+     * 是否必填
+     */
+    private Long isRequired;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallInfoVo.java

@@ -0,0 +1,70 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.zhxy.domain.HqHallInfo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 报告厅信息视图对象 hq_hall_info
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqHallInfo.class)
+public class HqHallInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 报告厅名称
+     */
+    @ExcelProperty(value = "报告厅名称")
+    private String hallName;
+
+    /**
+     * 报告厅图片
+     */
+    @ExcelProperty(value = "报告厅图片")
+    private String hallImage;
+
+    /**
+     * 报告厅图片Url
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "hallImage")
+    private String hallImageUrl;
+    /**
+     * 报告厅状态
+     */
+    @ExcelProperty(value = "报告厅状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "hall_status")
+    private String hallStatus;
+
+    /**
+     * 报告厅描述
+     */
+    @ExcelProperty(value = "报告厅描述")
+    private String hallDescription;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallReservationVo.java

@@ -0,0 +1,116 @@
+package org.dromara.zhxy.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.zhxy.domain.HqHallReservation;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 报告厅预约视图对象 hq_hall_reservation
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqHallReservation.class)
+public class HqHallReservationVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 报告厅ID
+     */
+    @ExcelProperty(value = "报告厅ID")
+    private Long hallId;
+
+    /**
+     * 报告厅名称
+     */
+    @ExcelProperty(value = "报告厅名称")
+    private String hallName;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 预约用途
+     */
+    @ExcelProperty(value = "预约用途")
+    private String reservationPurpose;
+
+    /**
+     * 申请人id
+     */
+    @ExcelProperty(value = "申请人id")
+    private Long applicantId;
+
+    /**
+     * 申请人姓名
+     */
+    @ExcelProperty(value = "申请人姓名")
+    private String applicantName;
+
+    /**
+     * 申请人电话
+     */
+    @ExcelProperty(value = "申请人电话")
+    private String applicantPhone;
+
+    /**
+     * 预约状态
+     */
+    @ExcelProperty(value = "预约状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "hall_reserv_status")
+    private String status;
+
+    /**
+     * 审核人id
+     */
+    @ExcelProperty(value = "审核人id")
+    private Long auditBy;
+
+    /**
+     * 审核人
+     */
+    @ExcelProperty(value = "审核人")
+    private String auditName;
+
+    /**
+     * 审核时间
+     */
+    @ExcelProperty(value = "审核时间")
+    private Date auditTime;
+
+    /**
+     * 审核备注
+     */
+    @ExcelProperty(value = "审核备注")
+    private String auditRemark;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatCategoryVo.java

@@ -0,0 +1,82 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.zhxy.domain.HqSatCategory;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 题目分类视图对象 hq_sat_category
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatCategory.class)
+public class HqSatCategoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 分类编码
+     */
+    @ExcelProperty(value = "分类编码")
+    private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+    @ExcelProperty(value = "分类名称")
+    private String categoryName;
+
+    /**
+     * 分类描述
+     */
+    @ExcelProperty(value = "分类描述")
+    private String categoryDesc;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_enable")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatDetailVo.java

@@ -0,0 +1,69 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.zhxy.domain.HqSatDetail;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 答题详情视图对象 hq_sat_detail
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatDetail.class)
+public class HqSatDetailVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 答题记录ID
+     */
+    @ExcelProperty(value = "答题记录ID")
+    private Long recordId;
+
+    /**
+     * 题目ID
+     */
+    @ExcelProperty(value = "题目ID")
+    private Long questionId;
+
+    /**
+     * 答案分数
+     */
+    @ExcelProperty(value = "答案分数")
+    private Long answerScore;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatOptionVo.java

@@ -0,0 +1,76 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.zhxy.domain.HqSatOption;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 评分选项视图对象 hq_sat_option
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatOption.class)
+public class HqSatOptionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 选项文本
+     */
+    @ExcelProperty(value = "选项文本")
+    private String optionText;
+
+    /**
+     * 选项分值
+     */
+    @ExcelProperty(value = "选项分值")
+    private Long optionValue;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_enable")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatQuestionVo.java

@@ -0,0 +1,96 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.zhxy.domain.HqSatQuestion;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 题库视图对象 hq_sat_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatQuestion.class)
+public class HqSatQuestionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 题目标题
+     */
+    @ExcelProperty(value = "题目标题")
+    private String questionTitle;
+
+    /**
+     * 题目内容
+     */
+    @ExcelProperty(value = "题目内容")
+    private String questionContent;
+
+    /**
+     * 所属分类ID
+     */
+    @ExcelProperty(value = "所属分类ID")
+    private Long categoryId;
+
+    /**
+     * 题目类型
+     */
+    @ExcelProperty(value = "题目类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_question_category")
+    private String questionType;
+
+    /**
+     * 是否必填
+     */
+    @ExcelProperty(value = "是否必填", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_required")
+    private Long isRequired;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sortOrder;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_enable")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatRecordVo.java

@@ -0,0 +1,95 @@
+package org.dromara.zhxy.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.zhxy.domain.HqSatRecord;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 答题记录视图对象 hq_sat_record
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatRecord.class)
+public class HqSatRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志")
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    @ExcelProperty(value = "问卷ID")
+    private Long surveyId;
+
+    /**
+     * 答题用户ID
+     */
+    @ExcelProperty(value = "答题用户ID")
+    private Long userId;
+
+    /**
+     * 用户类型
+     */
+    @ExcelProperty(value = "用户类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "survey_people_category")
+    private String userType;
+
+    /**
+     * 用户部门
+     */
+    @ExcelProperty(value = "用户部门")
+    private String userDept;
+
+    /**
+     * 提交时间
+     */
+    @ExcelProperty(value = "提交时间")
+    private Date submitTime;
+
+    /**
+     * 总分
+     */
+    @ExcelProperty(value = "总分")
+    private Long totalScore;
+
+    /**
+     * 平均分
+     */
+    @ExcelProperty(value = "平均分")
+    private Long avgScore;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionVo.java

@@ -0,0 +1,119 @@
+package org.dromara.zhxy.domain.vo;
+
+import org.dromara.zhxy.domain.HqSatSurveyQuestion;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 问卷题目关联视图对象 hq_sat_survey_question
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatSurveyQuestion.class)
+public class HqSatSurveyQuestionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 问卷ID
+     */
+    @ExcelProperty(value = "问卷ID")
+    private Long surveyId;
+
+    /**
+     * 题目ID
+     */
+    @ExcelProperty(value = "题目ID")
+    private Long questionId;
+
+    /**
+     * 题目顺序
+     */
+    @ExcelProperty(value = "题目顺序")
+    private Long sortOrder;
+
+    /**
+     * 题目权重
+     */
+    @ExcelProperty(value = "题目权重")
+    private Long weight;
+
+    /**
+     * 是否必填
+     */
+    @ExcelProperty(value = "是否必填", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_required")
+    private Long isRequired;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    // ==================== 以下为题目详细信息字段 ====================
+
+    /**
+     * 题目标题
+     */
+    @ExcelProperty(value = "题目标题")
+    private String questionTitle;
+
+    /**
+     * 题目内容
+     */
+    @ExcelProperty(value = "题目内容")
+    private String questionContent;
+
+    /**
+     * 所属分类ID
+     */
+    @ExcelProperty(value = "所属分类ID")
+    private Long categoryId;
+
+    /**
+     * 题目类型
+     */
+    @ExcelProperty(value = "题目类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_question_type")
+    private String questionType;
+
+    /**
+     * 分类名称
+     */
+    @ExcelProperty(value = "分类名称")
+    private String categoryName;
+
+    /**
+     * 题目状态
+     */
+    @ExcelProperty(value = "题目状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyVo.java

@@ -0,0 +1,123 @@
+package org.dromara.zhxy.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.zhxy.domain.HqSatSurvey;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 问卷视图对象 hq_sat_survey
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HqSatSurvey.class)
+public class HqSatSurveyVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_item_delete")
+    private Long deleted;
+
+    /**
+     * 问卷编号
+     */
+    @ExcelProperty(value = "问卷编号")
+    private String surveyCode;
+
+    /**
+     * 问卷标题
+     */
+    @ExcelProperty(value = "问卷标题")
+    private String surveyTitle;
+
+    /**
+     * 问卷描述
+     */
+    @ExcelProperty(value = "问卷描述")
+    private String surveyDesc;
+
+    /**
+     * 填写说明
+     */
+    @ExcelProperty(value = "填写说明")
+    private String surveyInstruction;
+
+    /**
+     * 目标群体
+     */
+    @ExcelProperty(value = "目标群体", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_survey_people")
+    private String targetGroup;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 最大提交次数
+     */
+    @ExcelProperty(value = "最大提交次数")
+    private Long maxSubmitTimes;
+
+    /**
+     * 是否匿名
+     */
+    @ExcelProperty(value = "是否匿名", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yesno")
+    private Long isAnonymous;
+
+    /**
+     * 是否发布
+     */
+    @ExcelProperty(value = "是否发布", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yesno")
+    private Long isPublished;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_survey_status")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqHallInfo;
+import org.dromara.zhxy.domain.vo.HqHallInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 报告厅信息Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+public interface HqHallInfoMapper extends BaseMapperPlus<HqHallInfo, HqHallInfoVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallReservationMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqHallReservation;
+import org.dromara.zhxy.domain.vo.HqHallReservationVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 报告厅预约Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+public interface HqHallReservationMapper extends BaseMapperPlus<HqHallReservation, HqHallReservationVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatCategoryMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatCategory;
+import org.dromara.zhxy.domain.vo.HqSatCategoryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 题目分类Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatCategoryMapper extends BaseMapperPlus<HqSatCategory, HqSatCategoryVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatDetailMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatDetail;
+import org.dromara.zhxy.domain.vo.HqSatDetailVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 答题详情Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatDetailMapper extends BaseMapperPlus<HqSatDetail, HqSatDetailVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatOptionMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatOption;
+import org.dromara.zhxy.domain.vo.HqSatOptionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 评分选项Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+public interface HqSatOptionMapper extends BaseMapperPlus<HqSatOption, HqSatOptionVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatQuestionMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatQuestion;
+import org.dromara.zhxy.domain.vo.HqSatQuestionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 题库Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatQuestionMapper extends BaseMapperPlus<HqSatQuestion, HqSatQuestionVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatRecordMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatRecord;
+import org.dromara.zhxy.domain.vo.HqSatRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 答题记录Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatRecordMapper extends BaseMapperPlus<HqSatRecord, HqSatRecordVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.zhxy.mapper;
+
+import org.dromara.zhxy.domain.HqSatSurvey;
+import org.dromara.zhxy.domain.vo.HqSatSurveyVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 问卷Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatSurveyMapper extends BaseMapperPlus<HqSatSurvey, HqSatSurveyVo> {
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyQuestionMapper.java

@@ -0,0 +1,26 @@
+package org.dromara.zhxy.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.dromara.zhxy.domain.HqSatSurveyQuestion;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.List;
+
+/**
+ * 问卷题目关联Mapper接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface HqSatSurveyQuestionMapper extends BaseMapperPlus<HqSatSurveyQuestion, HqSatSurveyQuestionVo> {
+
+    /**
+     * 联表查询问卷题目详情
+     *
+     * @param surveyId 问卷ID
+     * @return 问卷题目详情列表
+     */
+    List<HqSatSurveyQuestionVo> selectSurveyQuestionsWithDetail(@Param("surveyId") Long surveyId);
+
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqHallInfoVo;
+import org.dromara.zhxy.domain.bo.HqHallInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 报告厅信息Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+public interface IHqHallInfoService {
+
+    /**
+     * 查询报告厅信息
+     *
+     * @param id 主键
+     * @return 报告厅信息
+     */
+    HqHallInfoVo queryById(Long id);
+
+    /**
+     * 分页查询报告厅信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 报告厅信息分页列表
+     */
+    TableDataInfo<HqHallInfoVo> queryPageList(HqHallInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的报告厅信息列表
+     *
+     * @param bo 查询条件
+     * @return 报告厅信息列表
+     */
+    List<HqHallInfoVo> queryList(HqHallInfoBo bo);
+
+    /**
+     * 新增报告厅信息
+     *
+     * @param bo 报告厅信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqHallInfoBo bo);
+
+    /**
+     * 修改报告厅信息
+     *
+     * @param bo 报告厅信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqHallInfoBo bo);
+
+    /**
+     * 校验并批量删除报告厅信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallReservationService.java

@@ -0,0 +1,77 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqHallReservationVo;
+import org.dromara.zhxy.domain.bo.HqHallReservationBo;
+import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 报告厅预约Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+public interface IHqHallReservationService {
+
+    /**
+     * 查询报告厅预约
+     *
+     * @param id 主键
+     * @return 报告厅预约
+     */
+    HqHallReservationVo queryById(Long id);
+
+    /**
+     * 分页查询报告厅预约列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 报告厅预约分页列表
+     */
+    TableDataInfo<HqHallReservationVo> queryPageList(HqHallReservationBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的报告厅预约列表
+     *
+     * @param bo 查询条件
+     * @return 报告厅预约列表
+     */
+    List<HqHallReservationVo> queryList(HqHallReservationBo bo);
+
+    /**
+     * 新增报告厅预约
+     *
+     * @param bo 报告厅预约
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqHallReservationBo bo);
+
+    /**
+     * 修改报告厅预约
+     *
+     * @param bo 报告厅预约
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqHallReservationBo bo);
+
+    /**
+     * 校验并批量删除报告厅预约信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 批量审核报告厅预约
+     *
+     * @param auditBo 审核信息
+     * @return 是否审核成功
+     */
+    Boolean auditByIds(HqHallReservationAuditBo auditBo);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatCategoryService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatCategoryVo;
+import org.dromara.zhxy.domain.bo.HqSatCategoryBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 题目分类Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatCategoryService {
+
+    /**
+     * 查询题目分类
+     *
+     * @param id 主键
+     * @return 题目分类
+     */
+    HqSatCategoryVo queryById(Long id);
+
+    /**
+     * 分页查询题目分类列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 题目分类分页列表
+     */
+    TableDataInfo<HqSatCategoryVo> queryPageList(HqSatCategoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的题目分类列表
+     *
+     * @param bo 查询条件
+     * @return 题目分类列表
+     */
+    List<HqSatCategoryVo> queryList(HqSatCategoryBo bo);
+
+    /**
+     * 新增题目分类
+     *
+     * @param bo 题目分类
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatCategoryBo bo);
+
+    /**
+     * 修改题目分类
+     *
+     * @param bo 题目分类
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatCategoryBo bo);
+
+    /**
+     * 校验并批量删除题目分类信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatDetailService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatDetailVo;
+import org.dromara.zhxy.domain.bo.HqSatDetailBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 答题详情Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatDetailService {
+
+    /**
+     * 查询答题详情
+     *
+     * @param id 主键
+     * @return 答题详情
+     */
+    HqSatDetailVo queryById(Long id);
+
+    /**
+     * 分页查询答题详情列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 答题详情分页列表
+     */
+    TableDataInfo<HqSatDetailVo> queryPageList(HqSatDetailBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的答题详情列表
+     *
+     * @param bo 查询条件
+     * @return 答题详情列表
+     */
+    List<HqSatDetailVo> queryList(HqSatDetailBo bo);
+
+    /**
+     * 新增答题详情
+     *
+     * @param bo 答题详情
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatDetailBo bo);
+
+    /**
+     * 修改答题详情
+     *
+     * @param bo 答题详情
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatDetailBo bo);
+
+    /**
+     * 校验并批量删除答题详情信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatOptionService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatOptionVo;
+import org.dromara.zhxy.domain.bo.HqSatOptionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 评分选项Service接口
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+public interface IHqSatOptionService {
+
+    /**
+     * 查询评分选项
+     *
+     * @param id 主键
+     * @return 评分选项
+     */
+    HqSatOptionVo queryById(Long id);
+
+    /**
+     * 分页查询评分选项列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 评分选项分页列表
+     */
+    TableDataInfo<HqSatOptionVo> queryPageList(HqSatOptionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的评分选项列表
+     *
+     * @param bo 查询条件
+     * @return 评分选项列表
+     */
+    List<HqSatOptionVo> queryList(HqSatOptionBo bo);
+
+    /**
+     * 新增评分选项
+     *
+     * @param bo 评分选项
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatOptionBo bo);
+
+    /**
+     * 修改评分选项
+     *
+     * @param bo 评分选项
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatOptionBo bo);
+
+    /**
+     * 校验并批量删除评分选项信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatQuestionService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatQuestionVo;
+import org.dromara.zhxy.domain.bo.HqSatQuestionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 题库Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatQuestionService {
+
+    /**
+     * 查询题库
+     *
+     * @param id 主键
+     * @return 题库
+     */
+    HqSatQuestionVo queryById(Long id);
+
+    /**
+     * 分页查询题库列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 题库分页列表
+     */
+    TableDataInfo<HqSatQuestionVo> queryPageList(HqSatQuestionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的题库列表
+     *
+     * @param bo 查询条件
+     * @return 题库列表
+     */
+    List<HqSatQuestionVo> queryList(HqSatQuestionBo bo);
+
+    /**
+     * 新增题库
+     *
+     * @param bo 题库
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatQuestionBo bo);
+
+    /**
+     * 修改题库
+     *
+     * @param bo 题库
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatQuestionBo bo);
+
+    /**
+     * 校验并批量删除题库信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatRecordService.java

@@ -0,0 +1,68 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatRecordVo;
+import org.dromara.zhxy.domain.bo.HqSatRecordBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 答题记录Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatRecordService {
+
+    /**
+     * 查询答题记录
+     *
+     * @param id 主键
+     * @return 答题记录
+     */
+    HqSatRecordVo queryById(Long id);
+
+    /**
+     * 分页查询答题记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 答题记录分页列表
+     */
+    TableDataInfo<HqSatRecordVo> queryPageList(HqSatRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的答题记录列表
+     *
+     * @param bo 查询条件
+     * @return 答题记录列表
+     */
+    List<HqSatRecordVo> queryList(HqSatRecordBo bo);
+
+    /**
+     * 新增答题记录
+     *
+     * @param bo 答题记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatRecordBo bo);
+
+    /**
+     * 修改答题记录
+     *
+     * @param bo 答题记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatRecordBo bo);
+
+    /**
+     * 校验并批量删除答题记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyQuestionService.java

@@ -0,0 +1,76 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 问卷题目关联Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatSurveyQuestionService {
+
+    /**
+     * 查询问卷题目关联
+     *
+     * @param id 主键
+     * @return 问卷题目关联
+     */
+    HqSatSurveyQuestionVo queryById(Long id);
+
+    /**
+     * 分页查询问卷题目关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 问卷题目关联分页列表
+     */
+    TableDataInfo<HqSatSurveyQuestionVo> queryPageList(HqSatSurveyQuestionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的问卷题目关联列表
+     *
+     * @param bo 查询条件
+     * @return 问卷题目关联列表
+     */
+    List<HqSatSurveyQuestionVo> queryList(HqSatSurveyQuestionBo bo);
+
+    /**
+     * 新增问卷题目关联
+     *
+     * @param bo 问卷题目关联
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatSurveyQuestionBo bo);
+
+    /**
+     * 修改问卷题目关联
+     *
+     * @param bo 问卷题目关联
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatSurveyQuestionBo bo);
+
+    /**
+     * 校验并批量删除问卷题目关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取问卷关联的题目详情列表（包含题目详细信息）
+     *
+     * @param surveyId 问卷ID
+     * @return 题目详情列表
+     */
+    List<HqSatSurveyQuestionVo> getSurveyQuestionsWithDetail(Long surveyId);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyService.java

@@ -0,0 +1,102 @@
+package org.dromara.zhxy.service;
+
+import org.dromara.zhxy.domain.vo.HqSatSurveyVo;
+import org.dromara.zhxy.domain.bo.HqSatSurveyBo;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 问卷Service接口
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+public interface IHqSatSurveyService {
+
+    /**
+     * 查询问卷
+     *
+     * @param id 主键
+     * @return 问卷
+     */
+    HqSatSurveyVo queryById(Long id);
+
+    /**
+     * 分页查询问卷列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 问卷分页列表
+     */
+    TableDataInfo<HqSatSurveyVo> queryPageList(HqSatSurveyBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的问卷列表
+     *
+     * @param bo 查询条件
+     * @return 问卷列表
+     */
+    List<HqSatSurveyVo> queryList(HqSatSurveyBo bo);
+
+    /**
+     * 新增问卷
+     *
+     * @param bo 问卷
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HqSatSurveyBo bo);
+
+    /**
+     * 修改问卷
+     *
+     * @param bo 问卷
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HqSatSurveyBo bo);
+
+    /**
+     * 校验并批量删除问卷信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取问卷关联的题目列表
+     *
+     * @param surveyId 问卷ID
+     * @return 题目列表
+     */
+    List<HqSatSurveyQuestionVo> getSurveyQuestions(Long surveyId);
+
+    /**
+     * 批量更新问卷题目关联
+     *
+     * @param surveyId  问卷ID
+     * @param questions 题目列表
+     * @return 是否更新成功
+     */
+    Boolean updateSurveyQuestions(Long surveyId, List<Object> questions);
+
+    /**
+     * 发布问卷
+     *
+     * @param id 问卷ID
+     * @return 是否发布成功
+     */
+    Boolean publishSurvey(Long id);
+
+    /**
+     * 撤销发布问卷
+     *
+     * @param id 问卷ID
+     * @return 是否撤销成功
+     */
+    Boolean unpublishSurvey(Long id);
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallInfoServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqHallInfoBo;
+import org.dromara.zhxy.domain.vo.HqHallInfoVo;
+import org.dromara.zhxy.domain.HqHallInfo;
+import org.dromara.zhxy.mapper.HqHallInfoMapper;
+import org.dromara.zhxy.service.IHqHallInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 报告厅信息Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqHallInfoServiceImpl implements IHqHallInfoService {
+
+    private final HqHallInfoMapper baseMapper;
+
+    /**
+     * 查询报告厅信息
+     *
+     * @param id 主键
+     * @return 报告厅信息
+     */
+    @Override
+    public HqHallInfoVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询报告厅信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 报告厅信息分页列表
+     */
+    @Override
+    public TableDataInfo<HqHallInfoVo> queryPageList(HqHallInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqHallInfo> lqw = buildQueryWrapper(bo);
+        Page<HqHallInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的报告厅信息列表
+     *
+     * @param bo 查询条件
+     * @return 报告厅信息列表
+     */
+    @Override
+    public List<HqHallInfoVo> queryList(HqHallInfoBo bo) {
+        LambdaQueryWrapper<HqHallInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqHallInfo> buildQueryWrapper(HqHallInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqHallInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(HqHallInfo::getCreateTime);
+        lqw.like(StringUtils.isNotBlank(bo.getHallName()), HqHallInfo::getHallName, bo.getHallName());
+        lqw.eq(StringUtils.isNotBlank(bo.getHallStatus()), HqHallInfo::getHallStatus, bo.getHallStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增报告厅信息
+     *
+     * @param bo 报告厅信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqHallInfoBo bo) {
+        HqHallInfo add = MapstructUtils.convert(bo, HqHallInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改报告厅信息
+     *
+     * @param bo 报告厅信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqHallInfoBo bo) {
+        HqHallInfo update = MapstructUtils.convert(bo, HqHallInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqHallInfo entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除报告厅信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallReservationServiceImpl.java

@@ -0,0 +1,226 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqHallReservationBo;
+import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo;
+import org.dromara.zhxy.domain.vo.HqHallReservationVo;
+import org.dromara.zhxy.domain.HqHallReservation;
+import org.dromara.zhxy.mapper.HqHallReservationMapper;
+import org.dromara.zhxy.service.IHqHallReservationService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.Date;
+import org.dromara.common.satoken.utils.LoginHelper;
+
+/**
+ * 报告厅预约Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqHallReservationServiceImpl implements IHqHallReservationService {
+
+    private final HqHallReservationMapper baseMapper;
+
+    /**
+     * 查询报告厅预约
+     *
+     * @param id 主键
+     * @return 报告厅预约
+     */
+    @Override
+    public HqHallReservationVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询报告厅预约列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 报告厅预约分页列表
+     */
+    @Override
+    public TableDataInfo<HqHallReservationVo> queryPageList(HqHallReservationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqHallReservation> lqw = buildQueryWrapper(bo);
+        Page<HqHallReservationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的报告厅预约列表
+     *
+     * @param bo 查询条件
+     * @return 报告厅预约列表
+     */
+    @Override
+    public List<HqHallReservationVo> queryList(HqHallReservationBo bo) {
+        LambdaQueryWrapper<HqHallReservation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqHallReservation> buildQueryWrapper(HqHallReservationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqHallReservation> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(HqHallReservation::getCreateTime);
+
+        // 调试日志：记录查询条件
+        log.info("报告厅预约查询条件 - applicantId: {}, hallId: {}, hallName: {}, status: {}",
+                bo.getApplicantId(), bo.getHallId(), bo.getHallName(), bo.getStatus());
+        lqw.eq(bo.getHallId() != null, HqHallReservation::getHallId, bo.getHallId());
+        lqw.like(StringUtils.isNotBlank(bo.getHallName()), HqHallReservation::getHallName, bo.getHallName());
+
+        // 处理时间查询参数：优先使用字符串格式的时间参数
+        Date startTimeQuery = null;
+        Date endTimeQuery = null;
+
+        // 如果有字符串格式的时间参数，优先使用
+        if (StringUtils.isNotBlank(bo.getStartTimeStr())) {
+            startTimeQuery = parseDateTime(bo.getStartTimeStr());
+        } else if (bo.getStartTime() != null) {
+            startTimeQuery = bo.getStartTime();
+        }
+
+        if (StringUtils.isNotBlank(bo.getEndTimeStr())) {
+            endTimeQuery = parseDateTime(bo.getEndTimeStr());
+        } else if (bo.getEndTime() != null) {
+            endTimeQuery = bo.getEndTime();
+        }
+
+        // 时间范围查询逻辑：
+        // 如果用户选择了开始时间，查找预约开始时间 >= 用户选择时间的记录
+        // 这样查询出的记录的开始时间都会比用户选择的时间晚或相等（用户选择的时间比数据库中的早）
+        lqw.ge(startTimeQuery != null, HqHallReservation::getStartTime, startTimeQuery);
+
+        // 如果用户选择了结束时间，查找预约结束时间 <= 用户选择时间的记录
+        // 这样查询出的记录的结束时间都会比用户选择的时间早或相等（用户选择的时间比数据库中的晚）
+        lqw.le(endTimeQuery != null, HqHallReservation::getEndTime, endTimeQuery);
+
+        lqw.eq(bo.getApplicantId() != null, HqHallReservation::getApplicantId, bo.getApplicantId());
+        lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), HqHallReservation::getApplicantName,
+                bo.getApplicantName());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqHallReservation::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 解析日期时间字符串
+     */
+    private Date parseDateTime(String dateTimeStr) {
+        if (StringUtils.isBlank(dateTimeStr)) {
+            return null;
+        }
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return sdf.parse(dateTimeStr);
+        } catch (ParseException e) {
+            log.warn("日期格式解析失败: {}", dateTimeStr, e);
+            return null;
+        }
+    }
+
+    /**
+     * 新增报告厅预约
+     *
+     * @param bo 报告厅预约
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqHallReservationBo bo) {
+        HqHallReservation add = MapstructUtils.convert(bo, HqHallReservation.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改报告厅预约
+     *
+     * @param bo 报告厅预约
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqHallReservationBo bo) {
+        HqHallReservation update = MapstructUtils.convert(bo, HqHallReservation.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqHallReservation entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除报告厅预约信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 批量审核报告厅预约
+     *
+     * @param auditBo 审核信息
+     * @return 是否审核成功
+     */
+    @Override
+    public Boolean auditByIds(HqHallReservationAuditBo auditBo) {
+        log.info("开始审核报告厅预约，审核信息：{}", auditBo);
+
+        // 获取当前用户ID作为审核人
+        Long currentUserId = LoginHelper.getUserId();
+        String currentUserName = LoginHelper.getLoginUser().getNickname();
+        Date auditTime = new Date();
+
+        // 构建更新条件
+        List<HqHallReservation> updateList = auditBo.getIds().stream()
+                .map(id -> {
+                    HqHallReservation entity = new HqHallReservation();
+                    entity.setId(id);
+                    entity.setStatus(auditBo.getStatus());
+                    entity.setAuditBy(currentUserId);
+                    entity.setAuditName(currentUserName);
+                    entity.setAuditTime(auditTime);
+                    entity.setAuditRemark(auditBo.getAuditRemark());
+                    return entity;
+                })
+                .toList();
+
+        // 批量更新
+        boolean result = baseMapper.updateBatchById(updateList);
+
+        log.info("审核完成，审核状态：{}，影响记录数：{}", auditBo.getStatus(), updateList.size());
+
+        return result;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatCategoryServiceImpl.java

@@ -0,0 +1,137 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatCategoryBo;
+import org.dromara.zhxy.domain.vo.HqSatCategoryVo;
+import org.dromara.zhxy.domain.HqSatCategory;
+import org.dromara.zhxy.mapper.HqSatCategoryMapper;
+import org.dromara.zhxy.service.IHqSatCategoryService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 题目分类Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatCategoryServiceImpl implements IHqSatCategoryService {
+
+    private final HqSatCategoryMapper baseMapper;
+
+    /**
+     * 查询题目分类
+     *
+     * @param id 主键
+     * @return 题目分类
+     */
+    @Override
+    public HqSatCategoryVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询题目分类列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 题目分类分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatCategoryVo> queryPageList(HqSatCategoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatCategory> lqw = buildQueryWrapper(bo);
+        Page<HqSatCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的题目分类列表
+     *
+     * @param bo 查询条件
+     * @return 题目分类列表
+     */
+    @Override
+    public List<HqSatCategoryVo> queryList(HqSatCategoryBo bo) {
+        LambdaQueryWrapper<HqSatCategory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatCategory> buildQueryWrapper(HqSatCategoryBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatCategory> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatCategory::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatCategory::getDeleted, bo.getDeleted());
+        lqw.eq(StringUtils.isNotBlank(bo.getCategoryCode()), HqSatCategory::getCategoryCode, bo.getCategoryCode());
+        lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), HqSatCategory::getCategoryName, bo.getCategoryName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCategoryDesc()), HqSatCategory::getCategoryDesc, bo.getCategoryDesc());
+        lqw.eq(bo.getSortOrder() != null, HqSatCategory::getSortOrder, bo.getSortOrder());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatCategory::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增题目分类
+     *
+     * @param bo 题目分类
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatCategoryBo bo) {
+        HqSatCategory add = MapstructUtils.convert(bo, HqSatCategory.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改题目分类
+     *
+     * @param bo 题目分类
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatCategoryBo bo) {
+        HqSatCategory update = MapstructUtils.convert(bo, HqSatCategory.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatCategory entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除题目分类信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatDetailServiceImpl.java

@@ -0,0 +1,135 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatDetailBo;
+import org.dromara.zhxy.domain.vo.HqSatDetailVo;
+import org.dromara.zhxy.domain.HqSatDetail;
+import org.dromara.zhxy.mapper.HqSatDetailMapper;
+import org.dromara.zhxy.service.IHqSatDetailService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 答题详情Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatDetailServiceImpl implements IHqSatDetailService {
+
+    private final HqSatDetailMapper baseMapper;
+
+    /**
+     * 查询答题详情
+     *
+     * @param id 主键
+     * @return 答题详情
+     */
+    @Override
+    public HqSatDetailVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询答题详情列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 答题详情分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatDetailVo> queryPageList(HqSatDetailBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatDetail> lqw = buildQueryWrapper(bo);
+        Page<HqSatDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的答题详情列表
+     *
+     * @param bo 查询条件
+     * @return 答题详情列表
+     */
+    @Override
+    public List<HqSatDetailVo> queryList(HqSatDetailBo bo) {
+        LambdaQueryWrapper<HqSatDetail> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatDetail> buildQueryWrapper(HqSatDetailBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatDetail> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatDetail::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatDetail::getDeleted, bo.getDeleted());
+        lqw.eq(bo.getRecordId() != null, HqSatDetail::getRecordId, bo.getRecordId());
+        lqw.eq(bo.getQuestionId() != null, HqSatDetail::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getAnswerScore() != null, HqSatDetail::getAnswerScore, bo.getAnswerScore());
+        return lqw;
+    }
+
+    /**
+     * 新增答题详情
+     *
+     * @param bo 答题详情
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatDetailBo bo) {
+        HqSatDetail add = MapstructUtils.convert(bo, HqSatDetail.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改答题详情
+     *
+     * @param bo 答题详情
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatDetailBo bo) {
+        HqSatDetail update = MapstructUtils.convert(bo, HqSatDetail.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatDetail entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除答题详情信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatOptionServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatOptionBo;
+import org.dromara.zhxy.domain.vo.HqSatOptionVo;
+import org.dromara.zhxy.domain.HqSatOption;
+import org.dromara.zhxy.mapper.HqSatOptionMapper;
+import org.dromara.zhxy.service.IHqSatOptionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 评分选项Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatOptionServiceImpl implements IHqSatOptionService {
+
+    private final HqSatOptionMapper baseMapper;
+
+    /**
+     * 查询评分选项
+     *
+     * @param id 主键
+     * @return 评分选项
+     */
+    @Override
+    public HqSatOptionVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询评分选项列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 评分选项分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatOptionVo> queryPageList(HqSatOptionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatOption> lqw = buildQueryWrapper(bo);
+        Page<HqSatOptionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的评分选项列表
+     *
+     * @param bo 查询条件
+     * @return 评分选项列表
+     */
+    @Override
+    public List<HqSatOptionVo> queryList(HqSatOptionBo bo) {
+        LambdaQueryWrapper<HqSatOption> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatOption> buildQueryWrapper(HqSatOptionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatOption> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatOption::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatOption::getDeleted, bo.getDeleted());
+        lqw.eq(StringUtils.isNotBlank(bo.getOptionText()), HqSatOption::getOptionText, bo.getOptionText());
+        lqw.eq(bo.getOptionValue() != null, HqSatOption::getOptionValue, bo.getOptionValue());
+        lqw.eq(bo.getSortOrder() != null, HqSatOption::getSortOrder, bo.getSortOrder());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatOption::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增评分选项
+     *
+     * @param bo 评分选项
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatOptionBo bo) {
+        HqSatOption add = MapstructUtils.convert(bo, HqSatOption.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改评分选项
+     *
+     * @param bo 评分选项
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatOptionBo bo) {
+        HqSatOption update = MapstructUtils.convert(bo, HqSatOption.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatOption entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除评分选项信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatQuestionServiceImpl.java

@@ -0,0 +1,139 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatQuestionBo;
+import org.dromara.zhxy.domain.vo.HqSatQuestionVo;
+import org.dromara.zhxy.domain.HqSatQuestion;
+import org.dromara.zhxy.mapper.HqSatQuestionMapper;
+import org.dromara.zhxy.service.IHqSatQuestionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 题库Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatQuestionServiceImpl implements IHqSatQuestionService {
+
+    private final HqSatQuestionMapper baseMapper;
+
+    /**
+     * 查询题库
+     *
+     * @param id 主键
+     * @return 题库
+     */
+    @Override
+    public HqSatQuestionVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询题库列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 题库分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatQuestionVo> queryPageList(HqSatQuestionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatQuestion> lqw = buildQueryWrapper(bo);
+        Page<HqSatQuestionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的题库列表
+     *
+     * @param bo 查询条件
+     * @return 题库列表
+     */
+    @Override
+    public List<HqSatQuestionVo> queryList(HqSatQuestionBo bo) {
+        LambdaQueryWrapper<HqSatQuestion> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatQuestion> buildQueryWrapper(HqSatQuestionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatQuestion> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatQuestion::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatQuestion::getDeleted, bo.getDeleted());
+        lqw.eq(StringUtils.isNotBlank(bo.getQuestionTitle()), HqSatQuestion::getQuestionTitle, bo.getQuestionTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getQuestionContent()), HqSatQuestion::getQuestionContent, bo.getQuestionContent());
+        lqw.eq(bo.getCategoryId() != null, HqSatQuestion::getCategoryId, bo.getCategoryId());
+        lqw.eq(StringUtils.isNotBlank(bo.getQuestionType()), HqSatQuestion::getQuestionType, bo.getQuestionType());
+        lqw.eq(bo.getIsRequired() != null, HqSatQuestion::getIsRequired, bo.getIsRequired());
+        lqw.eq(bo.getSortOrder() != null, HqSatQuestion::getSortOrder, bo.getSortOrder());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatQuestion::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增题库
+     *
+     * @param bo 题库
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatQuestionBo bo) {
+        HqSatQuestion add = MapstructUtils.convert(bo, HqSatQuestion.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改题库
+     *
+     * @param bo 题库
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatQuestionBo bo) {
+        HqSatQuestion update = MapstructUtils.convert(bo, HqSatQuestion.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatQuestion entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除题库信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatRecordServiceImpl.java

@@ -0,0 +1,139 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatRecordBo;
+import org.dromara.zhxy.domain.vo.HqSatRecordVo;
+import org.dromara.zhxy.domain.HqSatRecord;
+import org.dromara.zhxy.mapper.HqSatRecordMapper;
+import org.dromara.zhxy.service.IHqSatRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 答题记录Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatRecordServiceImpl implements IHqSatRecordService {
+
+    private final HqSatRecordMapper baseMapper;
+
+    /**
+     * 查询答题记录
+     *
+     * @param id 主键
+     * @return 答题记录
+     */
+    @Override
+    public HqSatRecordVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询答题记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 答题记录分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatRecordVo> queryPageList(HqSatRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatRecord> lqw = buildQueryWrapper(bo);
+        Page<HqSatRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的答题记录列表
+     *
+     * @param bo 查询条件
+     * @return 答题记录列表
+     */
+    @Override
+    public List<HqSatRecordVo> queryList(HqSatRecordBo bo) {
+        LambdaQueryWrapper<HqSatRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatRecord> buildQueryWrapper(HqSatRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatRecord> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatRecord::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatRecord::getDeleted, bo.getDeleted());
+        lqw.eq(bo.getSurveyId() != null, HqSatRecord::getSurveyId, bo.getSurveyId());
+        lqw.eq(bo.getUserId() != null, HqSatRecord::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserType()), HqSatRecord::getUserType, bo.getUserType());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserDept()), HqSatRecord::getUserDept, bo.getUserDept());
+        lqw.eq(bo.getSubmitTime() != null, HqSatRecord::getSubmitTime, bo.getSubmitTime());
+        lqw.eq(bo.getTotalScore() != null, HqSatRecord::getTotalScore, bo.getTotalScore());
+        lqw.eq(bo.getAvgScore() != null, HqSatRecord::getAvgScore, bo.getAvgScore());
+        return lqw;
+    }
+
+    /**
+     * 新增答题记录
+     *
+     * @param bo 答题记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatRecordBo bo) {
+        HqSatRecord add = MapstructUtils.convert(bo, HqSatRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改答题记录
+     *
+     * @param bo 答题记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatRecordBo bo) {
+        HqSatRecord update = MapstructUtils.convert(bo, HqSatRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除答题记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyQuestionServiceImpl.java

@@ -0,0 +1,148 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+import org.dromara.zhxy.domain.HqSatSurveyQuestion;
+import org.dromara.zhxy.mapper.HqSatSurveyQuestionMapper;
+import org.dromara.zhxy.service.IHqSatSurveyQuestionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 问卷题目关联Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatSurveyQuestionServiceImpl implements IHqSatSurveyQuestionService {
+
+    private final HqSatSurveyQuestionMapper baseMapper;
+
+    /**
+     * 查询问卷题目关联
+     *
+     * @param id 主键
+     * @return 问卷题目关联
+     */
+    @Override
+    public HqSatSurveyQuestionVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询问卷题目关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 问卷题目关联分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatSurveyQuestionVo> queryPageList(HqSatSurveyQuestionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatSurveyQuestion> lqw = buildQueryWrapper(bo);
+        Page<HqSatSurveyQuestionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的问卷题目关联列表
+     *
+     * @param bo 查询条件
+     * @return 问卷题目关联列表
+     */
+    @Override
+    public List<HqSatSurveyQuestionVo> queryList(HqSatSurveyQuestionBo bo) {
+        LambdaQueryWrapper<HqSatSurveyQuestion> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatSurveyQuestion> buildQueryWrapper(HqSatSurveyQuestionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatSurveyQuestion> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatSurveyQuestion::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatSurveyQuestion::getDeleted, bo.getDeleted());
+        lqw.eq(bo.getSurveyId() != null, HqSatSurveyQuestion::getSurveyId, bo.getSurveyId());
+        lqw.eq(bo.getQuestionId() != null, HqSatSurveyQuestion::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getSortOrder() != null, HqSatSurveyQuestion::getSortOrder, bo.getSortOrder());
+        lqw.eq(bo.getWeight() != null, HqSatSurveyQuestion::getWeight, bo.getWeight());
+        lqw.eq(bo.getIsRequired() != null, HqSatSurveyQuestion::getIsRequired, bo.getIsRequired());
+        return lqw;
+    }
+
+    /**
+     * 新增问卷题目关联
+     *
+     * @param bo 问卷题目关联
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatSurveyQuestionBo bo) {
+        HqSatSurveyQuestion add = MapstructUtils.convert(bo, HqSatSurveyQuestion.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改问卷题目关联
+     *
+     * @param bo 问卷题目关联
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatSurveyQuestionBo bo) {
+        HqSatSurveyQuestion update = MapstructUtils.convert(bo, HqSatSurveyQuestion.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatSurveyQuestion entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除问卷题目关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 获取问卷关联的题目详情列表（包含题目详细信息）
+     *
+     * @param surveyId 问卷ID
+     * @return 题目详情列表
+     */
+    @Override
+    public List<HqSatSurveyQuestionVo> getSurveyQuestionsWithDetail(Long surveyId) {
+        return baseMapper.selectSurveyQuestionsWithDetail(surveyId);
+    }
+}

backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyServiceImpl.java

@@ -0,0 +1,274 @@
+package org.dromara.zhxy.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import cn.hutool.core.collection.CollUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.zhxy.domain.bo.HqSatSurveyBo;
+import org.dromara.zhxy.domain.vo.HqSatSurveyVo;
+import org.dromara.zhxy.domain.HqSatSurvey;
+import org.dromara.zhxy.mapper.HqSatSurveyMapper;
+import org.dromara.zhxy.service.IHqSatSurveyService;
+import org.dromara.zhxy.service.IHqSatSurveyQuestionService;
+import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo;
+import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 问卷Service业务层处理
+ *
+ * @author wuzilong
+ * @date 2025-06-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HqSatSurveyServiceImpl implements IHqSatSurveyService {
+
+    private final HqSatSurveyMapper baseMapper;
+    private final IHqSatSurveyQuestionService surveyQuestionService;
+
+    /**
+     * 查询问卷
+     *
+     * @param id 主键
+     * @return 问卷
+     */
+    @Override
+    public HqSatSurveyVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询问卷列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 问卷分页列表
+     */
+    @Override
+    public TableDataInfo<HqSatSurveyVo> queryPageList(HqSatSurveyBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HqSatSurvey> lqw = buildQueryWrapper(bo);
+        Page<HqSatSurveyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的问卷列表
+     *
+     * @param bo 查询条件
+     * @return 问卷列表
+     */
+    @Override
+    public List<HqSatSurveyVo> queryList(HqSatSurveyBo bo) {
+        LambdaQueryWrapper<HqSatSurvey> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HqSatSurvey> buildQueryWrapper(HqSatSurveyBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HqSatSurvey> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HqSatSurvey::getId);
+        lqw.eq(bo.getDeleted() != null, HqSatSurvey::getDeleted, bo.getDeleted());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurveyCode()), HqSatSurvey::getSurveyCode, bo.getSurveyCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurveyTitle()), HqSatSurvey::getSurveyTitle, bo.getSurveyTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurveyDesc()), HqSatSurvey::getSurveyDesc, bo.getSurveyDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurveyInstruction()), HqSatSurvey::getSurveyInstruction,
+                bo.getSurveyInstruction());
+        lqw.eq(StringUtils.isNotBlank(bo.getTargetGroup()), HqSatSurvey::getTargetGroup, bo.getTargetGroup());
+        lqw.eq(bo.getStartTime() != null, HqSatSurvey::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, HqSatSurvey::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getMaxSubmitTimes() != null, HqSatSurvey::getMaxSubmitTimes, bo.getMaxSubmitTimes());
+        lqw.eq(bo.getIsAnonymous() != null, HqSatSurvey::getIsAnonymous, bo.getIsAnonymous());
+        lqw.eq(bo.getIsPublished() != null, HqSatSurvey::getIsPublished, bo.getIsPublished());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatSurvey::getStatus, bo.getStatus());
+
+        // 添加目标群体IN查询（用于权限过滤）
+        lqw.in(CollUtil.isNotEmpty(bo.getTargetGroupIn()), HqSatSurvey::getTargetGroup, bo.getTargetGroupIn());
+
+        // 添加状态IN查询（用于状态过滤）
+        lqw.in(CollUtil.isNotEmpty(bo.getStatusIn()), HqSatSurvey::getStatus, bo.getStatusIn());
+
+        return lqw;
+    }
+
+    /**
+     * 新增问卷
+     *
+     * @param bo 问卷
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HqSatSurveyBo bo) {
+        HqSatSurvey add = MapstructUtils.convert(bo, HqSatSurvey.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改问卷
+     *
+     * @param bo 问卷
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HqSatSurveyBo bo) {
+        HqSatSurvey update = MapstructUtils.convert(bo, HqSatSurvey.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HqSatSurvey entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除问卷信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 获取问卷关联的题目列表
+     *
+     * @param surveyId 问卷ID
+     * @return 题目列表
+     */
+    @Override
+    public List<HqSatSurveyQuestionVo> getSurveyQuestions(Long surveyId) {
+        // 使用联表查询获取包含题目详细信息的数据
+        return surveyQuestionService.getSurveyQuestionsWithDetail(surveyId);
+    }
+
+    /**
+     * 批量更新问卷题目关联
+     *
+     * @param surveyId  问卷ID
+     * @param questions 题目列表
+     * @return 是否更新成功
+     */
+    @Override
+    public Boolean updateSurveyQuestions(Long surveyId, List<Object> questions) {
+        // 先删除现有的关联
+        HqSatSurveyQuestionBo deleteBo = new HqSatSurveyQuestionBo();
+        deleteBo.setSurveyId(surveyId);
+        List<HqSatSurveyQuestionVo> existingQuestions = surveyQuestionService.queryList(deleteBo);
+        if (!existingQuestions.isEmpty()) {
+            List<Long> existingIds = existingQuestions.stream().map(HqSatSurveyQuestionVo::getId).toList();
+            surveyQuestionService.deleteWithValidByIds(existingIds, false);
+        }
+
+        // 添加新的关联
+        for (Object questionObj : questions) {
+            if (questionObj instanceof Map<?, ?> questionMap) {
+                HqSatSurveyQuestionBo insertBo = new HqSatSurveyQuestionBo();
+                insertBo.setSurveyId(surveyId);
+                insertBo.setQuestionId(Long.valueOf(questionMap.get("questionId").toString()));
+                insertBo.setSortOrder(Long.valueOf(questionMap.get("sortOrder").toString()));
+                insertBo.setWeight(
+                        questionMap.get("weight") != null ? Long.valueOf(questionMap.get("weight").toString()) : 1L);
+                insertBo.setIsRequired(
+                        questionMap.get("isRequired") != null ? Long.valueOf(questionMap.get("isRequired").toString())
+                                : 0L);
+                surveyQuestionService.insertByBo(insertBo);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 发布问卷
+     *
+     * @param id 问卷ID
+     * @return 是否发布成功
+     */
+    @Override
+    public Boolean publishSurvey(Long id) {
+        HqSatSurvey survey = baseMapper.selectById(id);
+        if (survey == null) {
+            log.error("问卷不存在，问卷ID: {}", id);
+            return false;
+        }
+
+        // 检查问卷状态是否允许发布
+        if (!"0".equals(survey.getStatus())) {
+            log.error("只有草稿状态的问卷才能发布，当前状态: {}", survey.getStatus());
+            return false;
+        }
+
+        // 更新发布状态和问卷状态
+        HqSatSurvey updateSurvey = new HqSatSurvey();
+        updateSurvey.setId(id);
+        updateSurvey.setIsPublished(1L); // 发布状态为1
+        updateSurvey.setStatus("1"); // 问卷状态为1（进行中）
+
+        boolean result = baseMapper.updateById(updateSurvey) > 0;
+        if (result) {
+            log.info("问卷发布成功，问卷ID: {}", id);
+        } else {
+            log.error("问卷发布失败，问卷ID: {}", id);
+        }
+        return result;
+    }
+
+    /**
+     * 撤销发布问卷
+     *
+     * @param id 问卷ID
+     * @return 是否撤销成功
+     */
+    @Override
+    public Boolean unpublishSurvey(Long id) {
+        HqSatSurvey survey = baseMapper.selectById(id);
+        if (survey == null) {
+            log.error("问卷不存在，问卷ID: {}", id);
+            return false;
+        }
+
+        // 检查问卷是否已发布
+        if (survey.getIsPublished() == null || survey.getIsPublished() != 1L) {
+            log.error("问卷未发布，无法撤销发布，问卷ID: {}", id);
+            return false;
+        }
+
+        // 更新发布状态和问卷状态
+        HqSatSurvey updateSurvey = new HqSatSurvey();
+        updateSurvey.setId(id);
+        updateSurvey.setIsPublished(0L); // 发布状态为0
+        updateSurvey.setStatus("0"); // 问卷状态为0（草稿）
+
+        boolean result = baseMapper.updateById(updateSurvey) > 0;
+        if (result) {
+            log.info("问卷撤销发布成功，问卷ID: {}", id);
+        } else {
+            log.error("问卷撤销发布失败，问卷ID: {}", id);
+        }
+        return result;
+    }
+}