diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchivesController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchivesController.java new file mode 100644 index 0000000..d6e2c5a --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchivesController.java @@ -0,0 +1,37 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysUserService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *
TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/4/26 15:38
+ */
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/scale/archives")
+public class ArchivesController {
+
+ private final ISysUserService userService;
+
+ /**
+ * 获取用户列表
+ */
+ @SaCheckPermission("scale:archives:list")
+ @GetMapping("/pageList")
+ public TableDataInfo 档案
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/4/26 15:51
+ */
+public class ArchivesVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+ private String deptName;
+
+ /**
+ * 用户性别(0男 1女 2未知)
+ */
+ private String sex;
+
+ /**
+ * 手机号码
+ */
+ private String phonenumber;
+
+ private String remark;
+
+
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchivesMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchivesMapper.java
new file mode 100644
index 0000000..764d78b
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchivesMapper.java
@@ -0,0 +1,8 @@
+package org.dromara.scale.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ArchivesMapper {
+
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchivesService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchivesService.java
new file mode 100644
index 0000000..2e6db44
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchivesService.java
@@ -0,0 +1,4 @@
+package org.dromara.scale.service;
+
+public interface IArchivesService {
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchivesServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchivesServiceImpl.java
new file mode 100644
index 0000000..dc2a4e9
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchivesServiceImpl.java
@@ -0,0 +1,13 @@
+package org.dromara.scale.service.impl;
+
+import org.dromara.scale.service.IArchivesService;
+
+/**
+ * TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/4/26 15:46
+ */
+public class ArchivesServiceImpl implements IArchivesService {
+}
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 9560725..312be2d 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
@@ -87,8 +87,6 @@ public interface SysUserMapper extends BaseMapperPlus> getList(SysEvaluationConclusionBo bo) {
return R.ok(sysEvaluationConclusionService.queryList(bo));
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java
similarity index 97%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java
index 3813f9e..9ca551a 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java
@@ -29,7 +29,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/evaluation/record")
-public class SysEvaluationRecordController extends BaseController {
+public class EvaluationRecordController extends BaseController {
private final ISysEvaluationRecordService sysEvaluationRecordService;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java
similarity index 97%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java
index e429ee3..a38585e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java
@@ -30,7 +30,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/intervene")
-public class SysInterveneRecordController extends BaseController {
+public class InterveneRecordController extends BaseController {
private final ISysInterveneRecordService sysInterveneRecordService;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
similarity index 98%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
index 914ece8..8782936 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
@@ -33,7 +33,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/info")
-public class SysScaleController extends BaseController {
+public class ScaleController extends BaseController {
private final ISysScaleService sysScaleService;
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/ScaleFactorController.java
similarity index 98%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java
index 9188d5d..08cede9 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/ScaleFactorController.java
@@ -33,7 +33,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/factor")
-public class SysScaleFactorController extends BaseController {
+public class ScaleFactorController extends BaseController {
private final ISysScaleFactorService sysScaleFactorService;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java
similarity index 96%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java
index 8cd3d09..05bb75f 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java
@@ -27,7 +27,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/scaleFactorRange")
-public class SysScaleFactorRangeController extends BaseController {
+public class ScaleFactorRangeController extends BaseController {
private final ISysScaleFactorRangeService sysScaleFactorRangeService;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
similarity index 97%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
index 6862dd7..b225e45 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
@@ -33,7 +33,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/publish")
-public class SysScalePublishController extends BaseController {
+public class ScalePublishController extends BaseController {
private final ISysScalePublishService sysScalePublishService;
@@ -49,7 +49,7 @@ public class SysScalePublishController extends BaseController {
/**
* 获取量测进度
*/
- @SaCheckPermission("evaluation:record:query")
+ @SaCheckPermission("publish:evaluation:pageList")
@GetMapping("/evaluation/pageList")
public TableDataInfo