mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增问题与答案；确认因子对应题目

This commit is contained in:
cjw 2024-04-02 10:04:00 +08:00
parent 5642558ecb
commit daa31dd9b3
17 changed files with 280 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-modules/rouyi-scale/.gitignore vendored
View File

@ -1,38 +0,0 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

103
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java
View File

@ -1,26 +1,23 @@
package org.dromara.scale.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 jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.scale.domain.vo.SysScaleAnswerVo;
import org.dromara.scale.domain.bo.SysScaleAnswerBo;
import org.dromara.scale.service.ISysScaleAnswerService;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleAnswerBo;
import org.dromara.scale.domain.vo.SysScaleAnswerVo;
import org.dromara.scale.service.ISysScaleAnswerService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 选项信息
@ -31,7 +28,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/SysScaleAnswer")
@RequestMapping("/scale/answer")
public class SysScaleAnswerController extends BaseController {
private final ISysScaleAnswerService sysScaleAnswerService;
@ -39,7 +36,7 @@ public class SysScaleAnswerController extends BaseController {
/**
* 查询选项信息列表
*/
@SaCheckPermission("scale:SysScaleAnswer:list")
@SaCheckPermission("scale:answer:list")
@GetMapping("/list")
public TableDataInfo<SysScaleAnswerVo> list(SysScaleAnswerBo bo, PageQuery pageQuery) {
return sysScaleAnswerService.queryPageList(bo, pageQuery);
@ -48,7 +45,7 @@ public class SysScaleAnswerController extends BaseController {
/**
* 导出选项信息列表
*/
@SaCheckPermission("scale:SysScaleAnswer:export")
@SaCheckPermission("scale:answer:export")
@Log(title = "选项信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleAnswerBo bo, HttpServletResponse response) {
@ -61,45 +58,45 @@ public class SysScaleAnswerController extends BaseController {
*
* @param answerId 主键
*/
@SaCheckPermission("scale:SysScaleAnswer:query")
@SaCheckPermission("scale:answer:query")
@GetMapping("/{answerId}")
public R<SysScaleAnswerVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long answerId) {
return R.ok(sysScaleAnswerService.queryById(answerId));
}
/**
* 新增选项信息
*/
@SaCheckPermission("scale:SysScaleAnswer:add")
@Log(title = "选项信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysScaleAnswerBo bo) {
return toAjax(sysScaleAnswerService.insertByBo(bo));
}
// /**
// * 新增选项信息
// */
// @SaCheckPermission("scale:answer:add")
// @Log(title = "选项信息", businessType = BusinessType.INSERT)
// @RepeatSubmit()
// @PostMapping()
// public R<Void> add(@Validated(AddGroup.class) @RequestBody SysScaleAnswerBo bo) {
// return toAjax(sysScaleAnswerService.insertByBo(bo));
// }
/**
* 修改选项信息
*/
@SaCheckPermission("scale:SysScaleAnswer:edit")
@Log(title = "选项信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysScaleAnswerBo bo) {
return toAjax(sysScaleAnswerService.updateByBo(bo));
}
// /**
// * 修改选项信息
// */
// @SaCheckPermission("scale:answer:edit")
// @Log(title = "选项信息", businessType = BusinessType.UPDATE)
// @RepeatSubmit()
// @PutMapping()
// public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysScaleAnswerBo bo) {
// return toAjax(sysScaleAnswerService.updateByBo(bo));
// }
/**
* 删除选项信息
*
* @param answerIds 主键串
*/
@SaCheckPermission("scale:SysScaleAnswer:remove")
@Log(title = "选项信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{answerIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] answerIds) {
return toAjax(sysScaleAnswerService.deleteWithValidByIds(List.of(answerIds), true));
}
// /**
// * 删除选项信息
// *
// * @param answerIds 主键串
// */
// @SaCheckPermission("scale:answer:remove")
// @Log(title = "选项信息", businessType = BusinessType.DELETE)
// @DeleteMapping("/{answerIds}")
// public R<Void> remove(@NotEmpty(message = "主键不能为空")
// @PathVariable Long[] answerIds) {
// return toAjax(sysScaleAnswerService.deleteWithValidByIds(List.of(answerIds), true));
// }
}

49
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
View File

@ -1,26 +1,27 @@
package org.dromara.scale.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 jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.scale.domain.vo.SysScaleVo;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.service.ISysScaleService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.ISysScaleService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 心理测评量
@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/SysScale")
@RequestMapping("/scale/info")
public class SysScaleController extends BaseController {
private final ISysScaleService sysScaleService;
@ -39,7 +40,7 @@ public class SysScaleController extends BaseController {
/**
* 查询心理测评量列表
*/
@SaCheckPermission("scale:SysScale:list")
@SaCheckPermission("scale:info:list")
@GetMapping("/list")
public TableDataInfo<SysScaleVo> list(SysScaleBo bo, PageQuery pageQuery) {
return sysScaleService.queryPageList(bo, pageQuery);
@ -48,7 +49,7 @@ public class SysScaleController extends BaseController {
/**
* 导出心理测评量列表
*/
@SaCheckPermission("scale:SysScale:export")
@SaCheckPermission("scale:info:export")
@Log(title = "心理测评量", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleBo bo, HttpServletResponse response) {
@ -61,17 +62,17 @@ public class SysScaleController extends BaseController {
*
* @param scaleId 主键
*/
@SaCheckPermission("scale:SysScale:query")
@SaCheckPermission("scale:info:query")
@GetMapping("/{scaleId}")
public R<SysScaleVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long scaleId) {
public R<SysScaleVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) {
//todo
return R.ok(sysScaleService.queryById(scaleId));
}
/**
* 新增心理测评量
*/
@SaCheckPermission("scale:SysScale:add")
@SaCheckPermission("scale:info:add")
@Log(title = "心理测评量", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -82,7 +83,7 @@ public class SysScaleController extends BaseController {
/**
* 修改心理测评量
*/
@SaCheckPermission("scale:SysScale:edit")
@SaCheckPermission("scale:info:edit")
@Log(title = "心理测评量", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -95,7 +96,7 @@ public class SysScaleController extends BaseController {
*
* @param scaleIds 主键串
*/
@SaCheckPermission("scale:SysScale:remove")
@SaCheckPermission("scale:info:remove")
@Log(title = "心理测评量", businessType = BusinessType.DELETE)
@DeleteMapping("/{scaleIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

50
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
View File

@ -1,26 +1,27 @@
package org.dromara.scale.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 jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.scale.domain.vo.SysScaleFactorVo;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.scale.service.ISysScaleFactorService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import org.dromara.scale.service.ISysScaleFactorService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 测评因子
@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/SysScaleFactor")
@RequestMapping("/scale/factor")
public class SysScaleFactorController extends BaseController {
private final ISysScaleFactorService sysScaleFactorService;
@ -39,7 +40,7 @@ public class SysScaleFactorController extends BaseController {
/**
* 查询测评因子列表
*/
@SaCheckPermission("scale:SysScaleFactor:list")
@SaCheckPermission("scale:factor:list")
@GetMapping("/list")
public TableDataInfo<SysScaleFactorVo> list(SysScaleFactorBo bo, PageQuery pageQuery) {
return sysScaleFactorService.queryPageList(bo, pageQuery);
@ -48,7 +49,7 @@ public class SysScaleFactorController extends BaseController {
/**
* 导出测评因子列表
*/
@SaCheckPermission("scale:SysScaleFactor:export")
@SaCheckPermission("scale:factor:export")
@Log(title = "测评因子", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleFactorBo bo, HttpServletResponse response) {
@ -61,7 +62,7 @@ public class SysScaleFactorController extends BaseController {
*
* @param factorId 主键
*/
@SaCheckPermission("scale:SysScaleFactor:query")
@SaCheckPermission("scale:factor:query")
@GetMapping("/{factorId}")
public R<SysScaleFactorVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long factorId) {
@ -71,7 +72,7 @@ public class SysScaleFactorController extends BaseController {
/**
* 新增测评因子
*/
@SaCheckPermission("scale:SysScaleFactor:add")
@SaCheckPermission("scale:factor:add")
@Log(title = "测评因子", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -82,7 +83,7 @@ public class SysScaleFactorController extends BaseController {
/**
* 修改测评因子
*/
@SaCheckPermission("scale:SysScaleFactor:edit")
@SaCheckPermission("scale:factor:edit")
@Log(title = "测评因子", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -95,11 +96,12 @@ public class SysScaleFactorController extends BaseController {
*
* @param factorIds 主键串
*/
@SaCheckPermission("scale:SysScaleFactor:remove")
@SaCheckPermission("scale:factor:remove")
@Log(title = "测评因子", businessType = BusinessType.DELETE)
@DeleteMapping("/{factorIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] factorIds) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] factorIds) {
return toAjax(sysScaleFactorService.deleteWithValidByIds(List.of(factorIds), true));
}
}

45
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFormulaController.java
View File

@ -1,26 +1,27 @@
package org.dromara.scale.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 jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.scale.domain.vo.SysScaleFormulaVo;
import org.dromara.scale.domain.bo.SysScaleFormulaBo;
import org.dromara.scale.service.ISysScaleFormulaService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleFormulaBo;
import org.dromara.scale.domain.vo.SysScaleFormulaVo;
import org.dromara.scale.service.ISysScaleFormulaService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 测评量公式
@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/SysScaleFormula")
@RequestMapping("/scale/formula")
public class SysScaleFormulaController extends BaseController {
private final ISysScaleFormulaService sysScaleFormulaService;
@ -39,7 +40,7 @@ public class SysScaleFormulaController extends BaseController {
/**
* 查询测评量公式列表
*/
@SaCheckPermission("scale:SysScaleFormula:list")
@SaCheckPermission("scale:formula:list")
@GetMapping("/list")
public TableDataInfo<SysScaleFormulaVo> list(SysScaleFormulaBo bo, PageQuery pageQuery) {
return sysScaleFormulaService.queryPageList(bo, pageQuery);
@ -48,7 +49,7 @@ public class SysScaleFormulaController extends BaseController {
/**
* 导出测评量公式列表
*/
@SaCheckPermission("scale:SysScaleFormula:export")
@SaCheckPermission("scale:formula:export")
@Log(title = "测评量公式", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleFormulaBo bo, HttpServletResponse response) {
@ -61,7 +62,7 @@ public class SysScaleFormulaController extends BaseController {
*
* @param formulaId 主键
*/
@SaCheckPermission("scale:SysScaleFormula:query")
@SaCheckPermission("scale:formula:query")
@GetMapping("/{formulaId}")
public R<SysScaleFormulaVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long formulaId) {
@ -71,7 +72,7 @@ public class SysScaleFormulaController extends BaseController {
/**
* 新增测评量公式
*/
@SaCheckPermission("scale:SysScaleFormula:add")
@SaCheckPermission("scale:formula:add")
@Log(title = "测评量公式", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -82,7 +83,7 @@ public class SysScaleFormulaController extends BaseController {
/**
* 修改测评量公式
*/
@SaCheckPermission("scale:SysScaleFormula:edit")
@SaCheckPermission("scale:formula:edit")
@Log(title = "测评量公式", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -95,7 +96,7 @@ public class SysScaleFormulaController extends BaseController {
*
* @param formulaIds 主键串
*/
@SaCheckPermission("scale:SysScaleFormula:remove")
@SaCheckPermission("scale:formula:remove")
@Log(title = "测评量公式", businessType = BusinessType.DELETE)
@DeleteMapping("/{formulaIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

45
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
View File

@ -1,26 +1,27 @@
package org.dromara.scale.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 jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.scale.domain.vo.SysScaleQuestionVo;
import org.dromara.scale.domain.bo.SysScaleQuestionBo;
import org.dromara.scale.service.ISysScaleQuestionService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleQuestionBo;
import org.dromara.scale.domain.vo.SysScaleQuestionVo;
import org.dromara.scale.service.ISysScaleQuestionService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 量问题内容
@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/SysScaleQuestion")
@RequestMapping("/scale/question")
public class SysScaleQuestionController extends BaseController {
private final ISysScaleQuestionService sysScaleQuestionService;
@ -39,7 +40,7 @@ public class SysScaleQuestionController extends BaseController {
/**
* 查询量问题内容列表
*/
@SaCheckPermission("scale:SysScaleQuestion:list")
@SaCheckPermission("scale:question:list")
@GetMapping("/list")
public TableDataInfo<SysScaleQuestionVo> list(SysScaleQuestionBo bo, PageQuery pageQuery) {
return sysScaleQuestionService.queryPageList(bo, pageQuery);
@ -48,7 +49,7 @@ public class SysScaleQuestionController extends BaseController {
/**
* 导出量问题内容列表
*/
@SaCheckPermission("scale:SysScaleQuestion:export")
@SaCheckPermission("scale:question:export")
@Log(title = "量问题内容", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysScaleQuestionBo bo, HttpServletResponse response) {
@ -61,7 +62,7 @@ public class SysScaleQuestionController extends BaseController {
*
* @param questionId 主键
*/
@SaCheckPermission("scale:SysScaleQuestion:query")
@SaCheckPermission("scale:question:query")
@GetMapping("/{questionId}")
public R<SysScaleQuestionVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long questionId) {
@ -71,7 +72,7 @@ public class SysScaleQuestionController extends BaseController {
/**
* 新增量问题内容
*/
@SaCheckPermission("scale:SysScaleQuestion:add")
@SaCheckPermission("scale:question:add")
@Log(title = "量问题内容", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -82,7 +83,7 @@ public class SysScaleQuestionController extends BaseController {
/**
* 修改量问题内容
*/
@SaCheckPermission("scale:SysScaleQuestion:edit")
@SaCheckPermission("scale:question:edit")
@Log(title = "量问题内容", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -95,7 +96,7 @@ public class SysScaleQuestionController extends BaseController {
*
* @param questionIds 主键串
*/
@SaCheckPermission("scale:SysScaleQuestion:remove")
@SaCheckPermission("scale:question:remove")
@Log(title = "量问题内容", businessType = BusinessType.DELETE)
@DeleteMapping("/{questionIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

16
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorBo.java
View File

@ -1,13 +1,16 @@
package org.dromara.scale.domain.bo;
import org.dromara.scale.domain.SysScaleFactor;
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 jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScaleFactor;
import java.util.List;
/**
* 测评因子业务对象 sys_scale_factor
@ -51,4 +54,7 @@ public class SysScaleFactorBo extends BaseEntity {
private Long formulaId;
private List<Long> questionIds;
}

47
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleQuestionBo.java
View File

@ -1,13 +1,18 @@
package org.dromara.scale.domain.bo;
import org.dromara.scale.domain.SysScaleQuestion;
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 jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScaleAnswer;
import org.dromara.scale.domain.SysScaleQuestion;
import java.util.List;
/**
* 量问题内容业务对象 sys_scale_question
@ -23,44 +28,50 @@ public class SysScaleQuestionBo extends BaseEntity {
/**
* 测评问题id
*/
@NotNull(message = "测评问题id不能为空", groups = { EditGroup.class })
@NotNull(message = "测评问题id不能为空", groups = {EditGroup.class})
private Long questionId;
/**
* 所属测评量表id
*/
@NotNull(message = "所属测评量表id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "所属测评量表id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long scaleId;
/**
* 测评量表标题
*/
@NotBlank(message = "测评量表标题不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "测评量表标题不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleTitle;
/**
* 问题序号
*/
@NotNull(message = "问题序号不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "问题序号不能为空", groups = {AddGroup.class, EditGroup.class})
private Long questionOrder;
/**
* 问题内容
*/
@NotBlank(message = "问题内容不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "问题内容不能为空", groups = {AddGroup.class, EditGroup.class})
private String questionContent;
/**
* 所属因子维度
*/
@NotNull(message = "所属因子维度不能为空", groups = { AddGroup.class, EditGroup.class })
private Long factorId;
// /**
// * 所属因子维度
// */
// @NotNull(message = "所属因子维度不能为空", groups = { AddGroup.class, EditGroup.class })
// private Long factorId;
//
// /**
// * 因子名称
// */
// @NotBlank(message = "因子名称不能为空", groups = { AddGroup.class, EditGroup.class })
// private String factorName;
/**
* 因子名称
* 问题答案列表
*/
@NotBlank(message = "因子名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String factorName;
@NotEmpty(message = "问题答案不能为空", groups = {AddGroup.class, EditGroup.class})
private List<SysScaleAnswer> scaleAnswerList;
}

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleAnswerMapper.java
View File

@ -4,6 +4,8 @@ import org.dromara.scale.domain.SysScaleAnswer;
import org.dromara.scale.domain.vo.SysScaleAnswerVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 选项信息Mapper接口
*
@ -11,5 +13,13 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @date 2024-03-29
*/
public interface SysScaleAnswerMapper extends BaseMapperPlus<SysScaleAnswer, SysScaleAnswerVo> {
int batchInsert(List<SysScaleAnswer> scaleAnswerList);
/**
* 通过测评量表问题信息主键删除问题选项信息信息
*
* @param questionId 测评量表问题信息ID
* @return 结果
*/
int deleteScaleAnswerByQuestionId(Long questionId);
}

5
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleQuestionMapper.java
View File

@ -1,9 +1,12 @@
package org.dromara.scale.mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.scale.domain.SysScaleQuestion;
import org.dromara.scale.domain.vo.SysScaleQuestionVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 量问题内容Mapper接口
*
@ -12,4 +15,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/
public interface SysScaleQuestionMapper extends BaseMapperPlus<SysScaleQuestion, SysScaleQuestionVo> {
int cleanFactorIdByFactorId(Long factorId);
int updateFactorIdByIds(@Param("factorId") Long factorId, @Param("ids") List<Long> ids);
}

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java
View File

@ -1,10 +1,9 @@
package org.dromara.scale.service;
import org.dromara.scale.domain.SysScaleAnswer;
import org.dromara.scale.domain.vo.SysScaleAnswerVo;
import org.dromara.scale.domain.bo.SysScaleAnswerBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.bo.SysScaleAnswerBo;
import org.dromara.scale.domain.vo.SysScaleAnswerVo;
import java.util.Collection;
import java.util.List;
@ -46,4 +45,5 @@ public interface ISysScaleAnswerService {
* 校验并批量删除选项信息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

9
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorService.java
View File

@ -1,10 +1,9 @@
package org.dromara.scale.service;
import org.dromara.scale.domain.SysScaleFactor;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import java.util.Collection;
import java.util.List;
@ -46,4 +45,6 @@ public interface ISysScaleFactorService {
* 校验并批量删除测评因子信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
int updateSelectQuestion(SysScaleFactorBo bo);
}

1
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java
View File

@ -111,4 +111,5 @@ public class SysScaleAnswerServiceImpl implements ISysScaleAnswerService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

21
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java
View File

@ -12,6 +12,7 @@ import org.dromara.scale.domain.SysScale;
import org.dromara.scale.domain.SysScaleFormula;
import org.dromara.scale.mapper.SysScaleFormulaMapper;
import org.dromara.scale.mapper.SysScaleMapper;
import org.dromara.scale.mapper.SysScaleQuestionMapper;
import org.springframework.stereotype.Service;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
@ -34,8 +35,9 @@ import java.util.Collection;
public class SysScaleFactorServiceImpl implements ISysScaleFactorService {
private final SysScaleFactorMapper baseMapper;
private final SysScaleMapper sysScaleMapper;
private final SysScaleFormulaMapper sysScaleFormulaMapper;
private final SysScaleMapper scaleMapper;
private final SysScaleFormulaMapper scaleFormulaMapper;
private final SysScaleQuestionMapper scaleQuestionMapper;
/**
* 查询测评因子
@ -53,10 +55,10 @@ public class SysScaleFactorServiceImpl implements ISysScaleFactorService {
LambdaQueryWrapper<SysScaleFactor> lqw = buildQueryWrapper(bo);
Page<SysScaleFactorVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
for (SysScaleFactorVo record : result.getRecords()) {
SysScale sysScale = sysScaleMapper.selectById(record.getScaleId());
SysScale sysScale = scaleMapper.selectById(record.getScaleId());
record.setScaleTitle(sysScale.getScaleTitle());
SysScaleFormula sysScaleFormula = sysScaleFormulaMapper.selectById(record.getFormulaId());
SysScaleFormula sysScaleFormula = scaleFormulaMapper.selectById(record.getFormulaId());
record.setFormulaName(sysScaleFormula.getFormulaName());
}
return TableDataInfo.build(result);
@ -122,4 +124,15 @@ public class SysScaleFactorServiceImpl implements ISysScaleFactorService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public int updateSelectQuestion(SysScaleFactorBo bo) {
Long factorId = bo.getFactorId();
List<Long> questionIds = bo.getQuestionIds();
int i = scaleQuestionMapper.cleanFactorIdByFactorId(factorId);
if (questionIds != null && questionIds.size() > 0) {
i = scaleQuestionMapper.updateFactorIdByIds(factorId, questionIds);
}
return i;
}
}

33
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java
View File

@ -1,23 +1,24 @@
package org.dromara.scale.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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.SysScaleQuestion;
import org.dromara.scale.domain.bo.SysScaleQuestionBo;
import org.dromara.scale.domain.vo.SysScaleQuestionVo;
import org.dromara.scale.domain.SysScaleQuestion;
import org.dromara.scale.mapper.SysScaleAnswerMapper;
import org.dromara.scale.mapper.SysScaleQuestionMapper;
import org.dromara.scale.service.ISysScaleQuestionService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 量问题内容Service业务层处理
@ -31,11 +32,13 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
private final SysScaleQuestionMapper baseMapper;
private final SysScaleAnswerMapper scaleAnswerMapper;
/**
* 查询量问题内容
*/
@Override
public SysScaleQuestionVo queryById(Long questionId){
public SysScaleQuestionVo queryById(Long questionId) {
return baseMapper.selectVoById(questionId);
}
@ -65,8 +68,8 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
lqw.eq(StringUtils.isNotBlank(bo.getScaleTitle()), SysScaleQuestion::getScaleTitle, bo.getScaleTitle());
lqw.eq(bo.getQuestionOrder() != null, SysScaleQuestion::getQuestionOrder, bo.getQuestionOrder());
lqw.eq(StringUtils.isNotBlank(bo.getQuestionContent()), SysScaleQuestion::getQuestionContent, bo.getQuestionContent());
lqw.eq(bo.getFactorId() != null, SysScaleQuestion::getFactorId, bo.getFactorId());
lqw.like(StringUtils.isNotBlank(bo.getFactorName()), SysScaleQuestion::getFactorName, bo.getFactorName());
// lqw.eq(bo.getFactorId() != null, SysScaleQuestion::getFactorId, bo.getFactorId());
// lqw.like(StringUtils.isNotBlank(bo.getFactorName()), SysScaleQuestion::getFactorName, bo.getFactorName());
return lqw;
}
@ -76,11 +79,13 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
@Override
public Boolean insertByBo(SysScaleQuestionBo bo) {
SysScaleQuestion add = MapstructUtils.convert(bo, SysScaleQuestion.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setQuestionId(add.getQuestionId());
}
scaleAnswerMapper.batchInsert(bo.getScaleAnswerList());
return flag;
}
@ -91,13 +96,15 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
public Boolean updateByBo(SysScaleQuestionBo bo) {
SysScaleQuestion update = MapstructUtils.convert(bo, SysScaleQuestion.class);
validEntityBeforeSave(update);
scaleAnswerMapper.deleteScaleAnswerByQuestionId(update.getQuestionId());
scaleAnswerMapper.batchInsert(bo.getScaleAnswerList());
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysScaleQuestion entity){
private void validEntityBeforeSave(SysScaleQuestion entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -106,7 +113,7 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

18
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleAnswerMapper.xml
View File

@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.scale.mapper.SysScaleAnswerMapper">
<insert id="batchInsert">
insert into sys_scale_answer(answer_id, question_id, question_content, scale_id, answer_option, score,
create_dept, create_time, create_by, update_time, update_by, factor_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.answerId}, #{item.questionId}, #{item.questionContent}, #{item.scaleId}, #{item.answerOption},
#{item.score}, #{item.createDept}, #{item.createTime}, #{item.createBy}, #{item.updateTime},
#{item.updateBy}, #{item.factorId})
</foreach>
</insert>
<delete id="deleteScaleAnswerByQuestionId">
delete
from sys_scale_answer
where question_id = #{questionId}
</delete>
</mapper>

17
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleQuestionMapper.xml
View File

@ -1,7 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.scale.mapper.SysScaleQuestionMapper">
<select id="cleanFactorIdByFactorId" resultType="int">
update sys_scale_question
set factor_id = null
where factor_id = #{factorId}
</select>
<update id="updateFactorIdByIds">
update sys_scale_question
set factor_id = #{factorId} where question_id in
<foreach item="id" collection="ids" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>