diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java index 2443155..a174772 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java @@ -42,10 +42,16 @@ public class SysScaleFactorController extends BaseController { */ @SaCheckPermission("scale:factor:pageList") @GetMapping("/pageList") - public TableDataInfo list(SysScaleFactorBo bo, PageQuery pageQuery) { + public TableDataInfo pageList(SysScaleFactorBo bo, PageQuery pageQuery) { return sysScaleFactorService.queryPageList(bo, pageQuery); } + @GetMapping("/list") + public R> list(SysScaleFactorBo bo) { + List list = sysScaleFactorService.queryList(bo); + return R.ok(list); + } + /** * 导出测评因子列表 */ @@ -65,7 +71,7 @@ public class SysScaleFactorController extends BaseController { @SaCheckPermission("scale:factor:query") @GetMapping("/{factorId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long factorId) { + @PathVariable Long factorId) { return R.ok(sysScaleFactorService.queryById(factorId)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java index 1193a0e..9f113be 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java @@ -39,8 +39,9 @@ public class SysWarnRecordController extends BaseController { /** * 查询预警记录列表 */ - @SaCheckPermission("sacle:warn:pageList") - @GetMapping("/pageList") +// @GetMapping("/pageList") + @SaCheckPermission("scale:warn:list") + @GetMapping("/list") public TableDataInfo list(SysWarnRecordBo bo, PageQuery pageQuery) { return sysWarnRecordService.queryPageList(bo, pageQuery); } @@ -48,7 +49,7 @@ public class SysWarnRecordController extends BaseController { /** * 导出预警记录列表 */ - @SaCheckPermission("sacle:warn:export") + @SaCheckPermission("scale:warn:export") @Log(title = "预警记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysWarnRecordBo bo, HttpServletResponse response) { @@ -61,7 +62,7 @@ public class SysWarnRecordController extends BaseController { * * @param warnId 主键 */ - @SaCheckPermission("sacle:warn:query") + @SaCheckPermission("scale:warn:query") @GetMapping("/{warnId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long warnId) { @@ -71,7 +72,7 @@ public class SysWarnRecordController extends BaseController { /** * 修改预警记录 */ - @SaCheckPermission("sacle:warn:edit") + @SaCheckPermission("scale:warn:edit") @Log(title = "预警记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() 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 f9c73e9..8531bb3 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 @@ -3,7 +3,6 @@ package org.dromara.scale.controller.web; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; @@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser; - /** *

TODO

* diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java index 474d108..a674de4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.scale.service.impl; + import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -235,6 +236,8 @@ public class WebServiceImpl implements IWebService { List questionNum = questionMapByFactor.get(factorId); List questionIds = new ArrayList<>(); + + questionNum.forEach(q -> { questionIds.add(q); Long questionId = Long.parseLong(q);