Upload
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good

This commit is contained in:
筱锋xiao_lfeng 2024-03-15 17:39:06 +08:00
parent 5075426bcf
commit 424fddd2ed
3 changed files with 22 additions and 19 deletions

View File

@ -65,7 +65,9 @@ public class ShiroConfiguration {
filterChainDefinitionMap.put("/project/get", "anon"); // 信息接口允许匿名访问 filterChainDefinitionMap.put("/project/get", "anon"); // 信息接口允许匿名访问
filterChainDefinitionMap.put("/project/get/custom", "anon"); // 游客获取项目允许匿名访问 filterChainDefinitionMap.put("/project/get/custom", "anon"); // 游客获取项目允许匿名访问
filterChainDefinitionMap.put("/project/add", "anon"); // 信息接口允许匿名访问 filterChainDefinitionMap.put("/project/add", "anon"); // 信息接口允许匿名访问
filterChainDefinitionMap.put("/project/work/add", "anon"); // 信息接口允许匿名访问
filterChainDefinitionMap.put("/tags/project/list", "anon"); // 信息接口允许匿名访问 filterChainDefinitionMap.put("/tags/project/list", "anon"); // 信息接口允许匿名访问
filterChainDefinitionMap.put("/module/add", "anon"); // 信息接口允许匿名访问
filterChainDefinitionMap.put("/**/**", "authc"); // 其他接口一律拦截(需要Token) filterChainDefinitionMap.put("/**/**", "authc"); // 其他接口一律拦截(需要Token)

View File

@ -39,14 +39,15 @@ public class ProjectController {
/** /**
* 游客获取项目 * 游客获取项目
*
* @return * @return
*/ */
@GetMapping("/project/get/custom") @GetMapping("/project/get/custom")
public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id, public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id,
@RequestParam(required = false) List<String> tags, @RequestParam(required = false) List<String> tags,
@RequestParam(required = false) List<Integer> isFinish){ @RequestParam(required = false) List<Integer> isFinish) {
log.info("请求接口[GET]: /project/all/get"); log.info("请求接口[GET]: /project/all/get");
return projectService.tget(id,tags,isFinish); return projectService.tget(id, tags, isFinish);
} }
@ -61,7 +62,7 @@ public class ProjectController {
@RequestParam(required = false) List<Integer> isFinish, @RequestParam(required = false) List<Integer> isFinish,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[GET]: /project/get"); log.info("请求接口[GET]: /project/get");
return projectService.get(listAll,request,tags,isFinish); return projectService.get(listAll, request, tags, isFinish);
} }
/** /**
@ -71,12 +72,12 @@ public class ProjectController {
*/ */
@GetMapping("/project/work/get") @GetMapping("/project/work/get")
public BaseResponse projectWorkGet(@RequestParam(required = false) Integer listAll, public BaseResponse projectWorkGet(@RequestParam(required = false) Integer listAll,
@RequestParam(required = false) List<String> tags, @RequestParam(required = false) List<String> tags,
@RequestParam(required = false) List<Integer> isFinish, @RequestParam(required = false) List<Integer> isFinish,
@RequestParam(required = false) Integer is, @RequestParam(required = false) Integer is,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[GET]: /project/work/get"); log.info("请求接口[GET]: /project/work/get");
return projectService.workget(listAll, request, tags, isFinish,is); return projectService.workget(listAll, request, tags, isFinish, is);
} }
/** /**
@ -172,9 +173,9 @@ public class ProjectController {
* @Description: 项目的修改 * @Description: 项目的修改
* @Date: 2024/3/10 * @Date: 2024/3/10
* @Param request: * @Param request:
* @Param projectEdit: * @Param projectEdit:
* @Param bindingResult: * @Param bindingResult:
* @Param projectId: * @Param projectId:
**/ **/
@PutMapping("/project/edit/{projectId}") @PutMapping("/project/edit/{projectId}")
public BaseResponse projectEditById(HttpServletRequest request, @RequestBody @Validated ProjectEditVO projectEdit, public BaseResponse projectEditById(HttpServletRequest request, @RequestBody @Validated ProjectEditVO projectEdit,
@ -184,12 +185,13 @@ public class ProjectController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult)); return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
} }
return projectService.projectEdit(request, projectEdit,projectId); return projectService.projectEdit(request, projectEdit, projectId);
} }
/** /**
* 子系统子模块的增加 * 子系统子模块的增加
*
* @param request * @param request
* @param bindingResult * @param bindingResult
* @return * @return
@ -283,24 +285,24 @@ public class ProjectController {
@PutMapping("/project/cut/user/to") @PutMapping("/project/cut/user/to")
public BaseResponse projectToOtherUserForCutting(HttpServletRequest request, @RequestParam Long oldUid public BaseResponse projectToOtherUserForCutting(HttpServletRequest request, @RequestParam Long oldUid
, @RequestParam Long pid,@RequestParam Long newUid) { , @RequestParam Long pid, @RequestParam Long newUid) {
log.info("请求接口[Put]: /project/cut/user/to"); log.info("请求接口[Put]: /project/cut/user/to");
// 判断是否有参数错误 // 判断是否有参数错误
if (oldUid == null || pid == null || newUid==null) { if (oldUid == null || pid == null || newUid == null) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR); return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR);
} }
return projectService.projectToOtherUserForCutting(request, oldUid, pid , newUid); return projectService.projectToOtherUserForCutting(request, oldUid, pid, newUid);
} }
@GetMapping("/project/file") @GetMapping("/project/file")
public BaseResponse getProjectFile(HttpServletRequest request, @RequestParam Long projectId){ public BaseResponse getProjectFile(HttpServletRequest request, @RequestParam Long projectId) {
log.info("请求接口[Get]: /project/file"); log.info("请求接口[Get]: /project/file");
//判断是否有参数错误 //判断是否有参数错误
if(projectId == null){ if (projectId == null) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR); return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR);
} }
return projectService.projectFileGet(request,projectId); return projectService.projectFileGet(request, projectId);
} }

View File

@ -47,7 +47,6 @@ public class ProjectServiceImpl implements ProjectService {
private final UserDAO userDAO; private final UserDAO userDAO;
@Override @Override
@CheckUserHasPermission("project.add")
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) { public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法"); log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
projectDAO.projectAdd(projectAdd); projectDAO.projectAdd(projectAdd);