Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java

@@ -1,17 +1,17 @@
package com.ruoyi.system.controller.conslole;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.constant.ConfigEnum;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
import com.ruoyi.system.api.domain.dto.MgtUserIdByDept;
import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.ruoyi.system.api.domain.poji.config.DelayTask;
import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.config.*;
import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo;
import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo;
import com.ruoyi.system.domain.dto.MgtCustomConfigDto;
import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.ruoyi.system.service.config.*;
import com.ruoyi.system.service.staff.SysStaffService;
import com.ruoyi.system.service.sys.ISysUserService;
@@ -55,6 +55,9 @@

    @Resource
    private SysStaffService sysStaffService;

    @Resource
    private FileRecordService fileRecordService;


    /**
@@ -237,4 +240,42 @@
        List<SysStaff> sysStaffList = sysStaffService.listSysStaffByIds(userIdList);
        return R.ok(sysStaffList);
    }

    /**
     * @description  创建文件上传记录
     * @author  jqs
     * @date    2023/9/11 11:56
     * @param fileRecord
     * @return  R
     */
    @PostMapping("/createFileRecord")
    public R createFileRecord(@RequestBody FileRecord fileRecord)
    {
        fileRecordService.createFileRecord(fileRecord);
        return R.ok();
    }
    
    
    /**
     * 获取门店课程验证密码
     * @return
     */
    @PostMapping("/getStoreCurriculumPassword")
    public R<String> getStoreCurriculumPassword(){
        CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKeyType())
                .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey()));
        return R.ok(one.getConfigValue());
    }
    
    
    /**
     * 获取门店课程展示名称
     * @return
     */
    @PostMapping("/getStoreCurriculumName")
    public R<String> getStoreCurriculumName(){
        CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKeyType())
                .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKey()));
        return R.ok(one.getConfigValue());
    }
}