From cdf29a8f6fb9990f82ccc1d3f47bfba48cfaf4fc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 10 一月 2024 17:24:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 483d93a..ad1e21d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -1,6 +1,7 @@
package com.zt.life.modules.project.controller;
+import cn.hutool.core.convert.Convert;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
@@ -12,8 +13,13 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.core.context.UserContext;
+import com.zt.core.sys.model.SysUser;
+import com.zt.life.modules.project.dto.ProjectUserDto;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,69 +29,102 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* project
*
- * @author zt generator
- * @since 1.0.0 2023-11-06
+ * @author zt generator
+ * @since 1.0.0 2023-11-07
*/
@RestController
-@RequestMapping("/project/")
-@Api(tags="project")
+@RequestMapping("/project/Project/")
+@Api(tags = "project")
public class ProjectController {
@Autowired
private ProjectService projectService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysUserService sysUserService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"),
+ @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
+ @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
+ @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),
+ @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ"),
+ @ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "pageCode", value = "椤甸潰鏍囪瘑", dataType = Constant.QT.STRING),
})
- public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
-
- return PageResult.ok(projectService.page(queryFilter));
+ public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ if (queryFilter.getParams().containsValue("baseline_release") || queryFilter.getParams().containsValue("config_item_warehouse") || queryFilter.getParams().containsValue("test_review_comment")) {
+ queryFilter.getParams().replace("tableName", "");
+ }
+ List<Project> Project = projectService.page(queryFilter);
+ for (Project project2 :Project){
+ String leaderName = project2.getProjectLeader();
+ if (leaderName.length()>10){
+ leaderName=sysUserService.getNames(leaderName);
+ }
+ project2.setProjectLeader(leaderName);
+ }
+ return PageResult.ok(Project);
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<Project> get(@PathVariable("id") Long id){
+ public Result<Project> get(@PathVariable("id") Long id) {
Project data = projectService.get(id);
-
+ if (data.getBizDeptId() == null) {
+ data.setBizDeptId(UserContext.getDeptId().toString());
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody Project project){
+ public Result insert(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "project");
+ map.put("year", year);
+ project.setYear(year);
+ project.setCode(sysCodeRuleService.getNewCode(map));
projectService.insert(project);
-
return Result.ok();
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Project project){
+ public Result update(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
projectService.update(project);
-
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteProject")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
projectService.delete(ids);
@@ -93,4 +132,16 @@
return Result.ok();
}
+ @GetMapping("getUsersLists")
+ @ApiOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ @LogOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ public Result<ProjectUserDto> getUsersLists(String deptId) {
+ ProjectUserDto projectUserDto = new ProjectUserDto();
+ projectUserDto.setZrr(sysUserService.getUsersList("zrr", deptId));
+ projectUserDto.setCsry(sysUserService.getUsersList("csry", deptId));
+ projectUserDto.setShry(sysUserService.getUsersList("shry", deptId));
+ projectUserDto.setPzry(sysUserService.getUsersList("pzry", deptId));
+ return Result.ok(projectUserDto);
+ }
+
}
--
Gitblit v1.9.1