*/
+
@Data
@NoArgsConstructor
@AllArgsConstructor
diff --git a/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java b/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java
index 433dd35..f2d119f 100755
--- a/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java
+++ b/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java
@@ -19,10 +19,12 @@ import java.sql.Timestamp;
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
public class PermissionDO {
+ // 主键
private Long id;
- private Long pid;
+ // 权限名称
private String name;
- private String code;
- private Short type;
- private Timestamp deletedAt;
+ // 权限描述
+ private String description;
+ // 创建时间
+ private Timestamp createdAt;
}
diff --git a/src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectChildDO.java
old mode 100755
new mode 100644
similarity index 70%
rename from src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java
rename to src/main/java/com/jsl/oa/model/dodata/ProjectChildDO.java
index b79a8f7..2be895e
--- a/src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java
+++ b/src/main/java/com/jsl/oa/model/dodata/ProjectChildDO.java
@@ -18,19 +18,17 @@ import java.sql.Timestamp;
@Data
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ProjectCuttingDO {
+public class ProjectChildDO {
private Long id;
private Long principalId;
private Long projectId;
- private Long pid;
- private Long workLoad;
- private Long cycle;
+ private Integer workLoad;
+ private Integer cycle;
private String name;
private String description;
- private Integer is_delete;
- private Integer is_finish;
- private Integer status;
- private boolean type;
- private Timestamp beginTime;
+ private Integer isDelete;
+ private String files;
+ private Timestamp createdAt;
private Timestamp completeTime;
+ private Timestamp updatedAt;
}
diff --git a/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java
index 172ab0d..b83fd08 100755
--- a/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java
+++ b/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java
@@ -1,16 +1,15 @@
package com.jsl.oa.model.dodata;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import lombok.experimental.Accessors;
+import java.sql.Date;
import java.sql.Timestamp;
/**
* project 数据表
*
- * 映射 oa_project 数据表内容进入自定义实体类
+ * 映射 oa_project 数据表内容进入自定义实体类, 该实体类用于存储数据表中的数据。
*
* @author 筱锋xiao_lfeng
* @since v1.1.0
@@ -18,25 +17,99 @@ import java.sql.Timestamp;
*/
@Data
@Accessors(chain = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
public class ProjectDO {
+ /**
+ * 主键
+ *
+ * 主键，自增
+ */
private Long id;
- private Long principalId;
- private String tags;
- private Long cycle;
+ /**
+ * 项目名称
+ *
+ * 项目名称，最长 255 字符
+ */
private String name;
- private String file;
+ /**
+ * 项目负责人
+ *
+ * 项目负责人，关联 user 表
+ */
+ private Long principalId;
+ /**
+ * 项目描述
+ *
+ * 项目描述，需要存储 json 数据
+ */
private String description;
- private Integer isDelete;
- private Integer isFinish;
- private Long workLoad;
- private Integer status;
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
- private Timestamp beginTime;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
- private Timestamp completeTime;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
- private Timestamp deadline;
+ /**
+ * 项目标签
+ *
+ * 项目标签，需要存储 json 数据（项目类型：web，大数据等）
+ */
+ private String tags;
+ /**
+ * 项目周期
+ *
+ * 项目周期，单位：天
+ */
+ private Integer cycle;
+ /**
+ * 项目工作量
+ *
+ * 项目工作量，单位：人天
+ */
+ private Integer workLoad;
+ /**
+ * 项目文件
+ *
+ * 项目文件，需要存储 json 数据（文件名：UUID 生成值）。对于 JSON 内部只需要存储 UUID 信息以及加上文件尾缀即可。
+ *
+ * 例如：[UUID].pdf, [UUID].png, [UUID].docx
+ */
+ private String files;
+ /**
+ * 项目开始时间
+ *
+ * 项目开始时间, 格式：yyyy-MM-dd
+ */
+ private Date beginTime;
+ /**
+ * 项目完成时间
+ *
+ * 项目完成时间, 格式：yyyy-MM-dd
+ */
+ private Date completeTime;
+ /**
+ * 项目截止时间
+ *
+ * 项目截止时间, 格式：yyyy-MM-dd
+ *
+ * 项目截止时间为最终的截止时间，即甲方要求的最终结束周期
+ */
+ private Date deadline;
+ /**
+ * 项目状态
+ *
+ * 项目状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）
+ */
+ private String status;
+ /**
+ * 创建时间
+ *
+ * 创建时间，格式：1234567890123
+ */
+ private Timestamp createdAt;
+ /**
+ * 更新时间
+ *
+ * 更新时间，格式：1234567890123
+ */
+ private Timestamp updatedAt;
+ /**
+ * 是否删除
+ *
+ * 是否删除（0: 否，1: 是）
+ */
+ private Boolean isDelete;
}
diff --git a/src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectModuleDO.java
similarity index 67%
rename from src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java
rename to src/main/java/com/jsl/oa/model/dodata/ProjectModuleDO.java
index b707532..d42f39f 100644
--- a/src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java
+++ b/src/main/java/com/jsl/oa/model/dodata/ProjectModuleDO.java
@@ -9,19 +9,15 @@ import java.sql.Timestamp;
@Data
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ProjectWorkDO {
+public class ProjectModuleDO {
private Long id;
- private Long pid;
- private Long projectId;
+ private Long projectChildId;
private Long principalId;
- private Integer cycle;
private Integer workLoad;
- private Integer type;
- private String name;
private String description;
+ private String name;
private Integer isDelete;
- private Integer isFinish;
- private boolean status;
- private Timestamp beginTime;
+ private Timestamp createdAt;
+ private Timestamp updatedAt;
private Timestamp completeTime;
}
diff --git a/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java b/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java
new file mode 100644
index 0000000..2280e81
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java
@@ -0,0 +1,52 @@
+package com.jsl.oa.model.dodata;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * oa_review 数据表
+ *
+ * 映射 oa_permission 数据表内容进入自定义实体类
+ *
+ * @author 筱锋xiao_lfeng
+ * @since v1.1.0
+ * @version v1.1.0
+ */
+@Data
+@Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ReviewDO {
+ //主键
+ private Long id;
+ //申请名称
+ private String name;
+ //申请理由
+ private String content;
+ //申请者用户id
+ private Long senderId;
+ //审核者用户id
+ private Long recipientId;
+ //审核类别（0：子系统；1：子模块）
+ private Short category;
+ //申请的项目id
+ private Long projectId;
+ //申请的子系统id
+ private Long projectChildId;
+ //申请的子模块id
+ private Long projectModuleId;
+ //申请时间
+ private Date applicationTime;
+ //审核时间
+ private Date reviewTime;
+ //审核结果（0：未通过；1：通过；2：未审批）
+ private Short reviewResult;
+ //是否删除（0：未删除；1：已删除）
+ private String isDelete;
+
+}
+
+
diff --git a/src/main/java/com/jsl/oa/model/dodata/RoleDO.java b/src/main/java/com/jsl/oa/model/dodata/RoleDO.java
index 0d752d9..fc4a67f 100755
--- a/src/main/java/com/jsl/oa/model/dodata/RoleDO.java
+++ b/src/main/java/com/jsl/oa/model/dodata/RoleDO.java
@@ -12,14 +12,21 @@ import java.sql.Timestamp;
*
* @author 筱锋xiao_lfeng
* @since v1.1.0
- * @version v1.1.0
+ * @version v1.2.0
*/
@Data
@Accessors(chain = true)
public class RoleDO {
+ // 角色id
private Long id;
+ // 角色名称
private String roleName;
+ // 中文描述
private String displayName;
+ // 用户组权限
+ private String permissions;
+ // 创建时间
private Timestamp createdAt;
+ // 修改时间
private Timestamp updatedAt;
}
diff --git a/src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java b/src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java
deleted file mode 100755
index f3376fb..0000000
--- a/src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jsl.oa.model.dodata;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.sql.Timestamp;
-
-/**
- * role 数据表
- *
- * 映射 oa_role 数据表内容进入自定义实体类
- *
- * @author 筱锋xiao_lfeng
- * @since v1.1.0
- * @version v1.1.0
- */
-@Data
-@Accessors(chain = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class RolePermissionDO {
- private Long rid;
- private Long pid;
- private Timestamp createdAt;
-}
diff --git a/src/main/java/com/jsl/oa/model/vodata/MessageAddVO.java b/src/main/java/com/jsl/oa/model/vodata/MessageAddVO.java
new file mode 100644
index 0000000..8229db4
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/MessageAddVO.java
@@ -0,0 +1,18 @@
+package com.jsl.oa.model.vodata;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MessageAddVO {
+ private String text;
+ private String title;
+ private Long uid;
+ private Long sid;
+ private String type;
+ private Long toId;
+
+}
diff --git a/src/main/java/com/jsl/oa/model/vodata/MessageGetVO.java b/src/main/java/com/jsl/oa/model/vodata/MessageGetVO.java
new file mode 100644
index 0000000..c54ffb8
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/MessageGetVO.java
@@ -0,0 +1,20 @@
+package com.jsl.oa.model.vodata;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MessageGetVO {
+ private Long id;
+ private String text;
+ private String title;
+ private Timestamp createdAt;
+ private String senderName;
+ private String type;
+ private Long toId;
+
+}
diff --git a/src/main/java/com/jsl/oa/model/vodata/PermissionContentVO.java b/src/main/java/com/jsl/oa/model/vodata/PermissionContentVO.java
new file mode 100644
index 0000000..5b5bddd
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/PermissionContentVO.java
@@ -0,0 +1,14 @@
+package com.jsl.oa.model.vodata;
+
+import lombok.Data;
+
+@Data
+public class PermissionContentVO {
+ // 主键
+ private Long id;
+ // 权限名称
+ private String name;
+ // 权限描述
+ private String description;
+}
+
diff --git a/src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java b/src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java
deleted file mode 100644
index e48833d..0000000
--- a/src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.jsl.oa.model.vodata;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PermissionContentVo {
-
- private Long id;
- private String name;
- private String code;
- private Short type;
- private List children;
-
-}
-
-
diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java
index e5a5784..2adf8ec 100644
--- a/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java
@@ -20,10 +20,10 @@ public class ProjectInfoVO {
@NotNull(message = "工作量不能为空")
private Long workLoad;
private String tags;
- private String file;
+ private String files;
+ private Timestamp beginTime;
private Timestamp completeTime;
- private Timestamp deadline;
- private Integer status;
- private Integer isFinish;
+ private Timestamp deadLine;
+ private String status;
}
diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
index de5ba6c..f2d9d88 100644
--- a/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
@@ -10,7 +10,6 @@ import lombok.experimental.Accessors;
public class ProjectSimpleVO {
private String name;
private String principalUser;
- private Integer isFinish;
private String description;
private Long cycle;
private Long workLoad;
diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java
new file mode 100644
index 0000000..25114be
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java
@@ -0,0 +1,29 @@
+package com.jsl.oa.model.vodata;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ReviewAddVO {
+
+ //申请名称
+ @NotBlank(message = "审核名称不能为空")
+ private String name;
+ //申请理由
+ @NotBlank(message = "申请理由不能为空")
+ private String content;
+ //申请的项目id
+ @NotNull(message = "项目id不能为空")
+ private Long projectId;
+ //申请的子系统id
+ @NotNull(message = "子系统id不能为空")
+ private Long projectChildId;
+ //申请的子模块id
+ private Long projectModuleId;
+
+}
+
+
diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewDataVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewDataVO.java
new file mode 100644
index 0000000..7700711
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/ReviewDataVO.java
@@ -0,0 +1,16 @@
+package com.jsl.oa.model.vodata;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ReviewDataVO {
+
+ private Integer dataTotal;
+
+ private List reviews;
+}
+
+
diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewUpdateResultVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewUpdateResultVO.java
new file mode 100644
index 0000000..11d8741
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/ReviewUpdateResultVO.java
@@ -0,0 +1,23 @@
+package com.jsl.oa.model.vodata;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ReviewUpdateResultVO {
+
+ @NotNull
+ private Long id;
+
+ @NotNull
+ @Min(value = 0, message = "未通过:0,已通过:1,待审批:2")
+ @Max(value = 2, message = "未通过:0,已通过:1,待审批:2")
+ private Short result;
+
+
+}
+
+
diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java
new file mode 100644
index 0000000..9177701
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java
@@ -0,0 +1,47 @@
+package com.jsl.oa.model.vodata;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class ReviewVO {
+
+ private Long id;
+ //申请名称
+ private String name;
+ //申请理由
+ private String content;
+ //申请者用户id
+ private Long senderId;
+ //审请者用户名称
+ private String senderName;
+ //审核者用户id
+ private Long recipientId;
+ //审核者用户名称
+ private String recipientName;
+ //审核类别（子系统 子模块）
+ private String category;
+ //申请的项目id
+ private Long projectId;
+ //申请的项目名称
+ private String projectName;
+ //申请的子系统id
+ private Long projectChildId;
+ //申请的子系统名称
+ private String projectChildName;
+ //申请的子模块id
+ private Long projectModuleId;
+ //申请的模块名称
+ private String projectModuleName;
+ //申请时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applicationTime;
+ //审核结果（0：未通过；1：通过；2：未审批）
+ private String result;
+}
+
+
diff --git a/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java b/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java
index cfca43d..4394e49 100644
--- a/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java
@@ -1,12 +1,12 @@
package com.jsl.oa.model.vodata;
-import lombok.Getter;
+import lombok.Data;
import javax.validation.constraints.*;
-@Getter
+@Data
public class UserAddVO {
@NotBlank(message = "用户名不能为空")
@@ -20,7 +20,8 @@ public class UserAddVO {
private String address;
@NotBlank(message = "电话不能为空")
- @Pattern(regexp = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", message = "电话格式错误")
+ @Pattern(regexp = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$",
+ message = "电话格式错误")
private String phone;
@NotBlank(message = "邮箱不能为空")
diff --git a/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java b/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java
index 300335e..6cc4189 100644
--- a/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java
@@ -21,7 +21,8 @@ public class UserEditVO {
private String address;
- @Pattern(regexp = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", message = "电话格式错误")
+ @Pattern(regexp = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$",
+ message = "电话格式错误")
private String phone;
@Pattern(regexp = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", message = "邮箱格式错误")
diff --git a/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java b/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java
index 949d0c1..1513d60 100755
--- a/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java
@@ -28,7 +28,9 @@ public class UserRegisterVO {
private String address;
@NotBlank(message = "电话不能为空")
- @Pattern(regexp = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", message = "电话格式错误")
+ @Pattern(regexp =
+ "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$",
+ message = "电话格式错误")
private String phone;
@NotBlank(message = "邮箱不能为空")
diff --git a/src/main/java/com/jsl/oa/services/InfoService.java b/src/main/java/com/jsl/oa/services/InfoService.java
index 028e7a3..c3e1aa1 100644
--- a/src/main/java/com/jsl/oa/services/InfoService.java
+++ b/src/main/java/com/jsl/oa/services/InfoService.java
@@ -33,7 +33,6 @@ public interface InfoService {
*
* @param request 请求
* @param carouselVO 轮播图VO
- * @param id 轮播图ID
* @return {@link BaseResponse}
*/
BaseResponse editHeaderImage(HttpServletRequest request, CarouselVO carouselVO);
diff --git a/src/main/java/com/jsl/oa/services/MessageService.java b/src/main/java/com/jsl/oa/services/MessageService.java
index 944c35a..5885df9 100644
--- a/src/main/java/com/jsl/oa/services/MessageService.java
+++ b/src/main/java/com/jsl/oa/services/MessageService.java
@@ -3,7 +3,7 @@ package com.jsl.oa.services;
import com.jsl.oa.utils.BaseResponse;
import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
* 消息服务接口
@@ -18,15 +18,24 @@ public interface MessageService {
BaseResponse messageDelete(Long mid, HttpServletRequest request);
- BaseResponse messageGet(LocalDate begin, LocalDate end, Long page, Long pageSize, Long uid);
+ BaseResponse messageGet(
+ LocalDateTime begin,
+ LocalDateTime end,
+ Integer page,
+ Integer pageSize,
+ Long uid);
- BaseResponse messageGetAll(
- HttpServletRequest request,
- LocalDate begin,
- LocalDate end,
- Long page,
- Long pageSize,
- Long loginId,
- Long uid
- );
+ void messageAdd(Integer pId, Integer systemId, Integer moddleId, Long uid,
+ HttpServletRequest request);
+ void messageAdd(Integer pId, Integer systemId, Integer moddleId, Long uid, Long isPass,
+ HttpServletRequest request);
+ void messageAdd(Integer pId, Integer type, Integer systemId,
+ HttpServletRequest request);
+ void messageAdd(Integer pId, Integer systmeId, Integer moddleId, Integer type,
+ HttpServletRequest request);
+ void messageAdd(Integer pId, Integer systemId, Integer moddleId);
+
+ void messageRemind();
+
+ BaseResponse messageGetById(Long id, Long uid);
}
diff --git a/src/main/java/com/jsl/oa/services/PermissionService.java b/src/main/java/com/jsl/oa/services/PermissionService.java
index f81e127..e201dd2 100644
--- a/src/main/java/com/jsl/oa/services/PermissionService.java
+++ b/src/main/java/com/jsl/oa/services/PermissionService.java
@@ -1,19 +1,12 @@
package com.jsl.oa.services;
-import com.jsl.oa.model.vodata.PermissionEditVO;
import com.jsl.oa.utils.BaseResponse;
import javax.servlet.http.HttpServletRequest;
public interface PermissionService {
- BaseResponse permissionAdd(HttpServletRequest request, Long rid, Long pid);
-
BaseResponse permissionUser(HttpServletRequest request, Long uid);
BaseResponse permissionGet(HttpServletRequest request);
-
- BaseResponse permissionEdit(PermissionEditVO permissionEditVo, HttpServletRequest request);
-
- BaseResponse permissionDelete(HttpServletRequest request, Long pid);
}
diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java
index 9915778..5e333bb 100644
--- a/src/main/java/com/jsl/oa/services/ProjectService.java
+++ b/src/main/java/com/jsl/oa/services/ProjectService.java
@@ -1,6 +1,8 @@
package com.jsl.oa.services;
-import com.jsl.oa.model.vodata.*;
+import com.jsl.oa.model.vodata.ProjectEditVO;
+import com.jsl.oa.model.vodata.ProjectInfoVO;
+import com.jsl.oa.model.vodata.ProjectWorkVO;
import com.jsl.oa.model.vodata.business.info.ProjectShowVO;
import com.jsl.oa.utils.BaseResponse;
@@ -8,14 +10,9 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
public interface ProjectService {
- BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd);
BaseResponse projectEdit(HttpServletRequest request, ProjectEditVO projectEdit, Long projectId);
- BaseResponse projectGetUserInCutting(Long uid);
-
- BaseResponse projectAddUserForCutting(HttpServletRequest request, Long uid, Long pid);
-
BaseResponse getHeader(Integer id);
BaseResponse addHeader(HttpServletRequest request, ProjectShowVO projectShowVO);
@@ -24,23 +21,23 @@ public interface ProjectService {
BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id);
- BaseResponse get(Integer listAll, HttpServletRequest request, List tags, List isFinish, Integer page, Integer pageSize);
-
BaseResponse getByName(String name);
BaseResponse projectDelete(HttpServletRequest request, List id);
- BaseResponse addProjectCutting(HttpServletRequest request, ProjectCuttingAddVO projectCuttingAddVO);
+ BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectVO);
- BaseResponse editProjectCutting(HttpServletRequest request, ProjectCuttingEditVO projectCuttingEditVO);
+ BaseResponse workGet(
+ HttpServletRequest request,
+ List tags,
+ List isFinish,
+ Integer is,
+ Integer page,
+ Integer pageSize);
- BaseResponse projectToOtherUserForCutting(HttpServletRequest request, Long oldUid, Long pid, Long newUid);
+ BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO);
- BaseResponse workget(Integer listAll, HttpServletRequest request, List tags, List isFinish, Integer is, Integer page, Integer pageSize);
-
- BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO);
-
- BaseResponse tget(Integer id, List tags, List isFinish, Integer page, Integer pageSize);
+ BaseResponse tGet(List tags, List isFinish, Integer page, Integer pageSize);
BaseResponse projectFileGet(HttpServletRequest request, Long projectId);
@@ -49,4 +46,15 @@ public interface ProjectService {
BaseResponse getWorkById(Integer id);
BaseResponse projectPrincipalGet();
+
+ /**
+ * 从项目 id 获取项目的详细信息
+ *
+ * 根据项目所属 id 获取项目的详细信息，根据用户所属角色组的不同返回不同的内容
+ *
+ * @param request 获取请求体
+ * @param projectId 项目 id
+ * @return 根据用户所属角色组的不同返回不同的内容
+ */
+ BaseResponse getProjectById(HttpServletRequest request, Long projectId);
}
diff --git a/src/main/java/com/jsl/oa/services/ReviewService.java b/src/main/java/com/jsl/oa/services/ReviewService.java
new file mode 100644
index 0000000..bbcfc39
--- /dev/null
+++ b/src/main/java/com/jsl/oa/services/ReviewService.java
@@ -0,0 +1,21 @@
+package com.jsl.oa.services;
+
+
+import com.jsl.oa.model.vodata.ReviewAddVO;
+import com.jsl.oa.model.vodata.ReviewUpdateResultVO;
+import com.jsl.oa.utils.BaseResponse;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface ReviewService {
+
+ BaseResponse getUserPendingApprovalReview(Integer page, Integer pageSize, HttpServletRequest request);
+
+ BaseResponse getUserReview(Integer page, Integer pageSize, HttpServletRequest request);
+
+ BaseResponse addReview(ReviewAddVO reviewAddVO, HttpServletRequest request);
+
+ BaseResponse updateReviewResult(ReviewUpdateResultVO reviewUpdateResultVOVO, HttpServletRequest request);
+
+ BaseResponse searchReview(String content, Short statue, HttpServletRequest request, Integer page, Integer pageSize);
+}
diff --git a/src/main/java/com/jsl/oa/services/RoleService.java b/src/main/java/com/jsl/oa/services/RoleService.java
index ba46e87..61a8d32 100644
--- a/src/main/java/com/jsl/oa/services/RoleService.java
+++ b/src/main/java/com/jsl/oa/services/RoleService.java
@@ -16,9 +16,9 @@ import javax.servlet.http.HttpServletRequest;
* @since v1.1.0
*/
public interface RoleService {
- BaseResponse roleAddUser(HttpServletRequest request,Long uid, Long rid);
+ BaseResponse roleAddUser(HttpServletRequest request, Long uid, Long rid);
- BaseResponse roleRemoveUser(HttpServletRequest request,Long uid);
+ BaseResponse roleRemoveUser(HttpServletRequest request, Long uid);
BaseResponse roleGet(HttpServletRequest request, String id);
diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
index 697c9d3..0b989f2 100755
--- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
@@ -1,6 +1,6 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.annotations.CheckUserAbleToUse;
+import com.jsl.oa.annotations.UserAbleToUse;
import com.jsl.oa.common.constant.BusinessConstants;
import com.jsl.oa.dao.PermissionDAO;
import com.jsl.oa.dao.RoleDAO;
@@ -49,7 +49,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authRegister(@NotNull UserRegisterVO userRegisterVO) {
- log.info("\t> 执行 Service 层 AuthService.authRegister 方法");
// 检查用户说是否存在
UserDO getUserByUsername = userMapper.getUserInfoByUsername(userRegisterVO.getUsername());
// 用户名已存在
@@ -86,7 +85,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLogin(@NotNull UserLoginVO userLoginVO) {
- log.info("\t> 执行 Service 层 AuthService.userLogin 方法");
// 检查用户是否存在
UserDO userDO;
if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$",
@@ -131,7 +129,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLoginByEmail(String email, Integer code) {
- log.info("\t> 执行 Service 层 AuthService.authLoginByEmail 方法");
// 获取验证码是否有效
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, email);
if (redisCode != null) {
@@ -151,7 +148,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLoginSendEmailCode(String email) {
- log.info("\t> 执行 Service 层 AuthService.authLoginSendEmailCode 方法");
// 获取用户信息
UserDO userDO = userMapper.getUserInfoByEmail(email);
if (userDO != null) {
@@ -176,12 +172,11 @@ public class AuthServiceImpl implements AuthService {
}
@Override
- @CheckUserAbleToUse
+ @UserAbleToUse
public BaseResponse authChangePassword(
@NotNull UserChangePasswordVO userChangePasswordVO,
HttpServletRequest request
) {
- log.info("\t> 执行 Service 层 AuthService.authChangePassword 方法");
// 检查新密码输入无误
if (!userChangePasswordVO.getNewPassword().equals(userChangePasswordVO.getConfirmPassword())) {
return ResultUtil.error(ErrorCode.PASSWORD_NOT_SAME);
@@ -210,9 +205,8 @@ public class AuthServiceImpl implements AuthService {
}
@Override
- @CheckUserAbleToUse
+ @UserAbleToUse
public BaseResponse authLogout(HttpServletRequest request) {
- log.info("\t> 执行 Service 层 AuthService.authLogout 方法");
// 获取用户
UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request));
// 删除Token
@@ -225,7 +219,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authForgetPassword(@NotNull UserForgetPasswordVO userForgetPasswordVO) {
- log.info("\t> 执行 Service 层 AuthService.authForgetPassword 方法");
// 获取验证码是否有效
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, userForgetPasswordVO.getEmail());
if (redisCode != null) {
@@ -274,7 +267,7 @@ public class AuthServiceImpl implements AuthService {
getPermissionForString = permissionDAO.getPermission(userDO.getId());
}
// 获取用户角色
- RoleUserDO getUserRole = roleDAO.roleMapper.getRoleUserByUid(userDO.getId());
+ RoleUserDO getUserRole = roleDAO.getRoleUserByUid(userDO.getId());
if (getUserRole == null) {
getUserRole = new RoleUserDO();
getUserRole.setRid(0L)
diff --git a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
index 7540f9f..6ee51ba 100644
--- a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
@@ -1,9 +1,9 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.annotations.CheckUserHasPermission;
+import com.jsl.oa.annotations.NeedPermission;
import com.jsl.oa.dao.InfoDAO;
+import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.dao.UserDAO;
-import com.jsl.oa.mapper.RoleMapper;
import com.jsl.oa.model.dodata.UserDO;
import com.jsl.oa.model.dodata.info.CarouselDO;
import com.jsl.oa.model.vodata.UserProfileVo;
@@ -36,14 +36,13 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class InfoServiceImpl implements InfoService {
- private final RoleMapper roleMapper;
private final InfoDAO infoDAO;
private final UserDAO userDAO;
+ private final RoleDAO roleDAO;
@Override
- @CheckUserHasPermission("info.image.add")
+ @NeedPermission("info.image.add")
public BaseResponse addHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
- log.info("\t> 执行 Service 层 InfoService.addHeaderImage 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@@ -75,9 +74,8 @@ public class InfoServiceImpl implements InfoService {
}
@Override
- @CheckUserHasPermission("info.image.edit")
+ @NeedPermission("info.image.edit")
public BaseResponse editHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
- log.info("\t> 执行 Service 层 InfoService.editHeaderImage 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@@ -112,7 +110,6 @@ public class InfoServiceImpl implements InfoService {
@Override
public BaseResponse getHeaderImage(Integer id) {
- log.info("\t> 执行 Service 层 InfoService.getHeaderImage 方法");
// 获取轮播图信息
CarouselDO carouselDO = infoDAO.getCarousel();
if (id != null) {
@@ -127,11 +124,10 @@ public class InfoServiceImpl implements InfoService {
}
@Override
- @CheckUserHasPermission("info.image.del")
+ @NeedPermission("info.image.del")
public BaseResponse delHeaderImage(HttpServletRequest request, Integer id) {
- log.info("\t> 执行 Service 层 InfoService.delHeaderImage 方法");
// 用户权限校验
- if (!Processing.checkUserIsAdmin(request, roleMapper)) {
+ if (!Processing.checkUserIsConsole(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
}
// 获取轮播图信息
@@ -150,11 +146,10 @@ public class InfoServiceImpl implements InfoService {
}
@Override
- @CheckUserHasPermission("info.image.setting.edit")
+ @NeedPermission("info.image.setting.edit")
public BaseResponse editSettingHeaderImage(HttpServletRequest request, Boolean showType) {
- log.info("\t> 执行 Service 层 InfoService.editSettingHeaderImage 方法");
// 用户权限校验
- if (!Processing.checkUserIsAdmin(request, roleMapper)) {
+ if (!Processing.checkUserIsConsole(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
}
// 获取轮播图信息
@@ -170,7 +165,6 @@ public class InfoServiceImpl implements InfoService {
@Override
public BaseResponse getHeaderUser(HttpServletRequest request, String order, String orderBy) {
- log.info("\t> 执行 Service 层 InfoService.getHeaderUser 方法");
// 默认无参数情况
if (order == null) {
order = "asc";
diff --git a/src/main/java/com/jsl/oa/services/impl/MailServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MailServiceImpl.java
index 9a3380e..34d51b3 100755
--- a/src/main/java/com/jsl/oa/services/impl/MailServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/MailServiceImpl.java
@@ -1,6 +1,6 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.annotations.CheckUserAbleToUse;
+import com.jsl.oa.annotations.UserAbleToUse;
import com.jsl.oa.services.MailService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -39,9 +39,8 @@ public class MailServiceImpl implements MailService {
@Override
@Async
- @CheckUserAbleToUse
+ @UserAbleToUse
public void sendMail(String sendTo, String subject, String text) {
- log.info("\t> 执行 Service 层 MailService.sendMail 方法");
//发送多媒体邮件
try {
MimeMessage message = javaMailSender.createMimeMessage();
@@ -63,16 +62,13 @@ public class MailServiceImpl implements MailService {
@Override
@Async
- @CheckUserAbleToUse
- public void sendMail(String sendTo, String model) {
- log.info("\t> 执行 Service 层 MailService.sendMail 方法");
- }
+ @UserAbleToUse
+ public void sendMail(String sendTo, String model) { }
@Override
@Async
- @CheckUserAbleToUse
+ @UserAbleToUse
public void sendMailAboutUserLogin(String email, Integer code) {
- log.info("\t> 执行 Service 层 MailService.sendMailAboutUserLogin 方法");
// 发送邮件带HTML模块部分
try {
MimeMessage message = javaMailSender.createMimeMessage();
diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
index a387dab..2337ac5 100644
--- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
@@ -1,26 +1,23 @@
package com.jsl.oa.services.impl;
-
-
-import com.jsl.oa.annotations.CheckUserAbleToUse;
-import com.jsl.oa.annotations.CheckUserHasPermission;
+import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.mapper.MessageMapper;
-import com.jsl.oa.mapper.RoleMapper;
+import com.jsl.oa.mapper.ProjectMapper;
import com.jsl.oa.model.dodata.MessageDO;
-import com.jsl.oa.model.dodata.PageBeanDO;
+import com.jsl.oa.model.dodata.ProjectChildDO;
+import com.jsl.oa.model.dodata.ProjectModuleDO;
+import com.jsl.oa.model.vodata.MessageAddVO;
+import com.jsl.oa.model.vodata.MessageGetVO;
import com.jsl.oa.services.MessageService;
-import com.jsl.oa.utils.BaseResponse;
-import com.jsl.oa.utils.ErrorCode;
-import com.jsl.oa.utils.JwtUtil;
-import com.jsl.oa.utils.ResultUtil;
+import com.jsl.oa.utils.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
-
/**
* 消息服务层实现类
*
@@ -36,10 +33,11 @@ import java.util.List;
public class MessageServiceImpl implements MessageService {
private final MessageMapper messageMapper;
- private final RoleMapper roleMapper;
+ private final UserDAO userDAO;
+ private final ProjectMapper projectMapper;
@Override
- @CheckUserHasPermission("message.delete")
+
public BaseResponse messageDelete(Long mid, HttpServletRequest request) {
//获取消息数据
MessageDO messageDO = messageMapper.getMessageById(mid);
@@ -55,56 +53,331 @@ public class MessageServiceImpl implements MessageService {
return ResultUtil.success();
}
+ @SuppressWarnings("checkstyle:Regexp")
@Override
- @CheckUserAbleToUse
- public BaseResponse messageGet(LocalDate begin, LocalDate end, Long page, Long pageSize, Long uid) {
- //1.记录总数据数
- Long count = messageMapper.count(uid);
- //2.获取分页数据列表
+ public BaseResponse messageGet(LocalDateTime beginTime,
+ LocalDateTime endTime,
+ Integer page,
+ Integer pageSize,
+ Long uid) {
//默认获取时间为最近30天
- if (begin == null) {
- begin = LocalDate.now();
- end = begin.minusDays(30);
+ if (beginTime == null) {
+ endTime = LocalDateTime.now();
+ beginTime = endTime.minusDays(30);
}
- Long start = (page - 1) * pageSize;
- List empList = messageMapper.page(begin, end, uid, start, pageSize);
+ List messageDOList = messageMapper.page(beginTime, endTime, uid);
+ //封装返回数据
+ List messageGetVOList = new ArrayList<>();
+ for (MessageDO messageDO : messageDOList) {
+ MessageGetVO messageGetVO1 = new MessageGetVO();
+ messageGetVO1.setId(messageDO.getId());
+ messageGetVO1.setText(messageDO.getText());
+ messageGetVO1.setTitle(messageDO.getTitle());
+ messageGetVO1.setCreatedAt(messageDO.getCreatedAt());
+ if (messageDO.getSid() != null) {
+ messageGetVO1.setSenderName(userDAO.getUserById(messageDO.getSid()).getUsername());
+ }
+ if (messageDO.getToId() != null) {
+ messageGetVO1.setToId(messageDO.getToId());
+ }
+ if (messageDO.getType() != null) {
+ messageGetVO1.setType(messageDO.getType());
+ }
+ messageGetVOList.add(messageGetVO1);
+ }
+ //分页返回
+ int start = (page - 1) * pageSize;
+ int end = start + pageSize;
+ List pageData = messageGetVOList.subList(start,
+ Math.min(end, messageGetVOList.size()));
+ return ResultUtil.success(pageData);
+ }
- //3.封装PageBean对象
- PageBeanDO pageBean = new PageBeanDO<>(count, empList);
- return ResultUtil.success(pageBean);
+ /**
+ * 添加指派消息
+ *
+ * @param pId 项目id
+ * @param systemId 系统id
+ * @param moddleId 模块id
+ * @param uid 用户id
+ * @param request 请求
+ */
+ @Override
+ public void messageAdd(
+ Integer pId,
+ Integer systemId,
+ Integer moddleId,
+ Long uid,
+ HttpServletRequest request) {
+ // 拿到token，获取发送人id
+ String token = request.getHeader("Authorization").replace("Bearer ", "");
+ Long sid = JwtUtil.getUserId(token);
+ // 获取发送人名字，项目名，子系统名，子模块名
+ String senderName = userDAO.getUserById(sid).getUsername();
+ String projectName = projectMapper.tgetProjectById(pId).getName();
+ String systemName = projectMapper.getWorkById(systemId).getName();
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setSid(sid);
+ messageAddVO.setUid(uid);
+ messageAddVO.setTitle("指派消息");
+ if (moddleId == null) {
+ messageAddVO.setText(senderName + "指派了" + projectName + "项目的" + systemName + "子系统给您");
+ } else {
+ String moddleName = projectMapper.getModuleById(moddleId).getName();
+ messageAddVO.setText(senderName + "指派了" + projectName + "项目的" + systemName + "子系统的" + moddleName + "子模块给您");
+ }
+ messageAddVO.setType("Review");
+ messageMapper.messageAdd(messageAddVO);
+ }
+
+
+ /**
+ * 添加审批消息
+ *
+ * @param pId 项目id
+ * @param systemId 系统id
+ * @param moddleId 模块id
+ * @param uid 用户id
+ * @param isPass 是否通过 1:通过 0:未通过
+ * @param request 请求
+ */
+ @Override
+ public void messageAdd(
+ Integer pId,
+ Integer systemId,
+ Integer moddleId,
+ Long uid,
+ Long isPass,
+ HttpServletRequest request) {
+ // 获取发送人名字，项目名，子系统名，子模块名
+ String projectName = projectMapper.tgetProjectById(pId).getName();
+ String systemName = projectMapper.getWorkById(systemId).getName();
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(uid);
+ messageAddVO.setTitle("审批消息");
+ String moddleName = projectMapper.getModuleById(moddleId).getName();
+ if (isPass == 1) {
+ messageAddVO.setText("您申请的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人已通过");
+ } else {
+ messageAddVO.setText("您申请的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人未通过");
+ }
+ messageAddVO.setType("Message");
+ messageMapper.messageAdd(messageAddVO);
+ }
+
+ /**
+ * 添加项目变动消息
+ *
+ * @param pId 项目id
+ * @param type 类型 1:上传文档 2:修改状态 3:修改负责人
+ * @param systemId 系统id
+ * @param request 请求
+ */
+ @Override
+ public void messageAdd(
+ Integer pId,
+ Integer type,
+ Integer systemId,
+ HttpServletRequest request) {
+ // 获取项目名,负责人名
+ String projectName = projectMapper.tgetProjectById(pId).getName();
+ String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername();
+ String systemName = projectMapper.getWorkById(systemId).getName();
+ // 添加消息
+ // 1:上传文档 2:修改状态 3:修改负责人
+ List uidList = projectMapper.getMemberByProjectId(pId);
+ for (Long uid : uidList) {
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(uid);
+ messageAddVO.setTitle("项目变动消息");
+ if (type == 3) {
+ messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人");
+ } else if (type == 2) {
+ messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态");
+ } else if (type == 1) {
+ messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目");
+ }
+ messageAddVO.setType("Project");
+ messageAddVO.setToId(pId.longValue());
+ messageMapper.messageAdd(messageAddVO);
+ }
+ }
+
+ /**
+ * 添加子系统变动消息
+ *
+ * @param pId 项目id
+ * @param systmeId 系统id
+ * @param moddleId 模块id
+ * @param type 类型 1:删除模块 2:修改简介 3:修改周期
+ * @param request 请求
+ */
+ @Override
+ public void messageAdd(
+ Integer pId,
+ Integer systmeId,
+ Integer moddleId,
+ Integer type,
+ HttpServletRequest request) {
+ // 获取项目名,负责人名
+ String projectName = projectMapper.tgetProjectById(pId).getName();
+ String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername();
+ String systemName = projectMapper.getWorkById(systmeId).getName();
+ String moddleName = projectMapper.getModuleById(moddleId).getName();
+ // 添加消息
+ // 1:删除模块 2:修改简介 3:修改周期
+ if (type == 1) {
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectMapper.getPid(moddleId));
+ messageAddVO.setTitle("子系统变动消息");
+ messageAddVO.setText("项目经理" + senderName + "删除了" + projectName + "项目的"
+ + systemName + "系统的" + moddleName + "模块");
+ messageMapper.messageAdd(messageAddVO);
+ } else {
+ List uidList = projectMapper.getMemberBySystemId(systmeId);
+ for (Long uid : uidList) {
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(uid);
+ messageAddVO.setTitle("子系统变动消息");
+ if (type == 2) {
+ messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
+ + systemName + "系统的简介说明");
+ } else if (type == 3) {
+ messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
+ + systemName + "系统的系统周期/工作量");
+ }
+ messageAddVO.setType("Project_child");
+ messageAddVO.setToId(systmeId.longValue());
+ messageMapper.messageAdd(messageAddVO);
+ }
+ }
+ }
+
+ /**
+ * 添加成员填写日报消息
+ *
+ * @param pId 项目id
+ * @param systemId 系统id
+ * @param moddleId 模块id
+ */
+ @Override
+ public void messageAdd(
+ Integer pId,
+ Integer systemId,
+ Integer moddleId) {
+ // 获取项目名,系统名,模块名,负责人名
+ String projectName = projectMapper.tgetProjectById(pId).getName();
+ String systemName = projectMapper.getWorkById(systemId).getName();
+ String moddleName = projectMapper.getModuleById(moddleId).getName();
+ String principalName = userDAO.getUserById(projectMapper.getPid(moddleId)).getUsername();
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectMapper.getPid(systemId));
+ messageAddVO.setTitle("日报消息");
+ messageAddVO.setText(projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人" + principalName
+ + "刚刚填写了日报");
+ messageAddVO.setType("跳转日报页");
+ messageMapper.messageAdd(messageAddVO);
+ }
+
+ /**
+ * 添加提醒消息
+ * 系统/模块到期提醒
+ */
+ @Override
+ public void messageRemind() {
+ // 当前时间
+ LocalDateTime now = LocalDateTime.now();
+ // 三天后时间
+ LocalDateTime threeDaysLater = now.plusDays(3);
+ // 七天后时间
+ LocalDateTime sevenDaysLater = now.plusDays(7);
+ // 获取三天后到期的模块
+ List projectWorkDOList = projectMapper.getProjectWorkByTime(threeDaysLater);
+ // 获取七天后到期的模块
+ List projectWorkDOList1 = projectMapper.getProjectWorkByTime(sevenDaysLater);
+ if (!projectWorkDOList1.isEmpty()) {
+ for (ProjectModuleDO projectWorkDO : projectWorkDOList) {
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectWorkDO.getPrincipalId());
+ messageAddVO.setTitle("提醒消息");
+ String projectName = projectMapper
+ .tgetProjectById(projectMapper.getWorkById(projectWorkDO.getProjectChildId().intValue())
+ .getProjectId().intValue()).getName();
+
+ String systemName = projectMapper.getWorkById(projectWorkDO.getProjectChildId().intValue()).getName();
+ String moddleName = projectWorkDO.getName();
+ messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块"
+ + "还有七天就要到期了，请及时处理");
+ messageAddVO.setType("Project_module");
+ messageAddVO.setToId(projectWorkDO.getId());
+ messageMapper.messageAdd(messageAddVO);
+ }
+ }
+ if (!projectWorkDOList.isEmpty()) {
+ for (ProjectModuleDO projectWorkDO : projectWorkDOList) {
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectWorkDO.getPrincipalId());
+ messageAddVO.setTitle("提醒消息");
+ String projectName = projectMapper
+ .tgetProjectById(projectMapper.getWorkById(projectWorkDO.getProjectChildId().intValue())
+ .getPrincipalId().intValue()).getName();
+
+ String systemName = projectMapper.getWorkById(projectWorkDO.getProjectChildId().intValue()).getName();
+ String moddleName = projectWorkDO.getName();
+ messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块"
+ + "还有三天就要到期了，请及时处理");
+ messageAddVO.setType("Project_module");
+ messageAddVO.setToId(projectWorkDO.getId());
+ messageMapper.messageAdd(messageAddVO);
+ }
+ }
+
+ // 获取七天后到期的系统
+ List projectChildDOList = projectMapper.getProjectChildByTime(sevenDaysLater);
+ if (!projectChildDOList.isEmpty()) {
+ for (ProjectChildDO projectChildDO : projectChildDOList) {
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectChildDO.getPrincipalId());
+ messageAddVO.setTitle("提醒消息");
+ String projectName = projectMapper.tgetProjectById(projectChildDO.getProjectId().intValue()).getName();
+ String systemName = projectChildDO.getName();
+ messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统还有七天就要到期了，请及时处理");
+ messageAddVO.setType("Project_child");
+ messageAddVO.setToId(projectChildDO.getId());
+ messageMapper.messageAdd(messageAddVO);
+ }
+ }
+ // 获取三天后到期的系统
+ List projectChildDOList1 = projectMapper.getProjectChildByTime(threeDaysLater);
+ if (!projectChildDOList1.isEmpty()) {
+ for (ProjectChildDO projectChildDO : projectChildDOList1) {
+ // 添加消息
+ MessageAddVO messageAddVO = new MessageAddVO();
+ messageAddVO.setUid(projectChildDO.getPrincipalId());
+ messageAddVO.setTitle("提醒消息");
+ String projectName = projectMapper.tgetProjectById(projectChildDO.getProjectId().intValue()).getName();
+ String systemName = projectChildDO.getName();
+ messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统还有三天就要到期了，请及时处理");
+ messageAddVO.setType("Project_child");
+ messageAddVO.setToId(projectChildDO.getId());
+ messageMapper.messageAdd(messageAddVO);
+ }
+
+ }
}
@Override
- @CheckUserHasPermission("message.get")
- public BaseResponse messageGetAll(
- HttpServletRequest request,
- LocalDate begin,
- LocalDate end,
- Long page,
- Long pageSize,
- Long loginId,
- Long uid
- ) {
- log.info("请求接口服务层");
- //1.记录总数据数
- Long count = messageMapper.count(uid);
-
- //2.获取分页数据列表
- //默认获取时间为最近30天
- if (begin == null) {
- begin = LocalDate.now();
- end = begin.minusDays(30);
- }
- Long start = (page - 1) * pageSize;
- List messageDOList = messageMapper.page(begin, end, uid, start, pageSize);
-
- //3.封装PageBean对象
- PageBeanDO pageBean = new PageBeanDO<>(count, messageDOList);
- return ResultUtil.success(pageBean);
+ public BaseResponse messageGetById(Long id, Long uid) {
+ return ResultUtil.success(messageMapper.getMessageById(id));
}
-
}
diff --git a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
index d94dff1..7ac2e7a 100644
--- a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
@@ -1,11 +1,10 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.dao.ModuleDAO;
import com.jsl.oa.dao.ProjectDAO;
+import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.mapper.ModuleMapper;
-import com.jsl.oa.mapper.RoleMapper;
-import com.jsl.oa.model.dodata.ProjectWorkDO;
+import com.jsl.oa.model.dodata.ProjectModuleDO;
import com.jsl.oa.model.vodata.ProjectWorkAndNameVO;
import com.jsl.oa.services.ModuleService;
import com.jsl.oa.utils.BaseResponse;
@@ -24,11 +23,10 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class ModuleServiceImpl implements ModuleService {
- private final RoleMapper roleMapper;
- private final ModuleDAO moduleDAO;
private final ProjectDAO projectDAO;
private final ModuleMapper moduleMapper;
private final UserDAO userDAO;
+ private final RoleDAO roleDAO;
@Override
public BaseResponse getByProjectId(Integer projectId, HttpServletRequest request) {
@@ -44,7 +42,7 @@ public class ModuleServiceImpl implements ModuleService {
is = 0;
}
- List projectWorkDOList = moduleMapper.getByProjectId(projectId, userId, is);
+ List projectWorkDOList = moduleMapper.getByProjectId(projectId, userId, is);
return ResultUtil.success(projectWorkDOList);
}
@@ -63,15 +61,15 @@ public class ModuleServiceImpl implements ModuleService {
is = 0;
}
- List projectWorkDOList = moduleMapper.getBySysId(sysId, userId, is);
+ List projectWorkDOList = moduleMapper.getBySysId(sysId, userId, is);
// 封装VO类
List projectWorkAndNameVOS = new ArrayList<>();
- for (ProjectWorkDO projectWorkDO : projectWorkDOList) {
+ for (ProjectModuleDO projectWorkDO : projectWorkDOList) {
ProjectWorkAndNameVO projectWorkAndNameVO = new ProjectWorkAndNameVO();
Processing.copyProperties(projectWorkDO, projectWorkAndNameVO);
// 添加负责人和子系统名称
projectWorkAndNameVO.
- setChildSystemName(projectDAO.getProjectWorkerById(projectWorkDO.getPid()).getName())
+ setChildSystemName(projectDAO.getProjectWorkerById(projectWorkDO.getProjectChildId()).getName())
.setPrincipalUser(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
projectWorkAndNameVOS.add(projectWorkAndNameVO);
@@ -83,9 +81,8 @@ public class ModuleServiceImpl implements ModuleService {
@Override
public BaseResponse deleteById(HttpServletRequest request, Long id) {
-
// 检测是否为管理员
- if (!Processing.checkUserIsAdmin(request, roleMapper)) {
+ if (!Processing.checkUserIsConsole(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
}
@@ -97,9 +94,9 @@ public class ModuleServiceImpl implements ModuleService {
// 删除子模块方法
public void deleteMoudule(Long id) {
//获取所有父Id=id的子模块
- List projectWorkDOS = moduleMapper.getAllMoudleByPid(id);
+ List projectWorkDOS = moduleMapper.getAllMoudleByPid(id);
- for (ProjectWorkDO workDO : projectWorkDOS) {
+ for (ProjectModuleDO workDO : projectWorkDOS) {
deleteMoudule(workDO.getId());
}
diff --git a/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java
index 6b231eb..3de24b1 100644
--- a/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java
@@ -1,7 +1,7 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.annotations.CheckUserHasPermission;
+import com.jsl.oa.annotations.NeedPermission;
import com.jsl.oa.dao.NewsDAO;
import com.jsl.oa.model.dodata.NewsDO;
import com.jsl.oa.model.vodata.NewsAddVO;
@@ -35,9 +35,8 @@ public class NewsServiceImpl implements NewsService {
private final NewsDAO newsDAO;
@Override
- @CheckUserHasPermission("news.add")
+ @NeedPermission("news.add")
public BaseResponse newsAdd(NewsAddVO newsAddVO, @NotNull HttpServletRequest request) {
- log.info("\t> 执行 Service 层 NewsService.newsAdd 方法");
// 拷贝新闻数据到实体类
NewsDO newsDO = new NewsDO();
Processing.copyProperties(newsAddVO, newsDO);
diff --git a/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java
index 657dee5..7213797 100644
--- a/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java
@@ -1,24 +1,22 @@
package com.jsl.oa.services.impl;
-import com.jsl.oa.annotations.CheckUserHasPermission;
import com.jsl.oa.dao.PermissionDAO;
import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.dao.UserDAO;
-import com.jsl.oa.mapper.PermissionMapper;
import com.jsl.oa.model.dodata.PermissionDO;
import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.vodata.PermissionContentVo;
-import com.jsl.oa.model.vodata.PermissionEditVO;
+import com.jsl.oa.model.vodata.PermissionContentVO;
import com.jsl.oa.services.PermissionService;
import com.jsl.oa.utils.BaseResponse;
import com.jsl.oa.utils.ErrorCode;
-import com.jsl.oa.utils.Processing;
import com.jsl.oa.utils.ResultUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -26,32 +24,21 @@ import java.util.List;
*
* 用于权限服务层的实现类,实现权限的增删改查,以及用户权限的获取
*
- * @since v1.0.0
- * @version v1.1.0
* @author xiao_lfeng | xiangZr-hhh | 176yunxuan
+ * @version v1.1.0
+ * @since v1.0.0
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class PermissionServiceImpl implements PermissionService {
- private final PermissionMapper permissionMapper;
private final RoleDAO roleDAO;
private final PermissionDAO permissionDAO;
private final UserDAO userDAO;
@Override
- @CheckUserHasPermission("permission.add")
- public BaseResponse permissionAdd(HttpServletRequest request, Long rid, Long pid) {
- log.info("\t> 执行 Service 层 PermissionService.permissionAdd 方法");
- permissionMapper.permissionAdd(rid, pid);
- return ResultUtil.success();
- }
-
- @Override
- @CheckUserHasPermission("permission.user")
public BaseResponse permissionUser(HttpServletRequest request, Long uid) {
- log.info("\t> 执行 Service 层 PermissionService.permissionUserPid 方法");
if (userDAO.isExistUser(uid)) {
// 此用户是否为管理员
RoleUserDO roleUserDO = roleDAO.getRoleUserByUid(uid);
@@ -70,43 +57,11 @@ public class PermissionServiceImpl implements PermissionService {
@Override
- @CheckUserHasPermission("permission.get")
public BaseResponse permissionGet(HttpServletRequest request) {
- log.info("\t> 执行 Service 层 PermissionService.permissionGet 方法");
//获取所有权限数据
- List permissionDOList = permissionMapper.getAllPermission();
- //将数据按父子类封装
- List permissionContentVos = Processing.convertToVoList(permissionDOList);
-
- return ResultUtil.success(permissionContentVos);
- }
-
- @Override
- @CheckUserHasPermission("permission.edit")
- public BaseResponse permissionEdit(PermissionEditVO permissionEditVo, HttpServletRequest request) {
- log.info("\t> 执行 Service 层 PermissionService.permissionEdit 方法");
- //根据id获取对应permission数据
- PermissionDO permissionDO = permissionMapper.getPermissionById(permissionEditVo.getId());
- if (permissionDO == null) {
- return ResultUtil.error(ErrorCode.PERMISSION_NOT_EXIST);
- }
- //传递要编辑的数据
- Processing.copyProperties(permissionEditVo, permissionDO);
- //更新permission
- if (!permissionMapper.updatePermission(permissionDO)) {
- return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR);
- }
- return ResultUtil.success();
- }
-
- @Override
- @CheckUserHasPermission("permission.delete")
- public BaseResponse permissionDelete(HttpServletRequest request, Long pid) {
- log.info("\t> 执行 Service 层 PermissionService.permissionDelete 方法");
- //删除权限
- if (!permissionMapper.deletePermission(pid)) {
- return ResultUtil.error(ErrorCode.DATABASE_DELETE_ERROR);
- }
- return ResultUtil.success();
+ List permissionDOList = permissionDAO.getAllPermission();
+ List permissionContentVO = new ArrayList<>();
+ BeanUtils.copyProperties(permissionDOList, permissionContentVO);
+ return ResultUtil.success(permissionContentVO);
}
}
diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
index 1396230..f57a39f 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
@@ -3,13 +3,12 @@ package com.jsl.oa.services.impl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jsl.oa.annotations.CheckUserHasPermission;
+import com.jsl.oa.annotations.NeedPermission;
import com.jsl.oa.dao.ProjectDAO;
+import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.mapper.ProjectMapper;
-import com.jsl.oa.mapper.RoleMapper;
import com.jsl.oa.mapper.UserMapper;
-import com.jsl.oa.model.dodata.ProjectCuttingDO;
import com.jsl.oa.model.dodata.ProjectDO;
import com.jsl.oa.model.dodata.UserDO;
import com.jsl.oa.model.dodata.info.ProjectShowDO;
@@ -48,14 +47,13 @@ public class ProjectServiceImpl implements ProjectService {
private final UserMapper userMapper;
private final ProjectMapper projectMapper;
- private final RoleMapper roleMapper;
private final ProjectDAO projectDAO;
private final UserDAO userDAO;
private final ObjectMapper objectMapper;
+ private final RoleDAO roleDAO;
@Override
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
- log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
if (projectAdd.getDescription().isEmpty()) {
projectAdd.setDescription("{}");
} else {
@@ -73,7 +71,7 @@ public class ProjectServiceImpl implements ProjectService {
tag = new StringBuilder(tag.substring(0, tag.length() - 2));
}
projectAdd.setTags(open + tag + close);
- projectAdd.setFile("{\"URI\":\"" + projectAdd.getFile() + "\"}");
+ projectAdd.setFiles("{\"URI\":\"" + projectAdd.getFiles() + "\"}");
projectDAO.projectAdd(projectAdd);
@@ -81,78 +79,34 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
- public BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
- log.info("\t> 执行 Service 层 ProjectService.projectWorkAdd 方法");
+ public BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
//获取用户id
Long userId = Processing.getAuthHeaderToUserId(request);
//是否是增加子系统
if (projectWorkVO.getType() == 0) {
//是否是老师
- if (Processing.checkUserIsTeacher(request, roleMapper)) {
+ if (Processing.checkUserIsPrincipal(request, roleDAO)) {
projectDAO.projectWorkAdd(projectWorkVO);
} else {
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
}
- }//增加子模块
- else {
+ } else {
//是否是子系统的负责人
if (Objects.equals(userId, projectMapper.getPirIdbyWorkid(projectWorkVO.getPid()))) {
projectDAO.projectWorkAdd(projectWorkVO);
- } else return ResultUtil.error(ErrorCode.NOT_PERMISSION);
+ } else {
+ return ResultUtil.error(ErrorCode.NOT_PERMISSION);
+ }
}
return ResultUtil.success("添加成功");
}
@Override
- public BaseResponse tget(Integer id, List tags, List isFinish, Integer page, Integer pageSize) {
- log.info("\t> 执行 Service 层 ProjectService.tget 方法");
- //根据id查询
- if (id != null) {
- ProjectDO projectDO = projectMapper.tgetProjectById(id);
- ProjectSimpleVO projectSimpleVO = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO, projectDO, userDAO, objectMapper);
- return ResultUtil.success(projectSimpleVO);
- }
+ public BaseResponse tGet(List tags, List isFinish, Integer page, Integer pageSize) {
- //根据标签查询
- if (tags != null && !tags.isEmpty()) {
- List projectDOList = projectDAO.tget(id, isFinish, tags);
+ List projectDOList = projectDAO.tget(isFinish, tags);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
-
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
-
- //根据状态查询
- if (isFinish != null && !isFinish.isEmpty()) {
- List projectDOList = projectDAO.tget(id, isFinish, tags);
-
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
-
- List projectDOList = projectDAO.tget(id, isFinish, tags);
List projectSimpleVOList = new ArrayList<>();
for (ProjectDO projectDO : projectDOList) {
ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
@@ -165,6 +119,7 @@ public class ProjectServiceImpl implements ProjectService {
List pageData = projectSimpleVOList.subList(start,
Math.min(end, projectSimpleVOList.size()));
return ResultUtil.success(pageData);
+
}
@Override
@@ -178,13 +133,13 @@ public class ProjectServiceImpl implements ProjectService {
ProjectDO projectDO = projectDAO.getProjectById(projectId);
- if (projectDO.getFile() == null || projectDO.getFile().equals("{}")) {
+ if (projectDO.getFiles() == null || projectDO.getFiles().equals("{}")) {
return ResultUtil.success(null);
}
// 将文件内容转换为 JSON 数组
try {
- Object fileJson = new ObjectMapper().readValue(projectDO.getFile(), Object.class);
+ Object fileJson = new ObjectMapper().readValue(projectDO.getFiles(), Object.class);
return ResultUtil.success(fileJson);
} catch (JsonProcessingException e) {
return ResultUtil.error(ErrorCode.PROJECT_FILE_JSON_ERROR);
@@ -225,14 +180,29 @@ public class ProjectServiceImpl implements ProjectService {
return ResultUtil.success(userMapper.getPrincipal());
}
+ @Override
+ public BaseResponse getProjectById(HttpServletRequest request, Long projectId) {
+ // 对项目 id 进行数据库校验
+ ProjectDO getProject = projectDAO.getProjectById(projectId);
+ if (getProject == null) {
+ return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
+ }
+ // 检查项目是否被删除
+ if (getProject.getIsDelete()) {
+ return ResultUtil.error("项目已删除", ErrorCode.PROJECT_NOT_EXIST);
+ }
+ // 对项目具体信息进行检查
+ // TODO: [10001] 需要检查普通用户是否有权限可以看到这一篇项目内容
+ return ResultUtil.success(getProject);
+ }
+
@Override
public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) {
- log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法");
//判断用户是否为老师 或者 项目负责人
- if (!Processing.checkUserIsTeacher(request, roleMapper) ||
- !projectDAO.isPrincipalUser(Processing.getAuthHeaderToUserId(request), projectId)) {
+ if (!Processing.checkUserIsPrincipal(request, roleDAO)
+ || !projectDAO.isPrincipalUser(Processing.getAuthHeaderToUserId(request), projectId)) {
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
}
@@ -246,30 +216,6 @@ public class ProjectServiceImpl implements ProjectService {
}
- @Override
- @CheckUserHasPermission("project.cutting.user.get")
- public BaseResponse projectGetUserInCutting(Long uid) {
- log.info("\t> 执行 Service 层 ProjectService.projectGetUserInCutting 方法");
- if (userDAO.isExistUser(uid)) {
- List projectCuttingDOList = projectDAO.projectGetUserInCutting(uid);
- return ResultUtil.success(projectCuttingDOList);
- } else {
- return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
- }
- }
-
- @Override
- @CheckUserHasPermission("project.cutting.user.add")
- public BaseResponse projectAddUserForCutting(HttpServletRequest request, Long uid, Long pid) {
- log.info("\t> 执行 Service 层 ProjectService.projectAddUserForCutting 方法");
- if (userDAO.isExistUser(uid)) {
- projectDAO.projectAddUserForCutting(uid, pid);
- return ResultUtil.success();
- } else {
- return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
- }
- }
-
@Override
public BaseResponse getHeader(Integer id) {
log.info("\t> 执行 Service 层 InfoService.getHeader 方法");
@@ -286,9 +232,8 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
- @CheckUserHasPermission("info.project.add")
+ @NeedPermission("info.project.add")
public BaseResponse addHeader(HttpServletRequest request, ProjectShowVO projectShowVO) {
- log.info("\t> 执行 Service 层 InfoService.addHeader 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@@ -313,9 +258,8 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
- @CheckUserHasPermission("info.project.del")
+ @NeedPermission("info.project.del")
public BaseResponse delHeader(Integer id, HttpServletRequest request) {
- log.info("\t> 执行 Service 层 InfoService.delHeader 方法");
// 获取展示信息
ProjectShowDO projectShowDO = projectDAO.getHeader();
// 删除指定展示id
@@ -332,9 +276,8 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
- @CheckUserHasPermission("info.project.edit")
+ @NeedPermission("info.project.edit")
public BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id) {
- log.info("\t> 执行 Service 层 InfoService.editHeader 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@@ -361,160 +304,36 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
- public BaseResponse get(Integer listAll, HttpServletRequest request, List tags, List isFinish, Integer page, Integer pageSize) {
- log.info("\t> 执行 Service 层 ProjectService.get 方法");
-
- //获取用户
- Long userId = Processing.getAuthHeaderToUserId(request);
- //根据标签查询
- if (tags != null && !tags.isEmpty()) {
- List projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
-
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
-
- //根据状态查询
- if (isFinish != null && !isFinish.isEmpty()) {
- List projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
-
-
- //判断是否是老师(项目负责人)
- if (listAll != null && Processing.checkUserIsTeacher(request, roleMapper)) {
- List projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- } else {
- listAll = 0;
- List projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
-
- }
-
- @Override
- public BaseResponse workget(Integer listAll, HttpServletRequest request, List tags, List isFinish, Integer is, Integer page, Integer pageSize) {
- log.info("\t> 执行 Service 层 ProjectService.workget 方法");
-
+ public BaseResponse workGet(
+ HttpServletRequest request,
+ List tags,
+ List isFinish,
+ Integer is,
+ Integer page,
+ Integer pageSize
+ ) {
//获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
- //根据标签查询
- if (tags != null && !tags.isEmpty()) {
- List projectDOList = projectDAO.workget(userId, listAll, tags, isFinish, is);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
+ List projectDOList = projectDAO.workget(userId, tags, isFinish, is);
+ List projectSimpleVOList = new ArrayList<>();
+ for (ProjectDO projectDO : projectDOList) {
+ ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
+ Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
+ projectSimpleVOList.add(projectSimpleVO1);
}
+ //分页返回
+ int start = (page - 1) * pageSize;
+ int end = start + pageSize;
+ List pageData = projectSimpleVOList.subList(start,
+ Math.min(end, projectSimpleVOList.size()));
- //根据状态查询
- if (isFinish != null && !isFinish.isEmpty()) {
- List projectDOList = projectDAO.workget(userId, listAll, tags, isFinish, is);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
+ return ResultUtil.success(pageData);
-
- //判断是否是老师(项目负责人)
- if (listAll != null && Processing.checkUserIsTeacher(request, roleMapper)) {
- List projectDOList = projectDAO.workget(userId, listAll, tags, isFinish, is);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- } else {
- listAll = 0;
- List projectDOList = projectDAO.workget(userId, listAll, tags, isFinish, is);
- List projectSimpleVOList = new ArrayList<>();
- for (ProjectDO projectDO : projectDOList) {
- ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
- Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
- projectSimpleVOList.add(projectSimpleVO1);
- }
- //分页返回
- int start = (page - 1) * pageSize;
- int end = start + pageSize;
- List pageData = projectSimpleVOList.subList(start,
- Math.min(end, projectSimpleVOList.size()));
- return ResultUtil.success(pageData);
- }
}
-
@Override
public BaseResponse getByName(String name) {
- log.info("\t> 执行 Service 层 ProjectService.getByName 方法");
if (projectDAO.getByName(name) == null) {
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
} else {
@@ -524,10 +343,9 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse projectDelete(HttpServletRequest request, List id) {
- log.info("\t> 执行 Service 层 ProjectService.projectDelete 方法");
//判断用户是否为老师 或者 项目负责人
- if (!Processing.checkUserIsTeacher(request, roleMapper)) {
+ if (!Processing.checkUserIsPrincipal(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
}
@@ -541,57 +359,4 @@ public class ProjectServiceImpl implements ProjectService {
}
return ResultUtil.success();
}
-
- @Override
- @CheckUserHasPermission("project.cutting.add")
- public BaseResponse addProjectCutting(HttpServletRequest request, ProjectCuttingAddVO projectCuttingAddVO) {
- log.info("\t> 执行 Service 层 ProjectService.projectCuttingAdd方法");
- //赋值数据
- ProjectCuttingDO projectCuttingDO = new ProjectCuttingDO();
- Processing.copyProperties(projectCuttingAddVO, projectCuttingDO);
- //根据pid检测项目是否存在
- if (!projectDAO.isExistProjectById(projectCuttingAddVO.getPid())) {
- return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
- }
- //向数据库添加数据
- projectDAO.projectCuttingAdd(projectCuttingDO);
- return ResultUtil.success();
- }
-
- @Override
- @CheckUserHasPermission("project.cutting.edit")
- public BaseResponse editProjectCutting(HttpServletRequest request, ProjectCuttingEditVO projectCuttingEditVO) {
- log.info("\t> 执行 Service 层 ProjectService.projectCuttingEdit方法");
- //赋值数据
- ProjectCuttingDO projectCuttingDO = new ProjectCuttingDO();
- Processing.copyProperties(projectCuttingEditVO, projectCuttingDO);
- //根据id检测项目模块是否存在
- if (!projectDAO.isExistProjectCutting(projectCuttingEditVO.getId())) {
- return ResultUtil.error(ErrorCode.PROJECT_CUTTING_NOT_EXIST);
- }
- //向数据库添加数据
- projectDAO.updateProjectCutting(projectCuttingDO);
- return ResultUtil.success();
- }
-
- @Override
- @CheckUserHasPermission("project.cutting.delete")
- public BaseResponse projectToOtherUserForCutting(HttpServletRequest request, Long oldUid, Long pid, Long newUid) {
- log.info("\t> 执行 Service 层 ProjectService.projectToOtherUserForCutting方法");
- //检测新旧用户是否存在
- if (!userDAO.isExistUser(oldUid) || !userDAO.isExistUser(newUid)) {
- return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
- }
- //用户项目表是否含有对应记录
- if (!projectDAO.isExistProjectUser(pid, oldUid)) {
- return ResultUtil.error(ErrorCode.PROJECT_USER_NOT_EXIST);
- }
- //更新数据
- if (!projectDAO.updateUserForProjectUserByPidAndUid(pid, oldUid, newUid)) {
- return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR);
- }
- return ResultUtil.success();
- }
-
-
}
diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
new file mode 100644
index 0000000..b537ee8
--- /dev/null
+++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
@@ -0,0 +1,452 @@
+package com.jsl.oa.services.impl;
+
+
+import com.jsl.oa.common.constant.ReviewConstants;
+import com.jsl.oa.dao.ProjectDAO;
+import com.jsl.oa.dao.ReviewDAO;
+import com.jsl.oa.dao.UserDAO;
+import com.jsl.oa.mapper.ProjectMapper;
+import com.jsl.oa.mapper.UserMapper;
+import com.jsl.oa.model.dodata.ProjectChildDO;
+import com.jsl.oa.model.dodata.ProjectDO;
+import com.jsl.oa.model.dodata.ProjectModuleDO;
+import com.jsl.oa.model.dodata.ReviewDO;
+import com.jsl.oa.model.vodata.ReviewAddVO;
+import com.jsl.oa.model.vodata.ReviewDataVO;
+import com.jsl.oa.model.vodata.ReviewUpdateResultVO;
+import com.jsl.oa.model.vodata.ReviewVO;
+import com.jsl.oa.services.ReviewService;
+import com.jsl.oa.utils.BaseResponse;
+import com.jsl.oa.utils.ErrorCode;
+import com.jsl.oa.utils.Processing;
+import com.jsl.oa.utils.ResultUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ReviewServiceImpl implements ReviewService {
+
+ private final UserDAO userDAO;
+ private final ReviewDAO reviewDAO;
+ private final ProjectDAO projectDAO;
+
+ private final UserMapper userMapper;
+ private final ProjectMapper projectMapper;
+
+
+ @Override
+ public BaseResponse getUserPendingApprovalReview(Integer page,
+ Integer pageSize,
+ HttpServletRequest request) {
+ //获取用户
+ Long userId = Processing.getAuthHeaderToUserId(request);
+
+
+ //存储审核数据的数组
+ List reviewData = new ArrayList<>();
+
+ //先获取用户为项目负责人的项目列表
+ projectDAO.getProjectByPrincipalUser(userId);
+
+ //先从用户为 项目负责人 的项目中获取对应 审核信息
+ for (ProjectDO projectDO : projectDAO.getProjectByPrincipalUser(userId)) {
+ //查询每个项目下所有的审核信息
+ List reviewDOS = reviewDAO.
+ selectApprovedResultReviewFromProject(projectDO.getId(),
+ ReviewConstants.PENDING);
+ //封装VO类
+ reviewData.addAll(reviewDOS);
+ }
+
+ //在从用户为 子系统负责人 的项目中获取对应 审核信息
+ for (ProjectChildDO projectChildDO : projectDAO.getAllProjectChildByUId(userId)) {
+ //查询每个项目下状态为2的审核信息
+ List reviewDOS = reviewDAO.
+ selectApprovedResultReviewsFromSubsystem(projectChildDO.getId(),
+ ReviewConstants.PENDING);
+ //封装VO类
+ reviewData.addAll(reviewDOS);
+ }
+
+
+ //在从用户为 子模块负责人 的项目中获取对应 审核信息
+ for (ProjectModuleDO projectModuleDO : projectDAO.getAllModuleByUId(userId)) {
+ //查询每个项目下所有的审核信息
+ List reviewDOS = reviewDAO.
+ selectApprovedResultReviewsFromSubModule(projectModuleDO.getId(),
+ ReviewConstants.PENDING);
+ //封装VO类
+ reviewData.addAll(reviewDOS);
+ }
+
+
+ //根据id进行去重
+ reviewData = reviewData.stream()
+ .collect(Collectors.toMap(ReviewDO::getId, review -> review, (existing, replacement) -> existing))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
+
+
+ //按照申请时间降序排序
+ Collections.sort(reviewData, new Comparator