From da2688abd2d1bf596473efa63494a83b27e1d793 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 26 Apr 2024 17:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/controller/ArchivesController.java  | 37 ++++++++++++++
 ...va => EvaluationConclusionController.java} |  4 +-
 ...r.java => EvaluationRecordController.java} |  2 +-
 ...er.java => InterveneRecordController.java} |  2 +-
 ...leController.java => ScaleController.java} |  2 +-
 ...roller.java => ScaleFactorController.java} |  2 +-
 ...r.java => ScaleFactorRangeController.java} |  2 +-
 ...oller.java => ScalePublishController.java} |  4 +-
 ...ller.java => ScaleQuestionController.java} |  2 +-
 ...arnController.java => WarnController.java} |  4 +-
 .../dromara/scale/domain/vo/ArchivesVo.java   | 48 +++++++++++++++++++
 .../dromara/scale/mapper/ArchivesMapper.java  |  8 ++++
 .../scale/service/IArchivesService.java       |  4 ++
 .../service/impl/ArchivesServiceImpl.java     | 13 +++++
 .../dromara/system/mapper/SysUserMapper.java  |  6 +--
 .../service/impl/SysUserServiceImpl.java      |  4 +-
 .../resources/mapper/system/SysUserMapper.xml |  4 +-
 17 files changed, 129 insertions(+), 19 deletions(-)
 create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchivesController.java
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysEvaluationConclusionController.java => EvaluationConclusionController.java} (93%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysEvaluationRecordController.java => EvaluationRecordController.java} (97%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysInterveneRecordController.java => InterveneRecordController.java} (97%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysScaleController.java => ScaleController.java} (98%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysScaleFactorController.java => ScaleFactorController.java} (98%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysScaleFactorRangeController.java => ScaleFactorRangeController.java} (96%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysScalePublishController.java => ScalePublishController.java} (97%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysScaleQuestionController.java => ScaleQuestionController.java} (98%)
 rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/{SysWarnController.java => WarnController.java} (97%)
 create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchivesVo.java
 create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchivesMapper.java
 create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchivesService.java
 create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchivesServiceImpl.java

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;
+
+/**
+ * <p>TODO<p>
+ *
+ * @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<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectPageUserList(user, pageQuery);
+    }
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java
similarity index 93%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java
index 63121bf..219d73b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java
@@ -29,14 +29,14 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/scale/evaluation/conclusion")
-public class SysEvaluationConclusionController extends BaseController {
+public class EvaluationConclusionController extends BaseController {
 
     private final ISysEvaluationConclusionService sysEvaluationConclusionService;
 
     /**
      * 获取量测结果列表
      */
-    @SaCheckPermission("evaluation:conclusion:query")
+    @SaCheckPermission("evaluation:conclusion:list")
     @GetMapping("/list")
     public R<List<SysEvaluationConclusionVo>> 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<EvaluationVo> getEvaluationList(BaseQueryBo query, PageQuery pageQuery) {
         return sysScalePublishService.getEvaluationList(query, pageQuery);
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java
similarity index 98%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java
index b06451b..860f0e0 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java
@@ -33,7 +33,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/scale/question")
-public class SysScaleQuestionController extends BaseController {
+public class ScaleQuestionController extends BaseController {
 
     private final ISysScaleQuestionService sysScaleQuestionService;
 
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java
similarity index 97%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnController.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java
index 29ab5b3..6c08d81 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java
@@ -34,14 +34,14 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/scale/warn")
-public class SysWarnController extends BaseController {
+public class WarnController extends BaseController {
 
     private final ISysWarnRecordService sysWarnRecordService;
 
     /**
      * 查询预警记录列表
      */
-    @SaCheckPermission("warn:record:list")
+    @SaCheckPermission("warn:record:pageList")
     @GetMapping("/pageList")
     public TableDataInfo<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) {
         return sysWarnRecordService.queryPageList(bo, pageQuery);
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchivesVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchivesVo.java
new file mode 100644
index 0000000..54698f3
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchivesVo.java
@@ -0,0 +1,48 @@
+package org.dromara.scale.domain.vo;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * <p>档案<p>
+ *
+ * @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;
+
+/**
+ * <p>TODO<p>
+ *
+ * @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<SysUser, SysUserVo> {
      */
     SysUserVo selectUserByEmail(String email);
 
-    List<SysUserVo> selectUserListByDeptId(Long deptId);
-
     /**
      * 通过用户ID查询用户
      *
@@ -115,10 +113,10 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
     })
     int updateById(@Param(Constants.ENTITY) SysUser user);
 
-
+    List<SysUserVo> selectStudentListByDeptId(Long deptId);
     int updatePasswordBatchById(List<SysUserVo> list);
 
-
     List<SysUser> selectStudentListByDeptIds(String deptIds);
 
+
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 8743441..28d6a0d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -62,6 +63,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
+        user.setUserType(UserType.STUDENT.getUserType());
         Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
         return TableDataInfo.build(page);
     }
@@ -550,7 +552,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public List<SysUserPassWordExportVo> selectUserpassWordListByDept(Long deptId) {
-        List<SysUserVo> sysUserVos = baseMapper.selectUserListByDeptId(deptId);
+        List<SysUserVo> sysUserVos = baseMapper.selectStudentListByDeptId(deptId);
         List<SysUserPassWordExportVo> exportList = new ArrayList<>();
         for (SysUserVo sysUserVo : sysUserVos) {
             String password = PasswordGenerator.generateDefaultPassword();
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 343a380..768e334 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -169,10 +169,11 @@
           and u.user_id = #{userId}
     </select>
 
-    <select id="selectUserListByDeptId" parameterType="Long" resultMap="SysUserResult">
+    <select id="selectStudentListByDeptId" parameterType="Long" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.del_flag = '0'
           and u.dept_id = #{deptId}
+          and user_type = 'student'
     </select>
 
     <update id="updatePasswordBatchById" parameterType="java.util.List">
@@ -182,7 +183,6 @@
             WHERE user_id = #{item.userId}
         </foreach>
     </update>
-
     <select id="selectStudentListByDeptIds" resultType="org.dromara.system.domain.SysUser">
         select u.*
         from sys_dept d