From 735eefce57b4ece3142d4fccd35c9c3eb1dc81f4 Mon Sep 17 00:00:00 2001 From: cjw Date: Sun, 28 Apr 2024 16:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=96=87=E4=BB=B6=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=A1=E9=AA=8C=EF=BC=9B=E7=94=A8=E6=88=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=8A=B6=E6=80=81=E5=8F=A6=E5=86=99=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/controller/EvaluationRecordController.java | 3 +-- .../java/org/dromara/scale/controller/ScaleController.java | 3 +-- .../org/dromara/scale/controller/ScaleFactorController.java | 3 +-- .../scale/controller/ScaleFactorRangeController.java | 3 +-- .../dromara/scale/controller/ScaleQuestionController.java | 3 +-- .../java/org/dromara/scale/controller/WarnController.java | 6 ++---- .../org/dromara/scale/controller/web/WebController.java | 6 ++---- .../scale/service/impl/SysWarnRecordServiceImpl.java | 2 +- .../dromara/system/controller/system/SysOssController.java | 2 +- .../main/java/org/dromara/system/mapper/SysUserMapper.java | 3 +++ .../src/main/resources/mapper/system/SysUserMapper.xml | 4 ++++ 11 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java index 9ca551a..9ad7585 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java @@ -60,8 +60,7 @@ public class EvaluationRecordController extends BaseController { */ @SaCheckPermission("evaluation:record:query") @GetMapping("/{recordId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long recordId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long recordId) { return R.ok(sysEvaluationRecordService.queryById(recordId)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java index 8782936..321ab38 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java @@ -109,8 +109,7 @@ public class ScaleController extends BaseController { @SaCheckPermission("scale:info:remove") @Log(title = "心理测评量", businessType = BusinessType.DELETE) @DeleteMapping("/{scaleIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] scaleIds) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] scaleIds) { return toAjax(sysScaleService.deleteWithValidByIds(List.of(scaleIds), true)); } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java index 08cede9..6d9a6d0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java @@ -70,8 +70,7 @@ public class ScaleFactorController extends BaseController { */ @SaCheckPermission("scale:factor:query") @GetMapping("/{factorId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long factorId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long factorId) { return R.ok(sysScaleFactorService.queryById(factorId)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java index 05bb75f..6acad49 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java @@ -50,8 +50,7 @@ public class ScaleFactorRangeController extends BaseController { */ @SaCheckPermission("scale:scaleFactorRange:query") @GetMapping("/{rangeId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long rangeId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long rangeId) { return R.ok(sysScaleFactorRangeService.queryById(rangeId)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java index 860f0e0..c178bb9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java @@ -110,8 +110,7 @@ public class ScaleQuestionController extends BaseController { @SaCheckPermission("scale:question:remove") @Log(title = "量问题内容", businessType = BusinessType.DELETE) @DeleteMapping("/{questionIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] questionIds) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] questionIds) { return toAjax(sysScaleQuestionService.deleteWithValidByIds(List.of(questionIds), true)); } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java index 6c08d81..1b3e56c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java @@ -65,8 +65,7 @@ public class WarnController extends BaseController { */ @SaCheckPermission("warn:record:query") @GetMapping("/{warnId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long warnId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long warnId) { return R.ok(sysWarnRecordService.queryById(warnId)); } @@ -100,8 +99,7 @@ public class WarnController extends BaseController { @Log(title = "预警配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/config/{ids}") - public R config(@NotEmpty(message = "主键不能为空") - @PathVariable Integer[] ids) { + public R config(@NotEmpty(message = "主键不能为空") @PathVariable Integer[] ids) { return toAjax(sysWarnRecordService.updateWarnConfig(ids)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java index 84e092b..161fb67 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java @@ -46,8 +46,7 @@ public class WebController extends BaseController { * 查询量表答案选项 */ @GetMapping("/answer/{id}") - public R> queryAnswer(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + public R> queryAnswer(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(webService.queryQuestionAnswerListByScaleId(id)); } @@ -57,8 +56,7 @@ public class WebController extends BaseController { @Log(title = "量测记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/record/{id}") - public R addRecord(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + public R addRecord(@NotNull(message = "主键不能为空") @PathVariable Long id) { return toAjax(webService.newRecord(id)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java index 967a276..214efd0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java @@ -84,7 +84,7 @@ public class SysWarnRecordServiceImpl implements ISysWarnRecordService { SysUser record = new SysUser(); record.setUserId(add.getUserId()); record.setInterveneStatus(StatusEnum.IN_USE.getValue()); - userMapper.updateById(record); + userMapper.updateInterveneById(record); return baseMapper.insert(add) > 0; } else { //取最高严重等级 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index fc5b4be..9af36cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -53,7 +53,7 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:list") + //@SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 312be2d..a8113f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -114,9 +114,12 @@ public interface SysUserMapper extends BaseMapperPlus { int updateById(@Param(Constants.ENTITY) SysUser user); List selectStudentListByDeptId(Long deptId); + int updatePasswordBatchById(List list); List selectStudentListByDeptIds(String deptIds); + int updateInterveneById(@Param(Constants.ENTITY) SysUser user); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 768e334..7528d8e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -190,4 +190,8 @@ where u.user_type = 'student' and find_in_set(d.dept_id, #{deptIds}) + + + update sys_user set intervene_status = #{et.interveneStatus} where user_id = #{et.userId} +