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

优化

This commit is contained in:
cjw 2024-11-13 10:17:05 +08:00
parent d5fc2381bf
commit 65cd3defa1
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-test.yml
View File

@ -30,7 +30,7 @@ spring:
# 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
dynamic: dynamic:
# 性能分析插件(有性能损耗 不建议生产环境使用) # 性能分析插件(有性能损耗 不建议生产环境使用)
p6spy: false p6spy: true
# 设置默认的数据源或者数据源组,默认值即为 master # 设置默认的数据源或者数据源组,默认值即为 master
primary: master primary: master
# 严格模式 匹配不到数据源则报错 # 严格模式 匹配不到数据源则报错

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java
View File

@ -1,6 +1,7 @@
package org.dromara.system.controller.scale; package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
@ -36,7 +37,10 @@ public class EvaluationConclusionController extends BaseController {
/** /**
* 获取量测结果列表 * 获取量测结果列表
*/ */
@SaCheckPermission("evaluation:conclusion:list") @SaCheckPermission(value = {
"intervene:conclusion:list",
"archive:conclusion:list"},
mode = SaMode.OR)
@GetMapping("/list") @GetMapping("/list")
public R<List<SysEvaluationConclusionVo>> getList(SysEvaluationConclusionBo bo) { public R<List<SysEvaluationConclusionVo>> getList(SysEvaluationConclusionBo bo) {
return R.ok(sysEvaluationConclusionService.queryList(bo)); return R.ok(sysEvaluationConclusionService.queryList(bo));

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java
View File

@ -1,6 +1,7 @@
package org.dromara.system.controller.scale; package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -53,7 +54,10 @@ public class EvaluationRecordController extends BaseController {
/** /**
* 导出量测记录列表 * 导出量测记录列表
*/ */
@SaCheckPermission("evaluation:record:export") @SaCheckPermission(value = {
"intervene:record:export",
"archive:record:export"},
mode = SaMode.OR)
@Log(title = "个人量测记录", businessType = BusinessType.EXPORT) @Log(title = "个人量测记录", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception { public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception {

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java
View File

@ -73,6 +73,7 @@ public class ReservationRefundController extends BaseController {
* @param bo * @param bo
* @return * @return
*/ */
@SaCheckPermission("reservation:refund:agree")
@Log(title = "同意退款", businessType = BusinessType.INSERT) @Log(title = "同意退款", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/agree") @PostMapping("/agree")

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java
View File

@ -74,7 +74,7 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService {
Page<SysScaleOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<SysScaleOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
List<SysScaleOrderVo> records = result.getRecords(); List<SysScaleOrderVo> records = result.getRecords();
for (SysScaleOrderVo record : records) { for (SysScaleOrderVo record : records) {
SysScale scale = sysScaleMapper.selectById(record.getId()); SysScale scale = sysScaleMapper.selectById(record.getScaleId());
record.setScaleName(scale.getScaleName()); record.setScaleName(scale.getScaleName());
} }
return TableDataInfo.build(result); return TableDataInfo.build(result);