权限控制

ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java

@@ -43,7 +43,7 @@ public class HitRegInfoController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(HitRegInfo hitRegInfo)
     {
-        startPage();
+
         List<HitRegInfo> list = hitRegInfoService.selectHitRegInfoList(hitRegInfo);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java

@@ -34,7 +34,6 @@ public class HitRegistrationTeachInfoController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(HitRegistrationTeachInfo hitRegistrationTeachInfo)
     {
-        startPage();
 
         List<HitRegistrationTeachInfo> list = hitRegistrationTeachInfoService.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo);
         return getDataTable(list);

ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -88,9 +89,10 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
         //当前教师的学校
         LoginUser loginUser = SecurityUtils.getLoginUser();
         HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId());
-        if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)){
+        if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)&&hitRegistrationTeachInfo.getStatus().equals("1")){
             hitCompetitionStudentInfo.setSchoolName(hitRegistrationTeachInfo.getSchoolName());
         }
+        PageUtils.startPage();
         return hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoList(hitCompetitionStudentInfo);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.HitRegistrationTeachInfo;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         if (teacherInfo != null && teacherInfo.getType().equals("1")) {
             hitRegInfo.setSchoolName(teacherInfo.getSchoolName());
         }
+        PageUtils.startPage();
         List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo);
         for (HitRegInfo regInfo : hitRegInfos) {
             HitRegInfoUser hitRegInfoUser =new HitRegInfoUser();

ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java

@@ -16,10 +16,7 @@ import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.user.CaptchaException;
 import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.*;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.framework.web.service.SysRegisterService;
@@ -93,6 +90,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac
         if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)){
             hitRegistrationTeachInfo.setSchoolName(hitRegistrationTeachInfo1.getSchoolName());
         }
+        PageUtils.startPage();
         return hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo);
     }
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+                url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
-                url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+                #             url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
-#                username: obrhgd
+                username: obrhgd
-                username: root
+               # username: root
-#                password: Obr7890&*()
+                password: Obr7890&*()
-                password: 123456
+               # password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8081
   servlet:
     # 应用的访问路径
     context-path: /hgdWebsite
@@ -74,7 +74,7 @@ spring:
     # 数据库索引
     database: 9
     # 密码
-    password: 123456
+    password: Obr1234!@#$
 #    password:
     # 连接超时时间
     timeout: 10s

ruoyi-admin/src/main/resources/config/ueditor/config.json

@@ -7,7 +7,7 @@
   "imageCompressEnable": true, /* 是否压缩图片,默认是true */
   "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
   "imageInsertAlign": "none", /* 插入的图片浮动方式 */
-  "imageUrlPrefix": "http://192.168.31.25:8080", /* 图片访问路径前缀 */
+  "imageUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 图片访问路径前缀 */
   "imagePathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
   /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
   /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -43,27 +43,27 @@
   "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
   "videoFieldName": "upfile", /* 提交的视频表单名称 */
   "videoPathFormat": "video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-  "videoUrlPrefix": "http://192.168.31.25:8080", /* 视频访问路径前缀 */
+  "videoUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 视频访问路径前缀 */
   "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
   "videoAllowFiles": [        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
   /* 上传文件配置 */
   "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
   "fileFieldName": "upfile", /* 提交的文件表单名称 */
   "filePathFormat": "file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-  "fileUrlPrefix": "http://192.168.31.25:8080", /* 文件访问路径前缀 */
+  "fileUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 文件访问路径前缀 */
   "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
   "fileAllowFiles": [        ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"    ], /* 上传文件格式显示 */
   /* 列出指定目录下的图片 */
   "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
   "imageManagerListPath": "image/", /* 指定要列出图片的目录 */
   "imageManagerListSize": 20, /* 每次列出文件数量 */
-  "imageManagerUrlPrefix": "http://192.168.31.25:8080", /* 图片访问路径前缀 */
+  "imageManagerUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 图片访问路径前缀 */
   "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
   "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
   /* 列出指定目录下的文件 */
   "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
   "fileManagerListPath": "file/", /* 指定要列出文件的目录 */
-  "fileManagerUrlPrefix": "http://192.168.31.25:8080", /* 文件访问路径前缀 */
+  "fileManagerUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 文件访问路径前缀 */
   "fileManagerListSize": 20, /* 每次列出文件数量 */
   "fileManagerAllowFiles": [        ".png", ".jpg", ".jpeg", ".gif", ".bmp",        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"    ] /* 列出的文件类型 */
 }

ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml

@@ -43,8 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="year != null  and year != ''"> and create_time like concat(#{year},'%') </if>
+            <if test="division != null  and division != ''"> and division = #{division}</if>
         </where>
-        order by create_time desc
+        order by teacher_school, create_time desc
     </select>
 
     <select id="selectHitRegistrationTeachInfoById" parameterType="Long" resultMap="HitRegistrationTeachInfoResult">
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo">
         select * from hit_registration_teach_info
         where user_id = #{userId} and YEAR(create_time) = YEAR(CURRENT_DATE)
+
     </select>
 
     <insert id="insertHitRegistrationTeachInfo" parameterType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo">

ruoyi-admin/target/classes/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+                url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
-                url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+                #             url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
-#                username: obrhgd
+                username: obrhgd
-                username: root
+               # username: root
-#                password: Obr7890&*()
+                password: Obr7890&*()
-                password: 123456
+               # password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -45,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -119,25 +119,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
@@ -201,28 +201,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id = #{userId}
+ 		delete from sys_user  where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
+		delete from sys_user where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
-</mapper> 
+</mapper>

ruoyi-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://122.51.230.86:8001'
+VUE_APP_BASE_API = 'https://meevexp.oberyun.com/hgdWebsite'

ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue

@@ -47,11 +47,11 @@
           v-hasPermi="['hit:hitRegistrationStudentInfo:export']"
         >导出</el-button>
       </el-col>-->
-      <el-col :span="1.5"   v-hasPermi="['hit:open']">
+<!--      <el-col :span="1.5"   v-hasPermi="['hit:open']">-->
-        <el-switch v-model="registerStatus" @change="updateRegisterStatus" active-value="1" inactive-value="0"
+<!--        <el-switch v-model="registerStatus" @change="updateRegisterStatus" active-value="1" inactive-value="0"-->
-          active-text="开启报名" inactive-text="关闭报名" >
+<!--          active-text="开启报名" inactive-text="关闭报名" >-->
-        </el-switch>
+<!--        </el-switch>-->
-      </el-col>
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/hit/teacherInfo/index.vue

@@ -9,6 +9,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="赛区" prop="division">
+        <el-select v-model="queryParams.division" filterable allow-create default-first-option
+                   placeholder="请选择赛区">
+          <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type"
+                   placeholder="请选择类型">
+          <el-option key="0" label="指导老师"
+                     value="0">
+          </el-option>
+          <el-option key="1" label="领队老师"
+                     value="1">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学校名称" prop="schoolName">
+        <el-input
+          v-model="queryParams.schoolName"
+          placeholder="请输入学校名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="手机号" prop="teacherNumber">
         <el-input
           v-model="queryParams.teacherNumber"
@@ -131,6 +158,7 @@ import { listHitRegistrationTeachInfo, getHitRegistrationTeachInfo, delHitRegist
 
 export default {
   name: "HitRegistrationTeachInfo",
+  dicts: ["com_region"],
   data() {
     return {
       // 遮罩层