From 6b2910d9c13425ec86f677e805467316d4e80758 Mon Sep 17 00:00:00 2001 From: jiangzhe <244140623@qq.com> Date: Wed, 17 Apr 2024 09:02:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/service/impl/WebServiceImpl.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) 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 984ba1a..cd6fe26 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.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -228,24 +229,26 @@ 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); - List answerNum = answerMapByQuestion.get(questionId); - if (!ArrayUtil.isEmpty(answerNum)) { - //找出分数最大的选项 - BigDecimal s = answerNum.stream() - .max(Comparator.comparing(SysScaleAnswerVo::getScore)).get().getScore(); - totalSocre.updateAndGet(v -> v.add(s)); - SysEvaluationAnswerBo evaluationAnswer = answerList.stream() - .filter(answer -> questionId.equals(answer.getQuestionId())).findFirst().orElse(null); - if (evaluationAnswer != null) { - answerNum.stream().filter(o -> o.getAnswerId().equals(evaluationAnswer.getAnswerId())).findFirst() - .ifPresent( - m -> evalConclusion.setScore(m.getScore().add(evalConclusion.getScore()))); + if (CollUtil.isNotEmpty(questionNum)) { + questionNum.forEach(q -> { + questionIds.add(q); + Long questionId = Long.parseLong(q); + List answerNum = answerMapByQuestion.get(questionId); + if (!ArrayUtil.isEmpty(answerNum)) { + //找出分数最大的选项 + BigDecimal s = answerNum.stream() + .max(Comparator.comparing(SysScaleAnswerVo::getScore)).get().getScore(); + totalSocre.updateAndGet(v -> v.add(s)); + SysEvaluationAnswerBo evaluationAnswer = answerList.stream() + .filter(answer -> questionId.equals(answer.getQuestionId())).findFirst().orElse(null); + if (evaluationAnswer != null) { + answerNum.stream().filter(o -> o.getAnswerId().equals(evaluationAnswer.getAnswerId())).findFirst() + .ifPresent( + m -> evalConclusion.setScore(m.getScore().add(evalConclusion.getScore()))); + } } - } - }); + }); + } scaleFactor.setQuestionIds(questionIds); //计算得分率 if (totalSocre.get().compareTo(BigDecimal.ZERO) > 0) { From 4b77fc747ededdb2a7ac35dc488518c6efdc757c Mon Sep 17 00:00:00 2001 From: jiangzhe <244140623@qq.com> Date: Wed, 17 Apr 2024 15:49:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/controller/SysWarnRecordController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 f51e7cd..f120586 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 @@ -30,7 +30,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/sacle/warn") +@RequestMapping("/scale/warn") public class SysWarnRecordController extends BaseController { private final ISysWarnRecordService sysWarnRecordService; @@ -38,7 +38,7 @@ public class SysWarnRecordController extends BaseController { /** * 查询预警记录列表 */ - @SaCheckPermission("sacle:warn:list") + @SaCheckPermission("scale:warn:list") @GetMapping("/list") public TableDataInfo list(SysWarnRecordBo bo, PageQuery pageQuery) { return sysWarnRecordService.queryPageList(bo, pageQuery); @@ -47,7 +47,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) { @@ -60,7 +60,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) { @@ -70,7 +70,7 @@ public class SysWarnRecordController extends BaseController { /** * 修改预警记录 */ - @SaCheckPermission("sacle:warn:edit") + @SaCheckPermission("scale:warn:edit") @Log(title = "预警记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() From 44c7c3aa2e53f86d7c8dddad8d0610f428652c70 Mon Sep 17 00:00:00 2001 From: jiangzhe <244140623@qq.com> Date: Thu, 18 Apr 2024 09:46:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/scale/controller/SysWarnRecordController.java | 3 +-- .../java/org/dromara/scale/service/impl/WebServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 5051a71..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,7 @@ 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) { 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 135ac00..2b01934 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 @@ -134,7 +134,7 @@ public class WebServiceImpl implements IWebService { add.setUserId(loginUser.getUserId()); add.setDeptId(loginUser.getDeptId()); add.setCreateTime(new Date()); - validEntityBeforeSave(add); +// validEntityBeforeSave(add); boolean flag = recordMapper.insert(add) > 0; if (flag) { bo.setRecordId(add.getRecordId()); From 801a6a0a460124eea9a5e9921c2c0c090468d981 Mon Sep 17 00:00:00 2001 From: jiangzhe <244140623@qq.com> Date: Thu, 18 Apr 2024 10:36:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9list=E5=92=8CpageList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/controller/SysScaleFactorController.java | 10 ++++++++-- .../dromara/scale/controller/web/WebController.java | 3 --- 2 files changed, 8 insertions(+), 5 deletions(-) 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/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

*