roleIds);
+
+}
diff --git a/src/main/java/com/msdw/tms/dao/SysRolePermissionMapper.java b/src/main/java/com/msdw/tms/dao/SysRolePermissionMapper.java
new file mode 100644
index 0000000..7cce2f8
--- /dev/null
+++ b/src/main/java/com/msdw/tms/dao/SysRolePermissionMapper.java
@@ -0,0 +1,31 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 角色权限中间表 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysRolePermissionMapper extends BaseMapper {
+
+ int uniqueRoleName(String name);
+
+ boolean addHrmsRolePermission(@Param("rolePermissionList") List rolePermissionList);
+
+ boolean deleteHrmsRolePermission(@Param("roleIds") List roleIds);
+
+ boolean deleteHrmsRolePermissionSingle(Long roleId);
+
+ List queryPermissionArrById(Long roleId);
+}
diff --git a/src/main/java/com/msdw/tms/dao/SysUserRoleMapper.java b/src/main/java/com/msdw/tms/dao/SysUserRoleMapper.java
new file mode 100644
index 0000000..b37ac13
--- /dev/null
+++ b/src/main/java/com/msdw/tms/dao/SysUserRoleMapper.java
@@ -0,0 +1,22 @@
+package com.msdw.tms.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.msdw.tms.entity.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 用户角色中间表 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper {
+
+ int queryCountByRoleId(@Param("roleIds") List roleIds);
+}
diff --git a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java b/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java
index c6f3795..78033be 100644
--- a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java
+++ b/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java
@@ -45,6 +45,8 @@ public class ExperimentalTeachingEntity {
private Integer isCode;
//绑定用户Id
private Integer userId;
+ //绑定系统Id
+ private Integer systemId;
//创建时间
private String creationTime;
//实验倒计时
diff --git a/src/main/java/com/msdw/tms/entity/SysPermission.java b/src/main/java/com/msdw/tms/entity/SysPermission.java
new file mode 100644
index 0000000..cb3851e
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/SysPermission.java
@@ -0,0 +1,100 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 菜单权限表
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_permission")
+public class SysPermission implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 权限标识符
+ */
+ private String code;
+
+ /**
+ * 名称
+ */
+ private String name;
+
+ /**
+ * 父权限id
+ */
+ private Long parentId;
+
+ /**
+ * 层级
+ */
+ private Integer level;
+
+ /**
+ * 是否是菜单：1、是，0、不是（0目前为按钮）
+ */
+ private Integer menuOrNot;
+
+ /**
+ * 状态：0、启用，1、禁用
+ */
+ private Integer status;
+
+ /**
+ * 路径
+ */
+ private String url;
+
+ /**
+ * 页面路径
+ */
+ private String menuUrl;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 图标
+ */
+ private String icon;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date motifyTime;
+
+ /**
+ * 子权限
+ */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
+ private List children;
+}
diff --git a/src/main/java/com/msdw/tms/entity/SysRole.java b/src/main/java/com/msdw/tms/entity/SysRole.java
new file mode 100644
index 0000000..6a6ffac
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/SysRole.java
@@ -0,0 +1,60 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 用户角色表
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_role")
+public class SysRole implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 角色名称
+ */
+ private String name;
+
+ /**
+ * 角色描述
+ */
+ private String description;
+
+ /**
+ * 是否删除：0、未删除，1、删除
+ */
+ private Integer delOrNot;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date motifyTime;
+
+ /**
+ * 编码
+ */
+ private String code;
+}
diff --git a/src/main/java/com/msdw/tms/entity/SysRolePermission.java b/src/main/java/com/msdw/tms/entity/SysRolePermission.java
new file mode 100644
index 0000000..b4add0e
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/SysRolePermission.java
@@ -0,0 +1,39 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 角色权限中间表
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_role_permission")
+public class SysRolePermission implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 角色id
+ */
+ private Long roleId;
+
+ /**
+ * 权限id
+ */
+ private Long permissionId;
+}
diff --git a/src/main/java/com/msdw/tms/entity/SysUserRole.java b/src/main/java/com/msdw/tms/entity/SysUserRole.java
new file mode 100644
index 0000000..aa886f5
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/SysUserRole.java
@@ -0,0 +1,39 @@
+package com.msdw.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 用户角色中间表
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Data
+@TableName("sys_user_role")
+public class SysUserRole implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 角色id
+ */
+ private Long roleId;
+}
diff --git a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java b/src/main/java/com/msdw/tms/entity/UserInfoEntity.java
index 7a2b646..a0f2a63 100644
--- a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java
+++ b/src/main/java/com/msdw/tms/entity/UserInfoEntity.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
+import javax.validation.constraints.Pattern;
+
@Accessors(chain = true)
@Data
@TableName("hr_user_info")
@@ -15,6 +17,7 @@ public class UserInfoEntity {
//用户姓名
private String userName;
//用户账号
+ @Pattern(regexp = "/^[1-9]([0-9]{1,5})?$/", message = "账号只能为数字！")
private String account;
//用户密码
private String password;
@@ -60,4 +63,6 @@ public class UserInfoEntity {
private Integer schoolAppellationId;
//token
private String token;
+ //最后登录时间
+ private String lastLoginTime;
}
diff --git a/src/main/java/com/msdw/tms/entity/request/RolePermissionRequest.java b/src/main/java/com/msdw/tms/entity/request/RolePermissionRequest.java
new file mode 100644
index 0000000..9354095
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/request/RolePermissionRequest.java
@@ -0,0 +1,83 @@
+package com.msdw.tms.entity.request;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 记录菜单权限
+ *
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-07 17:12:14
+ */
+@Data
+public class RolePermissionRequest implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色id
+ */
+ private Long roleId;
+
+ /**
+ * 角色ids
+ */
+ private Long[] roleIds;
+ /**
+ * 角色名称
+ */
+ private String name;
+
+ /**
+ * 角色描述
+ */
+ private String description;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date motifyTime;
+
+ /**
+ * 权限ids
+ */
+ @NotEmpty(message = "权限至少选中一项！")
+ private Long[] permissionIds;
+
+ private Long permissionId;
+
+ /**
+ * 拥有权限名称
+ */
+ private String permissionName;
+
+ /**
+ * 父级id
+ */
+ private Long parentId;
+
+ /**
+ * 子权限
+ */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
+ private List children;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+}
diff --git a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
new file mode 100644
index 0000000..5155336
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
@@ -0,0 +1,89 @@
+package com.msdw.tms.entity.resp;
+
+import lombok.Data;
+
+/**
+ * @ProjectName: tms
+ * @Package: com.msdw.tms.entity.resp
+ * @ClassName: GetByUserRecordResp
+ * @Description: java类作用描述
+ * @Author: Maureen.Rong
+ * @CreateDate: 2021/2/25 15:26
+ * @UpdateDate: 2021/2/25 15:26
+ * @Version: 1.0
+ */
+
+public class GetByUserRecordResp {
+ private String projectName;
+ private Integer recordId;
+ private Integer score;
+ private Integer codeId;
+ private String startingTime;
+ private String submitTime;
+ private Integer timeSum;
+ private Integer userId;
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public Integer getRecordId() {
+ return recordId;
+ }
+
+ public void setRecordId(Integer recordId) {
+ this.recordId = recordId;
+ }
+
+ public Integer getScore() {
+ return score;
+ }
+
+ public void setScore(Integer score) {
+ this.score = score;
+ }
+
+ public Integer getCodeId() {
+ return codeId;
+ }
+
+ public void setCodeId(Integer codeId) {
+ this.codeId = codeId;
+ }
+
+ public String getStartingTime() {
+ return startingTime;
+ }
+
+ public void setStartingTime(String startingTime) {
+ this.startingTime = startingTime;
+ }
+
+ public String getSubmitTime() {
+ return submitTime;
+ }
+
+ public void setSubmitTime(String submitTime) {
+ this.submitTime = submitTime;
+ }
+
+ public Integer getTimeSum() {
+ return timeSum;
+ }
+
+ public void setTimeSum(Integer timeSum) {
+ this.timeSum = timeSum;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+}
diff --git a/src/main/java/com/msdw/tms/entity/response/CommonCode.java b/src/main/java/com/msdw/tms/entity/response/CommonCode.java
index d3374b6..c8aa3ce 100644
--- a/src/main/java/com/msdw/tms/entity/response/CommonCode.java
+++ b/src/main/java/com/msdw/tms/entity/response/CommonCode.java
@@ -18,6 +18,9 @@ public enum CommonCode implements ResultCode {
REPEAT_INEXCEL(false, 10010, "试题在excel表中重复！"),
EVALUATION_QUESTION_NUM_INVALID(false, 10011, "当前测评题数设置为0，请先设置测评题数！"),
FAIL(false, 11111, "操作失败！"),
+
+ ROLE_NAME_EXIST(false,20001,"该角色名称已存在，请重新输入！"),
+ ROLE_EMP_EXIST(false,44001,"该角色有用户关联，不能删除！"),
SERVER_ERROR(false, 99999, "抱歉，系统繁忙，请稍后重试！");
//操作是否成功
boolean success;
diff --git a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java
index c05f8ed..2b2464b 100644
--- a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java
+++ b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java
@@ -1,22 +1,46 @@
package com.msdw.tms.entity.response;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
+/**
+ * @Author: gongsj.
+ * @Description: 统一返回的结果集。
+ * @Date:Created in 2020/09/07 12:28.
+ * @Modified By:
+ */
@Data
@ToString
@NoArgsConstructor
-public class ResponseResult implements Response {
+@AllArgsConstructor
+public class ResponseResult {
+ /**
+ * 操作是否成功
+ */
+ private boolean success;
- //操作是否成功
- boolean success = SUCCESS;
+ /**
+ * 状态码
+ */
+ private int code;
- //操作代码
- int code = SUCCESS_CODE;
+ /**
+ * 返回的数据
+ */
+ private T data;
- //提示信息
- String message;
+ /**
+ * 提示信息
+ */
+ private String message;
+
+ public ResponseResult(boolean success, int code, String message) {
+ this.success = success;
+ this.code = code;
+ this.message = message;
+ }
public ResponseResult(ResultCode resultCode) {
this.success = resultCode.success();
@@ -28,8 +52,24 @@ public class ResponseResult implements Response {
return new ResponseResult(CommonCode.SUCCESS);
}
+ public static ResponseResult SUCCESS(Object t) {
+ return new ResponseResult<>(true, 10000, t, "操作成功!");
+ }
+
+ public static ResponseResult FAIL(Object t) {
+ return new ResponseResult<>(false, 99999, t, "操作失败,请检查客户名称是否已存在或者文件和数据格式是否正确!");
+ }
+
+ public ResponseResult SUCCESS_DATA(T t) {
+ return new ResponseResult<>(false, 20000, t, "操作失败!");
+ }
+
public static ResponseResult FAIL() {
return new ResponseResult(CommonCode.FAIL);
}
+ public static ResponseResult FAIL(int code, String message) {
+ return new ResponseResult<>(false, code, null, message);
+ }
+
}
diff --git a/src/main/java/com/msdw/tms/entity/response/RolePermissionResponse.java b/src/main/java/com/msdw/tms/entity/response/RolePermissionResponse.java
new file mode 100644
index 0000000..e3c9748
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/response/RolePermissionResponse.java
@@ -0,0 +1,80 @@
+package com.msdw.tms.entity.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 记录菜单权限
+ *
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-07 17:12:14
+ */
+@Data
+@TableName("hrms_permission")
+public class RolePermissionResponse implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色id
+ */
+ @ApiModelProperty("id")
+ private Long roleId;
+ /**
+ * 角色名称
+ */
+ @ApiModelProperty("名称")
+ private String name;
+
+ /**
+ * 角色描述
+ */
+ @ApiModelProperty("角色描述")
+ private String description;
+
+ /**
+ * 权限id
+ */
+ @ApiModelProperty("权限id")
+ private Long permissionId;
+
+ /**
+ * 拥有权限名称
+ */
+ @ApiModelProperty("权限名称")
+ private String permissionName;
+
+ /**
+ * 父级id
+ */
+ @ApiModelProperty("父级id")
+ private Long parentId;
+
+ /**
+ * 子权限
+ */
+ @ApiModelProperty("子权限")
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
+ private List children;
+
+ /**
+ * 排序
+ */
+ @ApiModelProperty("子权限")
+ private Integer sort;
+
+ /**
+ * 权限标识
+ */
+ private String code;
+
+ private boolean disabled=true;
+
+}
diff --git a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java b/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java
index 270246f..b3370c1 100644
--- a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java
+++ b/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java
@@ -18,4 +18,6 @@ public class ExperimentalTeachingVO {
private Integer status;
//学校id
private Integer schoolId;
+ //绑定系统Id
+ private Integer systemId;
}
diff --git a/src/main/java/com/msdw/tms/service/ISysPermissionService.java b/src/main/java/com/msdw/tms/service/ISysPermissionService.java
new file mode 100644
index 0000000..eae3794
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/ISysPermissionService.java
@@ -0,0 +1,45 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.entity.SysPermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.entity.request.RolePermissionRequest;
+
+import java.util.List;
+
+/**
+ *
+ * 菜单权限表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysPermissionService extends IService {
+
+ List listWithTree();
+
+ int uniqueRoleName(String name);
+
+ int addHrmsRole(RolePermissionRequest rolePermission);
+
+ boolean addHrmsRolePermission(List rolePermissionList);
+
+ int updateHrmsRole(RolePermissionRequest rolePermission);
+
+ boolean deleteHrmsRolePermission(Long roleId);
+
+ boolean deleteHrmsRolePermission(Long[] roleIds);
+
+ int queryCountByRoleId(Long[] roleIds);
+
+ boolean deleteHrmsRoleByRoleId(Long[] roleIds);
+
+ List queryPermissionArrById(Long roleId);
+
+ SysRole queryRoleMsg(Long roleId);
+
+ PageUtils queryPage(Integer page, Integer size, String name);
+}
diff --git a/src/main/java/com/msdw/tms/service/ISysRolePermissionService.java b/src/main/java/com/msdw/tms/service/ISysRolePermissionService.java
new file mode 100644
index 0000000..08bfc35
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/ISysRolePermissionService.java
@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysRolePermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 角色权限中间表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysRolePermissionService extends IService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/ISysRoleService.java b/src/main/java/com/msdw/tms/service/ISysRoleService.java
new file mode 100644
index 0000000..8d5af9c
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/ISysRoleService.java
@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 用户角色表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysRoleService extends IService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/ISysUserRoleService.java b/src/main/java/com/msdw/tms/service/ISysUserRoleService.java
new file mode 100644
index 0000000..dc900c5
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/ISysUserRoleService.java
@@ -0,0 +1,16 @@
+package com.msdw.tms.service;
+
+import com.msdw.tms.entity.SysUserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 用户角色中间表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+public interface ISysUserRoleService extends IService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
index 74edc2a..780ad3d 100644
--- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java
+++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
@@ -11,27 +11,25 @@ import java.util.HashMap;
import java.util.List;
/**
- *
- *
- * @author
- * @email
+ * @author
+ * @email
* @date 2020-08-19 16:07:02
*/
public interface ProjectRecordService extends IService {
- PageUtils queryPage(Integer page,Integer size,Integer userId,Integer projectPermissions);
+ PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions);
- PageUtils queryExperimentPage(Integer page,Integer size,Integer userid);
+ PageUtils queryExperimentPage(Integer page, Integer size, Integer userid);
ProjectRecordVo queryUserScore(Integer userId);
ProjectRecordVo queryScore(Integer userId);
- void exportProjectRecord(HttpServletResponse response, Integer userId)throws Exception;
+ void exportProjectRecord(HttpServletResponse response, Integer userId) throws Exception;
- void exportExperimentProjectRecord(HttpServletResponse response, Integer userId)throws Exception;
+ void exportExperimentProjectRecord(HttpServletResponse response, Integer userId) throws Exception;
- PageUtils querySchoolRecord(Integer page,Integer size,ProjectRecordVo projectRecord);
+ PageUtils querySchoolRecord(Integer page, Integer size, ProjectRecordVo projectRecord);
boolean updateUserRecord(ProjectRecordEntity projectRecord);
diff --git a/src/main/java/com/msdw/tms/service/SystemSetttingService.java b/src/main/java/com/msdw/tms/service/SystemSetttingService.java
index 6bd9838..7b0d6e6 100644
--- a/src/main/java/com/msdw/tms/service/SystemSetttingService.java
+++ b/src/main/java/com/msdw/tms/service/SystemSetttingService.java
@@ -34,4 +34,6 @@ public interface SystemSetttingService {
void downloadFiles(HttpServletResponse response) throws IOException;
R queryAccount(String account,Integer schoolId);
+
+ R resetPwd(Integer userId,String newPwd);
}
diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
index b419d62..80ced2d 100644
--- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
@Service
-public class ExperimentalReportServiceImpl extends ServiceImpl implements ExperimentalReportService {
+public class ExperimentalReportServiceImpl extends ServiceImpl implements ExperimentalReportService {
@Autowired
private ExperimentalReportDao reportDao;
@@ -23,37 +23,47 @@ public class ExperimentalReportServiceImpl extends ServiceImpl map = new HashMap<>();
- map.put("report",result);
- if(systemId==1|systemId==4|systemId==5){
+ map.put("report", result);
+ if (systemId == 1 | systemId == 4 | systemId == 5) {
List data = achievementManagementDao.queryPythonTest(recordId);
- map.put("data",data);
- return R.ok().put("data",map);
+ map.put("data", data);
+ return R.ok().put("data", map);
}
- return R.ok().put("data",map);
+ return R.ok().put("data", map);
}
+ //虚拟实验
@Override
public R queryVirtualReport(Integer recordId) {
ExperimentalReportVo result = reportDao.queryVirtualReport(recordId);
- Integer systemId =reportDao.querySystemId(recordId);
+ Integer systemId = reportDao.querySystemId(recordId);
//python实验
- if(systemId==1|systemId==4|systemId==5){
+ if (systemId == 1 | systemId == 4 | systemId == 5) {
List data = achievementManagementDao.queryPythonTest(recordId);
HashMap map = new HashMap<>();
- map.put("data",data);
- map.put("report",result);
- return R.ok().put("data",map);
+ map.put("data", data);
+ map.put("report", result);
+ return R.ok().put("data", map);
}
- return R.ok().put("data",result);
+ return R.ok().put("data", result);
}
}
diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
index 140fa2c..1265737 100644
--- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
@@ -1,31 +1,20 @@
package com.msdw.tms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.msdw.tms.common.utils.Constant;
import com.msdw.tms.common.utils.PageUtils;
-import com.msdw.tms.common.utils.Query;
import com.msdw.tms.dao.ClassTeachingDao;
import com.msdw.tms.dao.ExperimentalTeachingDao;
-import com.msdw.tms.dao.UserDao;
import com.msdw.tms.entity.ExperimentalTeachingEntity;
-import com.msdw.tms.entity.UserEntity;
-import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO;
import com.msdw.tms.entity.vo.ExperimentalTeachingVO;
import com.msdw.tms.entity.vo.ProjectRecordVo;
-import com.msdw.tms.entity.vo.UserEntityVo;
import com.msdw.tms.service.ExperimentalTeachingService;
-import com.msdw.tms.service.UserService;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Map;
-
@Service("experimentalTeachingService")
public class ExperimentalTeachingServiceImpl extends ServiceImpl implements ExperimentalTeachingService {
diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
index 020f208..8343694 100644
--- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
@@ -12,6 +12,7 @@ import com.msdw.tms.entity.ExperimentalReportEntity;
import com.msdw.tms.entity.ProjectRecordEntity;
import com.msdw.tms.entity.request.ExperimentProjectRecordImportRequest;
import com.msdw.tms.entity.request.ProjectRecordImportRequest;
+import com.msdw.tms.entity.resp.GetByUserRecordResp;
import com.msdw.tms.entity.vo.ProjectRecordExportVo;
import com.msdw.tms.entity.vo.ProjectRecordVo;
import com.msdw.tms.service.ProjectRecordService;
@@ -37,14 +38,15 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size);
- IPage projectRecordVos = this.baseMapper.getByUserRecord(page1,projectRecord,projectPermissions);
+ IPage projectRecordVos = this.baseMapper.getByUserRecord(page1, userId, projectPermissions);
PageUtils questionsPage = new PageUtils(projectRecordVos);
@@ -59,7 +61,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size);
- IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1,projectRecord);
+ IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1, projectRecord);
PageUtils questionsPage = new PageUtils(projectRecordVos);
@@ -70,9 +72,9 @@ public class ProjectRecordServiceImpl extends ServiceImpl
+ * 菜单权限表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysPermissionServiceImpl extends ServiceImpl implements ISysPermissionService {
+
+ @Resource
+ private SysRolePermissionMapper rolePermissionMapper;
+
+ @Resource
+ private SysRoleMapper roleMapper;
+
+ @Resource
+ private SysUserRoleMapper userRoleMapper;
+
+ @Override
+ public List listWithTree() {
+/* Listlist = this.getBaseMapper().queryPermissionTree();
+ return getPermissionTreeList(list,0L);*/
+ System.out.println("this.list()=================="+this.list());
+ return getPermissionTreeList(this.list(), 0L);
+ }
+
+ private List getPermissionTreeList(List list, Long parentId){
+ return list.stream()
+ .filter(item -> parentId.equals(item.getParentId()))
+ .peek(item -> item.setChildren(getPermissionTreeList(list, item.getId())))
+ .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort())))
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public int uniqueRoleName(String name) {
+ return rolePermissionMapper.uniqueRoleName(name);
+ }
+
+ @Override
+ public int addHrmsRole(RolePermissionRequest rolePermission) {
+ int request = roleMapper.addHrmsRole(rolePermission);
+ return request;
+ }
+
+ @Override
+ public boolean addHrmsRolePermission(List rolePermissionList) {
+ return rolePermissionMapper.addHrmsRolePermission(rolePermissionList);
+ }
+
+ @Override
+ public int updateHrmsRole(RolePermissionRequest rolePermission) {
+ return roleMapper.updateHrmsRole(rolePermission);
+ }
+
+ @Override
+ public boolean deleteHrmsRolePermission(Long roleId) {
+ return rolePermissionMapper.deleteHrmsRolePermissionSingle(roleId);
+ }
+
+ @Override
+ public boolean deleteHrmsRolePermission(Long[] roleIds) {
+ return rolePermissionMapper.deleteHrmsRolePermission(Arrays.asList(roleIds));
+ }
+
+ @Override
+ public int queryCountByRoleId(Long[] roleIds) {
+ int count = userRoleMapper.queryCountByRoleId(Arrays.asList(roleIds));
+ return count;
+ }
+
+ @Override
+ public boolean deleteHrmsRoleByRoleId(Long[] roleIds) {
+ return roleMapper.deleteHrmsRoleByRoleId(Arrays.asList(roleIds));
+ }
+
+ @Override
+ public List queryPermissionArrById(Long roleId) {
+ return rolePermissionMapper.queryPermissionArrById(roleId);
+ }
+
+ @Override
+ public SysRole queryRoleMsg(Long roleId) {
+ return roleMapper.selectById(roleId);
+ }
+
+ @Override
+ public PageUtils queryPage(Integer page, Integer size, String name) {
+ //分页参数
+ if (page <= 0) {
+ page = 1;
+ }
+ if (size <= 0) {
+ size = 10;
+ }
+ IPage systemLogVo = this.getBaseMapper().pageByCondition(new Page(page, size),name);
+
+ return new PageUtils(systemLogVo);
+ }
+}
diff --git a/src/main/java/com/msdw/tms/service/impl/SysRolePermissionServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SysRolePermissionServiceImpl.java
new file mode 100644
index 0000000..713fac2
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/impl/SysRolePermissionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.msdw.tms.dao.SysRolePermissionMapper;
+import com.msdw.tms.entity.SysRolePermission;
+import com.msdw.tms.service.ISysRolePermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 角色权限中间表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysRolePermissionServiceImpl extends ServiceImpl implements ISysRolePermissionService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/impl/SysRoleServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SysRoleServiceImpl.java
new file mode 100644
index 0000000..58b4856
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/impl/SysRoleServiceImpl.java
@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.msdw.tms.dao.SysRoleMapper;
+import com.msdw.tms.entity.SysRole;
+import com.msdw.tms.service.ISysRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 用户角色表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SysUserRoleServiceImpl.java
new file mode 100644
index 0000000..336895a
--- /dev/null
+++ b/src/main/java/com/msdw/tms/service/impl/SysUserRoleServiceImpl.java
@@ -0,0 +1,20 @@
+package com.msdw.tms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.msdw.tms.dao.SysUserRoleMapper;
+import com.msdw.tms.entity.SysUserRole;
+import com.msdw.tms.service.ISysUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 用户角色中间表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-02-24
+ */
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl implements ISysUserRoleService {
+
+}
diff --git a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
index 879d031..0c7db4e 100644
--- a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
@@ -2,6 +2,7 @@ package com.msdw.tms.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -497,4 +498,18 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
}
return R.ok();
}
+
+ @Override
+ @Transactional
+ public R resetPwd(Integer userId,String newPwd) {
+ UserInfoEntity user = new UserInfoEntity();
+ user.setPassword(newPwd);
+ int count = userInfoDao.update(user, new QueryWrapper().eq("userId", userId));
+ if(count > 0){
+ return R.ok();
+ }else{
+ return R.error(20002,"重置失败");
+ }
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/msdw/tms/util/MyBatisPlusCodeGenerator.java b/src/main/java/com/msdw/tms/util/MyBatisPlusCodeGenerator.java
new file mode 100644
index 0000000..e7f58ca
--- /dev/null
+++ b/src/main/java/com/msdw/tms/util/MyBatisPlusCodeGenerator.java
@@ -0,0 +1,115 @@
+package com.msdw.tms.util;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: LvFang
+ * @Date: Created in 2019/6/11.
+ * @Description:
+ */
+public class MyBatisPlusCodeGenerator {
+
+ //包名
+ public static final String PACKAGE_NAME = "com.msdw.tms";
+
+ public static void main(String[] args) {
+ String[] tables = new String[] {"sys_role","sys_role_permission","sys_user_role"};//表名数组
+ String[] tablePrefixs = new String[] {""};//去掉前缀
+ executeCode(PACKAGE_NAME,tables,tablePrefixs);
+ }
+
+ private static void executeCode(String pack, String[] tables, String[] tablePrefixs) {
+ // 代码生成器
+ AutoGenerator mpg = new AutoGenerator();
+
+ // 全局配置
+ GlobalConfig gc = new GlobalConfig();
+ // 是否覆盖已有文件
+ gc.setFileOverride(false);
+ // 生成文件的输出目录
+ String projectPath = System.getProperty("user.dir");//user.dir 表示当前工程路径无需替换
+ gc.setOutputDir(projectPath + "/src/main/java");
+ //设置bean命名规范
+ gc.setEntityName("%s");
+ // 开发人员
+ gc.setAuthor("Qyq");
+ // 是否打开输出目录
+ gc.setOpen(false);
+ // 开启 BaseResultMap
+ gc.setBaseResultMap(true);
+ // 指定生成的主键的ID类型
+ gc.setIdType(IdType.ID_WORKER);
+ // 时间类型对应策略: 只使用 java.util.date 代替
+ gc.setDateType(DateType.ONLY_DATE);
+ mpg.setGlobalConfig(gc);
+
+ // 数据源配置
+ DataSourceConfig config= new DataSourceConfig();
+ // 从试图获取
+ config.setUrl("jdbc:mysql://localhost:3306/msdw_tms?serverTimezone=UTC");
+ config.setDriverName("com.mysql.cj.jdbc.Driver");
+ config.setUsername("root");
+ config.setPassword("root");
+ mpg.setDataSource(config);
+
+ // 包配置
+ PackageConfig pc = new PackageConfig();
+ // 父包名。如果为空，将下面子包名必须写全部， 否则就只需写子包名
+ pc.setParent(pack);
+ // Entity包名
+ pc.setEntity("entity");
+ mpg.setPackageInfo(pc);
+
+ // 自定义配置
+ InjectionConfig cfg = new InjectionConfig() {
+ @Override
+ public void initMap() {
+ // to do nothing
+ }
+ };
+ List focList = new ArrayList<>();
+ focList.add(new FileOutConfig("/templates/mapper.xml.ftl") {
+ public String outputFile(TableInfo tableInfo) {
+ // 自定义输入文件名称
+ if (StringUtils.isEmpty(pc.getModuleName())) {
+ return projectPath + "/src/main/resources/mapper/tms/" + tableInfo.getXmlName() + StringPool.DOT_XML;
+ }else {
+ return projectPath + "/src/main/resources/mapper/tms/" + pc.getModuleName() + "/" + tableInfo.getXmlName() + StringPool.DOT_XML;
+ }
+ }
+ });
+ cfg.setFileOutConfigList(focList);
+ mpg.setCfg(cfg);
+ mpg.setTemplate(new TemplateConfig().setXml(null));
+
+ // 策略配置
+ StrategyConfig strategy = new StrategyConfig();
+ // 数据库表映射到实体的命名策略: 下划线转驼峰命名
+ strategy.setNaming(NamingStrategy.underline_to_camel);
+ // 数据库表字段映射到实体的命名策略: 下划线转驼峰命名
+ strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+ // 【实体】是否为lombok模型（默认 false）
+ strategy.setEntityLombokModel(false);
+ // 需要包含的表名，允许正则表达式（与exclude二选一配置）
+ strategy.setInclude(tables);
+ // 驼峰转连字符
+ strategy.setControllerMappingHyphenStyle(true);
+ // 表前缀
+ strategy.setTablePrefix(tablePrefixs);
+ mpg.setStrategy(strategy);
+ mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+ mpg.execute();
+ }
+}
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 64f16a1..8b21be1 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -2,378 +2,442 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml
index 8bb0cd6..17756c1 100644
--- a/src/main/resources/mapper/tms/ClassTeachingDao.xml
+++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml
@@ -27,7 +27,7 @@
AND (user_id in (select userId FROM staff WHERE schoolId = #{cla.schoolId} AND isdel = 0 AND FIND_IN_SET(roleId,'1,2,3') )
OR user_id IN ( SELECT userId FROM hr_user_info WHERE disableAccount = 0 AND isdel = 0 AND FIND_IN_SET( roleId, '1' ) ) )
and `status` = #{cla.status}
- and ( project_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') )
+ and ( experimental_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') )
and stop_time between #{cla.endTime} and #{cla.startTime}
and DATE_SUB(CURDATE(), INTERVAL #{cla.month} month ) <= date(creation_time)
ORDER BY creation_time DESC
diff --git a/src/main/resources/mapper/tms/ExperimentalReportDao.xml b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
index 6052511..7f087d8 100644
--- a/src/main/resources/mapper/tms/ExperimentalReportDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
@@ -1,85 +1,75 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
index 9add2b8..3891647 100644
--- a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
@@ -31,7 +31,9 @@
AND `status`=#{exp.status,jdbcType=INTEGER}
-
+
+ AND `system_id`=#{exp.systemId,jdbcType=INTEGER}
+
AND creation_time between #{exp.startTime} and #{exp.stopTime}
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index 3fa668a..5b67e32 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -14,16 +14,16 @@
-
+
-INSERT INTO tms_project_record ( userId, projectId, score, startingTime, endTime, timeSum, submitTime )
-VALUES
- (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now())
+ INSERT INTO tms_project_record (userId, projectId, score, startingTime, endTime, timeSum, submitTime)
+ VALUES (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now())
-