Compare commits

..

No commits in common. "07d2b5657e19f82b51a3fe627b48b596d545eabe" and "229a22efafce8a73a86b81ef81088cc1db58069f" have entirely different histories.

4 changed files with 10 additions and 17 deletions

View File

@ -42,16 +42,10 @@ public class SysScaleFactorController extends BaseController {
*/ */
@SaCheckPermission("scale:factor:pageList") @SaCheckPermission("scale:factor:pageList")
@GetMapping("/pageList") @GetMapping("/pageList")
public TableDataInfo<SysScaleFactorVo> pageList(SysScaleFactorBo bo, PageQuery pageQuery) { public TableDataInfo<SysScaleFactorVo> list(SysScaleFactorBo bo, PageQuery pageQuery) {
return sysScaleFactorService.queryPageList(bo, pageQuery); return sysScaleFactorService.queryPageList(bo, pageQuery);
} }
@GetMapping("/list")
public R<List<SysScaleFactorVo>> list(SysScaleFactorBo bo) {
List<SysScaleFactorVo> list = sysScaleFactorService.queryList(bo);
return R.ok(list);
}
/** /**
* 导出测评因子列表 * 导出测评因子列表
*/ */
@ -71,7 +65,7 @@ public class SysScaleFactorController extends BaseController {
@SaCheckPermission("scale:factor:query") @SaCheckPermission("scale:factor:query")
@GetMapping("/{factorId}") @GetMapping("/{factorId}")
public R<SysScaleFactorVo> getInfo(@NotNull(message = "主键不能为空") public R<SysScaleFactorVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long factorId) { @PathVariable Long factorId) {
return R.ok(sysScaleFactorService.queryById(factorId)); return R.ok(sysScaleFactorService.queryById(factorId));
} }

View File

@ -39,9 +39,8 @@ public class SysWarnRecordController extends BaseController {
/** /**
* 查询预警记录列表 * 查询预警记录列表
*/ */
// @GetMapping("/pageList") @SaCheckPermission("sacle:warn:pageList")
@SaCheckPermission("scale:warn:list") @GetMapping("/pageList")
@GetMapping("/list")
public TableDataInfo<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) { public TableDataInfo<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) {
return sysWarnRecordService.queryPageList(bo, pageQuery); return sysWarnRecordService.queryPageList(bo, pageQuery);
} }
@ -49,7 +48,7 @@ public class SysWarnRecordController extends BaseController {
/** /**
* 导出预警记录列表 * 导出预警记录列表
*/ */
@SaCheckPermission("scale:warn:export") @SaCheckPermission("sacle:warn:export")
@Log(title = "预警记录", businessType = BusinessType.EXPORT) @Log(title = "预警记录", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(SysWarnRecordBo bo, HttpServletResponse response) { public void export(SysWarnRecordBo bo, HttpServletResponse response) {
@ -62,7 +61,7 @@ public class SysWarnRecordController extends BaseController {
* *
* @param warnId 主键 * @param warnId 主键
*/ */
@SaCheckPermission("scale:warn:query") @SaCheckPermission("sacle:warn:query")
@GetMapping("/{warnId}") @GetMapping("/{warnId}")
public R<SysWarnRecordVo> getInfo(@NotNull(message = "主键不能为空") public R<SysWarnRecordVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long warnId) { @PathVariable Long warnId) {
@ -72,7 +71,7 @@ public class SysWarnRecordController extends BaseController {
/** /**
* 修改预警记录 * 修改预警记录
*/ */
@SaCheckPermission("scale:warn:edit") @SaCheckPermission("sacle:warn:edit")
@Log(title = "预警记录", businessType = BusinessType.UPDATE) @Log(title = "预警记录", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()

View File

@ -3,6 +3,7 @@ package org.dromara.scale.controller.web;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; 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.core.validate.AddGroup;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser;
/** /**
* <p>TODO<p> * <p>TODO<p>
* *

View File

@ -1,6 +1,5 @@
package org.dromara.scale.service.impl; package org.dromara.scale.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -236,8 +235,6 @@ public class WebServiceImpl implements IWebService {
List<String> questionNum = questionMapByFactor.get(factorId); List<String> questionNum = questionMapByFactor.get(factorId);
List<String> questionIds = new ArrayList<>(); List<String> questionIds = new ArrayList<>();
questionNum.forEach(q -> { questionNum.forEach(q -> {
questionIds.add(q); questionIds.add(q);
Long questionId = Long.parseLong(q); Long questionId = Long.parseLong(q);