From a854c41f2468b82400d29dd5f580c58e8e4d3211 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Tue, 12 Mar 2024 13:11:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 2a6d2be..2a3a169 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -214,8 +214,14 @@ public class ProjectDAO { } - public List tget(Integer id) { + public List tget(Integer id, List tags, Integer isFinish) { log.info("DAO层"); + if(isFinish != null){ + return projectMapper.tgetByIsfinish(isFinish); + } + if(tags != null && !tags.isEmpty()){ + return projectMapper.tgetByTags(tags); + } return projectMapper.tget(id); } } From 1864f90fe0b3b7ceed16622cc99d11aeeff389a1 Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Tue, 12 Mar 2024 14:19:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsl/oa/controllers/ProjectController.java | 6 +-- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 8 +--- src/main/java/com/jsl/oa/dao/RoleDAO.java | 8 ++++ .../java/com/jsl/oa/mapper/ProjectMapper.java | 6 --- .../jsl/oa/model/doData/ProjectWorkDO.java | 35 ++++++----------- .../jsl/oa/model/voData/ProjectWorkVO.java | 38 ++++++------------- .../jsl/oa/model/voData/UserProfileVo.java | 1 + .../com/jsl/oa/services/ProjectService.java | 2 +- .../oa/services/impl/ProjectServiceImpl.java | 16 +------- .../jsl/oa/services/impl/UserServiceImpl.java | 6 +-- .../com/jsl/oa/mapper/ProjectMapper.xml | 23 ++++------- 11 files changed, 48 insertions(+), 101 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 17a1652..e1b2f3a 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -42,11 +42,9 @@ public class ProjectController { * @return */ @GetMapping("/project/get/custom") - public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id, - @RequestParam(required = false) List tags, - @RequestParam(required = false) Integer isFinish){ + public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id){ log.info("请求接口[GET]: /project/all/get"); - return projectService.tget(id,tags,isFinish); + return projectService.tget(id); } diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 2a3a169..2a6d2be 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -214,14 +214,8 @@ public class ProjectDAO { } - public List tget(Integer id, List tags, Integer isFinish) { + public List tget(Integer id) { log.info("DAO层"); - if(isFinish != null){ - return projectMapper.tgetByIsfinish(isFinish); - } - if(tags != null && !tags.isEmpty()){ - return projectMapper.tgetByTags(tags); - } return projectMapper.tget(id); } } diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index a390482..2b0e97a 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -77,6 +77,14 @@ public class RoleDAO { } + public RoleDO getRoleNameByUid(Long uid){ + log.info("\t> 执行 DAO 层 RoleDAO.getRoleNameByUid 方法"); + log.info("\t\t> 从 MySQL 获取数据"); + RoleDO roleDO = roleMapper.getRoleById(getRoleUserByUid(uid).getRid()); + return roleDO; + } + + public boolean roleEdit(RoleDO getRole) { log.info("\t> 执行 DAO 层 RoleDAO.roleEdit 方法"); log.info("\t\t> 从 MySQL 获取数据"); diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 96aecbb..7615dcc 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -97,10 +97,4 @@ public interface ProjectMapper { //@Select("select * from organize_oa.oa_project where is_delete=false and status=1") List tget(Integer id); - - @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false") - List tgetByIsfinish(Integer isFinish); - - - List tgetByTags(List tags); } diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java index 4253f19..e177614 100644 --- a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java +++ b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java @@ -1,27 +1,16 @@ package com.jsl.oa.model.doData; +/* + 张睿相 Java +*/ -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) +/** + * 总体描述 + *

创建时间：2024/3/11 21:54

+ * + * @author 张睿相 + * @since v1.0 + */ public class ProjectWorkDO { - private Long id; - private Long pid; - private Long projectId; - private Long principalId; - private Integer cycle; - private Integer workLoad; - private Integer type; - private String name; - private String description; - private Integer isDelete; - private Integer isFinish; - private boolean status; - private Timestamp beginTime; - private Timestamp completeTime; } + + diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java index 15603cf..c61f718 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java +++ b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java @@ -1,30 +1,16 @@ package com.jsl.oa.model.voData; +/* + 张睿相 Java +*/ -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.sql.Timestamp; - -@Data +/** + * 总体描述 + *

创建时间：2024/3/11 21:54

+ * + * @author 张睿相 + * @since v1.0 + */ public class ProjectWorkVO { - - private Long pid; - @NotNull(message = "项目id不能为空") - private Long projectId; - @NotNull(message = "负责人id不能为空") - private Long principalId; - @NotNull(message = "周期不能为空") - private Integer cycle; - - private Integer workLoad; - @NotNull(message = "类型不能为空") - private Integer type; - @NotNull(message = "名字不能为空") - private String name; - private String description; - private Integer isDelete; - private Integer isFinish; - private Integer status; - private Timestamp beginTime; - private Timestamp completeTime; } + + diff --git a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java b/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java index 213e68b..c94fc1f 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java +++ b/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java @@ -17,6 +17,7 @@ public class UserProfileVo { private String nickname; private String sex; private String description; + private String role; } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 5d02de5..0e3fc17 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -40,5 +40,5 @@ public interface ProjectService { BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); - BaseResponse tget(Integer id, List tags, Integer isFinish); + BaseResponse tget(Integer id); } 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 f54d986..636003c 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -61,21 +61,9 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse tget(Integer id, List tags, Integer isFinish) { + public BaseResponse tget(Integer id) { log.info("\t> 执行 Service 层 ProjectService.tget 方法"); - - //根据状态查询 - if(isFinish != null){ - List projectDOList = projectDAO.tget(id,tags,isFinish); - return ResultUtil.success(projectDOList); - } - //根据标签查询 - if(tags != null && !tags.isEmpty()){ - List projectDOList = projectDAO.tget(id,tags,isFinish); - return ResultUtil.success(projectDOList); - } - - List projectDOList = projectDAO.tget(id,tags,isFinish); + List projectDOList = projectDAO.tget(id); return ResultUtil.success(projectDOList); } diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 9209089..2bd7f96 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -257,16 +257,12 @@ public class UserServiceImpl implements UserService { @Override public BaseResponse userProfileGet(HttpServletRequest request) { log.info("\t> 执行 Service 层 UserService.userProfileGet 方法"); - //判断用户是否为 老师 或 管理员 - if(!Processing.checkUserIsAdmin(request,roleDAO.roleMapper) && - !Processing.checkUserIsTeacher(request,roleDAO.roleMapper)){ - return ResultUtil.error(ErrorCode.NOT_PERMISSION); - } // 获取用户Id UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)); UserProfileVo userProfileVo = new UserProfileVo(); Processing.copyProperties(userDO, userProfileVo); + userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName()); userProfileVo.setSex(Processing.getSex(userDO.getSex())); return ResultUtil.success(userProfileVo); } diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 7cdbd56..63a556f 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -48,21 +48,22 @@ - - - \ No newline at end of file From 7596e1972147023b66c71c7ad8ef4fab9f6821de Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Tue, 12 Mar 2024 14:26:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsl/oa/model/doData/ProjectWorkDO.java | 38 ++++++++++++------- .../jsl/oa/model/voData/ProjectWorkVO.java | 37 ++++++++++++------ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java index e177614..6dcd3fa 100644 --- a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java +++ b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java @@ -1,16 +1,28 @@ + package com.jsl.oa.model.doData; -/* - 张睿相 Java -*/ -/** - * 总体描述 - *

创建时间：2024/3/11 21:54

- * - * @author 张睿相 - * @since v1.0 - */ +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 ProjectWorkDO { -} - - + private Long id; + private Long pid; + private Long projectId; + private Long principalId; + private Integer cycle; + private Integer workLoad; + private Integer type; + private String name; + private String description; + private Integer isDelete; + private Integer isFinish; + private boolean status; + private Timestamp beginTime; + private Timestamp completeTime; +} \ No newline at end of file diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java index c61f718..18eac73 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java +++ b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java @@ -1,16 +1,31 @@ package com.jsl.oa.model.voData; -/* - 张睿相 Java -*/ -/** - * 总体描述 - *

创建时间：2024/3/11 21:54

- * - * @author 张睿相 - * @since v1.0 - */ +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.sql.Timestamp; + +@Data public class ProjectWorkVO { + + private Long pid; + @NotNull(message = "项目id不能为空") + private Long projectId; + @NotNull(message = "负责人id不能为空") + private Long principalId; + @NotNull(message = "周期不能为空") + private Integer cycle; + + private Integer workLoad; + @NotNull(message = "类型不能为空") + private Integer type; + @NotNull(message = "名字不能为空") + private String name; + private String description; + private Integer isDelete; + private Integer isFinish; + private Integer status; + private Timestamp beginTime; + private Timestamp completeTime; } -