From 1b0820a5aa99c2047797bc0723d19883175322d7 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 1 Feb 2023 16:41:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/pom.xml | 6 ++- .../common/constant/ProjectDeclareConstants.java | 2 +- .../controller/DeclaredProjectController.java | 53 ++++++++++++++++++++ .../entity/dto/DeclaredProjectParamDto.java | 34 +++++++++++++ .../declared/manage/DeclaredProjectManage.java | 56 ++++++++++++++++++++++ .../controller/OrganizationProcdefController.java | 4 +- .../pmapi/sys/controller/SysProcdefController.java | 4 +- 7 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/declared/controller/DeclaredProjectController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/dto/DeclaredProjectParamDto.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java diff --git a/pmapi/pom.xml b/pmapi/pom.xml index bbc5acf..3748d36 100644 --- a/pmapi/pom.xml +++ b/pmapi/pom.xml @@ -258,6 +258,11 @@ nd-file-starter 1.0.0 + + com.ningdatech + nd-zwdd-starter + 1.0.0 + @@ -337,7 +342,6 @@ org.apache.maven.plugins maven-surefire-plugin - true diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/ProjectDeclareConstants.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/ProjectDeclareConstants.java index 0f18c2b..d0409a0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/ProjectDeclareConstants.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/ProjectDeclareConstants.java @@ -34,7 +34,7 @@ public interface ProjectDeclareConstants { // 是否首次新建 public static final String FIRST_NEW_CONSTRUCTION = "firstNewConstruction"; // 预算年度 - public static final String BUDGET_YEAR = "budgetYear"; + public static final String BUDGET_YEAR = "projectYear"; // 建设开始时间 public static final String CONSTRUCTION_START_TIME = "constructionStartTime"; // 建设结束时间 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/declared/controller/DeclaredProjectController.java b/pmapi/src/main/java/com/ningdatech/pmapi/declared/controller/DeclaredProjectController.java new file mode 100644 index 0000000..cabc31e --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/declared/controller/DeclaredProjectController.java @@ -0,0 +1,53 @@ +package com.ningdatech.pmapi.declared.controller; + +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectParamDto; +import com.ningdatech.pmapi.declared.manage.DeclaredProjectManage; +import com.wflow.bean.vo.NdDeclaredProjectVo; +import com.wflow.workflow.bean.vo.ProcessStartParamsVo; +import com.wflow.workflow.service.ProcessInstanceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * @Classname DeclaredProjectController + * @Description 申报项目 + * @Date 2023/1/31 11:29 + * @Author PoffyZhang + */ +@Slf4j +@Validated +@RestController +@RequestMapping("/api/v1/declared") +@Api(value = "DeclaredProject", tags = "申报管理-申报项目") +@RequiredArgsConstructor +public class DeclaredProjectController { + private final ProcessInstanceService processService; + + private final DeclaredProjectManage declaredProjectManage; + + @ApiOperation(value = "申报项目已申报列表", notes = "申报项目已申报列表") + @GetMapping("/list") + public PageVo list(@Validated @ModelAttribute DeclaredProjectParamDto params) {; + return declaredProjectManage.page(params); + } + + @ApiOperation(value = "申报项目草稿箱", notes = "申报项目草稿箱") + @GetMapping("/draft") + public PageVo draft(@Validated @ModelAttribute ProcessStartParamsVo params) { + return PageVo.empty(); + } + + @ApiOperation(value = "申报项目", notes = "申报项目") + @PostMapping("/start/{defId}") + public String startTheProcess(@PathVariable String defId, + @RequestBody ProcessStartParamsVo params) { + String instanceId = processService.startProcess(defId, params); + return "启动流程实例 " + instanceId + " 成功"; + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/dto/DeclaredProjectParamDto.java b/pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/dto/DeclaredProjectParamDto.java new file mode 100644 index 0000000..04f1a2b --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/dto/DeclaredProjectParamDto.java @@ -0,0 +1,34 @@ +package com.ningdatech.pmapi.declared.entity.dto; + +import com.ningdatech.basic.model.PagePo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Classname DeclaredProjectParamDto + * @Description + * @Date 2023/2/1 14:52 + * @Author PoffyZhang + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeclaredProjectParamDto extends PagePo { + + private String projectName; + + private Integer projectType; + + private Integer projectStatusFirst; + + private Integer projectStatusSecond; + + private Integer projectYear; + + private String startTime; + + private String endTime; +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java new file mode 100644 index 0000000..0e8f80d --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java @@ -0,0 +1,56 @@ +package com.ningdatech.pmapi.declared.manage; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectParamDto; +import com.wflow.bean.entity.NdDeclaredProject; +import com.wflow.bean.vo.NdDeclaredProjectVo; +import com.wflow.service.NdDeclaredProjectService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @Classname DeclaredProjectManage + * @Description + * @Date 2023/2/1 14:48 + * @Author PoffyZhang + */ +@Component +@Slf4j +@RequiredArgsConstructor +public class DeclaredProjectManage { + + private final NdDeclaredProjectService declaredProjectService; + + public PageVo page(DeclaredProjectParamDto params) { + Page page = params.page(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(NdDeclaredProject.class) + .ge(Objects.nonNull(params.getStartTime()), NdDeclaredProject::getCreateOn, params.getStartTime()) + .le(Objects.nonNull(params.getEndTime()), NdDeclaredProject::getCreateOn, params.getEndTime()) + .eq(Objects.nonNull(params.getProjectType()), NdDeclaredProject::getProjectType, params.getProjectType()) + .eq(Objects.nonNull(params.getProjectYear()), NdDeclaredProject::getProjectYear, params.getProjectYear()) + .eq(Objects.nonNull(params.getProjectStatusFirst()), NdDeclaredProject::getProjectStatusFirst, params.getProjectStatusFirst()) + .eq(Objects.nonNull(params.getProjectStatusSecond()), NdDeclaredProject::getProjectStatusSecond, params.getProjectStatusSecond()) + .like(StringUtils.isNotBlank(params.getProjectName()), NdDeclaredProject::getProjectName, params.getProjectName()) + .orderByDesc(NdDeclaredProject::getUpdateOn); + declaredProjectService.page(page,wrapper); + if(0L == page.getTotal()){ + return PageVo.empty(); + } + List res = page.getRecords().stream().map(record -> { + NdDeclaredProjectVo vo = new NdDeclaredProjectVo(); + BeanUtils.copyProperties(record, vo); + return vo; + }).collect(Collectors.toList()); + return PageVo.of(res,page.getTotal()); + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java index ec2c093..92e7e96 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java @@ -34,9 +34,9 @@ public class OrganizationProcdefController { @ApiOperation(value = "单位流程配置列表", notes = "单位流程配置列表") @GetMapping("/list") - public PageVo list(@RequestParam String orgCode, @RequestParam(defaultValue = "1") Integer pageNum, + public PageVo list(@RequestParam String orgCode, @RequestParam(defaultValue = "1") Integer pageNumber, @RequestParam(defaultValue = "10") Integer pageSize) { - return orgProcdefService.getOrgProcessByOrgCode(orgCode, pageNum, pageSize); + return orgProcdefService.getOrgProcessByOrgCode(orgCode, pageNumber, pageSize); } @ApiOperation(value = "单位流程配置详情", notes = "单位流程配置详情") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcdefController.java index 63375a3..6e93851 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcdefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcdefController.java @@ -33,9 +33,9 @@ public class SysProcdefController { @ApiOperation(value = "系统流程配置列表", notes = "系统流程配置列表") @GetMapping("/list") - public PageVo list(@RequestParam String regionCode, @RequestParam(defaultValue = "1") Integer pageNum, + public PageVo list(@RequestParam String regionCode, @RequestParam(defaultValue = "1") Integer pageNumber, @RequestParam(defaultValue = "10") Integer pageSize) { - return modelGroupService.getModelsPage(regionCode,pageNum,pageSize); + return modelGroupService.getModelsPage(regionCode,pageNumber,pageSize); } @ApiOperation(value = "系统流程配置详情", notes = "系统流程配置详情") From 7b7dc6f0107c871ceb0efa6af63778f74f2eaf35 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 1 Feb 2023 17:35:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/common/utils/BizUtils.java | 14 ++++ .../controller/ProjectLibController.java | 36 ++++++++++ .../pmapi/projectlib/manage/ProjectLibManage.java | 84 ++++++++++++++++++++++ .../projectlib/model/req/ProjectLibListReq.java | 64 +++++++++++++++++ .../projectlib/model/vo/ProjectLibListItemVO.java | 58 +++++++++++++++ 5 files changed, 256 insertions(+) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectLibListReq.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java index fd5eb4e..20cf2f1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java @@ -7,6 +7,7 @@ import org.springframework.util.NumberUtils; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -36,4 +37,17 @@ public class BizUtils { return splitToNum(str, Long.class); } + + public static void notNull(T obj, Consumer consumer) { + if (obj != null) { + consumer.accept(obj); + } + } + + public static void notBlank(String str,Consumer consumer) { + if (StrUtil.isNotBlank(str)) { + consumer.accept(str); + } + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java new file mode 100644 index 0000000..e253c82 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java @@ -0,0 +1,36 @@ +package com.ningdatech.pmapi.projectlib.controller; + +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; +import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq; +import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * ProjectLibController + *

+ * + * @author WendyYang + * @since 17:30 2023/2/1 + */ +@RestController +@RequestMapping("/api/v1/project/lib") +@AllArgsConstructor +@Api(tags = "项目库") +public class ProjectLibController { + + private final ProjectLibManage projectLibManage; + + @GetMapping("/list") + @ApiOperation("项目库列表") + public PageVo projectLibList(ProjectLibListReq req) { + return projectLibManage.projectLibList(req); + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java new file mode 100644 index 0000000..517d91a --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -0,0 +1,84 @@ +package com.ningdatech.pmapi.projectlib.manage; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq; +import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; +import com.wflow.bean.entity.NdDeclaredProject; +import com.wflow.service.NdDeclaredProjectService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +import static com.ningdatech.pmapi.common.utils.BizUtils.notBlank; +import static com.ningdatech.pmapi.common.utils.BizUtils.notNull; + +/** + *

+ * ProjectLibManage + *

+ * + * @author WendyYang + * @since 14:19 2023/2/1 + */ +@Component +@RequiredArgsConstructor +public class ProjectLibManage { + + private final NdDeclaredProjectService declaredProjectService; + + private LambdaQueryWrapper projectLibQuery(ProjectLibListReq req) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(NdDeclaredProject.class); + notBlank(req.getProjectName(), w -> query.like(NdDeclaredProject::getProjectName, w)); + notNull(req.getProjectType(), w -> query.eq(NdDeclaredProject::getProjectType, w)); + notNull(req.getProjectYear(), w -> query.eq(NdDeclaredProject::getProjectYear, w)); + // 申报金额 批复金额 + notNull(req.getApprovedAmountMin(), w -> query.ge(NdDeclaredProject::getApprovedAmount, w)); + notNull(req.getApprovedAmountMax(), w -> query.le(NdDeclaredProject::getApprovedAmount, w)); + + notNull(req.getDeclaredAmountMax(), w -> query.le(NdDeclaredProject::getDeclaredAmount, w)); + notNull(req.getDeclaredAmountMin(), w -> query.ge(NdDeclaredProject::getDeclaredAmount, w)); + // 状态查询 + notNull(req.getStatus1st(), w -> query.ge(NdDeclaredProject::getProjectStatusFirst, w)); + notNull(req.getStatus2nd(), w -> query.ge(NdDeclaredProject::getProjectStatusSecond, w)); + + notNull(req.getCreateOnMin(), w -> query.ge(NdDeclaredProject::getCreateOn, w)); + notNull(req.getCreateOnMax(), w -> query.le(NdDeclaredProject::getCreateOn, w)); + + notBlank(req.getApplyOrg(), w -> query.like(NdDeclaredProject::getOrgName, w)); + + query.orderByDesc(NdDeclaredProject::getUpdateOn, NdDeclaredProject::getCreateOn); + // TODO 区域编码处理 + return query; + } + + public PageVo projectLibList(ProjectLibListReq req) { + LambdaQueryWrapper query = projectLibQuery(req); + Page page = declaredProjectService.page(req.page(), query); + long total; + if ((total = page.getTotal()) == 0) { + return PageVo.empty(); + } + List records = CollUtils.convert(page.getRecords(), w -> { + ProjectLibListItemVO item = new ProjectLibListItemVO(); + item.setId(w.getId()); + item.setProjectName(w.getProjectName()); + item.setCreateOn(w.getCreateOn()); + item.setDeclaredAmount(w.getDeclaredAmount()); + item.setStatus1st(w.getProjectStatusFirst()); + item.setStatus2nd(w.getProjectStatusSecond()); + item.setProjectType(w.getProjectType()); + item.setProjectYear(w.getProjectYear()); + item.setApplyOrg(w.getOrgName()); + item.setBizArea(w.getBizArea()); + return item; + }); + return PageVo.of(records, total); + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectLibListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectLibListReq.java new file mode 100644 index 0000000..1b31e38 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectLibListReq.java @@ -0,0 +1,64 @@ +package com.ningdatech.pmapi.projectlib.model.req; + +import com.ningdatech.basic.model.PagePo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * ProjectLibListReq + *

+ * + * @author WendyYang + * @since 14:35 2023/2/1 + */ +@Data +@ApiModel("项目库列表查询") +@EqualsAndHashCode(callSuper = true) +public class ProjectLibListReq extends PagePo { + + @ApiModelProperty("区域编码") + private String regionCode; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("申报单位") + private String applyOrg; + + @ApiModelProperty("项目类型") + private Integer projectType; + + @ApiModelProperty("预算年度") + private Integer projectYear; + + @ApiModelProperty("项目状态") + private Integer status1st; + + @ApiModelProperty("项目状态") + private Integer status2nd; + + @ApiModelProperty("申报金额") + private BigDecimal declaredAmountMin; + + @ApiModelProperty("申报金额") + private BigDecimal declaredAmountMax; + + @ApiModelProperty("批复金额") + private BigDecimal approvedAmountMin; + + @ApiModelProperty("批复金额") + private BigDecimal approvedAmountMax; + + @ApiModelProperty("创建时间") + private LocalDateTime createOnMin; + + @ApiModelProperty("创建时间") + private LocalDateTime createOnMax; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java new file mode 100644 index 0000000..6639063 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java @@ -0,0 +1,58 @@ +package com.ningdatech.pmapi.projectlib.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * ProjectLibListItemVO + *

+ * + * @author WendyYang + * @since 15:13 2023/2/1 + */ +@Data +@ApiModel("项目库列表视图") +public class ProjectLibListItemVO { + + @ApiModelProperty("项目ID") + private Long id; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("申报金额") + private BigDecimal declaredAmount; + + @ApiModelProperty("批复金额") + private BigDecimal approvedAmount; + + @ApiModelProperty("项目类型") + private Integer projectType; + + @ApiModelProperty("项目状态") + private Integer status1st; + + @ApiModelProperty("项目状态") + private Integer status2nd; + + @ApiModelProperty("申报年度") + private Integer projectYear; + + @ApiModelProperty("申报单位") + private String applyOrg; + + @ApiModelProperty("业务领域") + private String bizArea; + + @ApiModelProperty("创建时间") + private LocalDateTime createOn; + + @ApiModelProperty("修改时间") + private LocalDateTime updateOn; + +} From 5a1444731ea4c918904ff265516fc5d31a7ebb36 Mon Sep 17 00:00:00 2001 From: Lierbao Date: Wed, 1 Feb 2023 17:48:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/GeneratorCodeKingbaseConfig.java | 2 +- .../pmapi/todocenter/manage/TodoCenterManage.java | 14 ++- .../user/controller/NdUserAuthController.java | 20 ++++ .../user/controller/NdUserInfoController.java | 20 ++++ .../ningdatech/pmapi/user/entity/NdUserAuth.java | 99 +++++++++++++++++++ .../ningdatech/pmapi/user/entity/NdUserInfo.java | 109 +++++++++++++++++++++ .../pmapi/user/mapper/NdUserAuthMapper.java | 16 +++ .../pmapi/user/mapper/NdUserAuthMapper.xml | 5 + .../pmapi/user/mapper/NdUserInfoMapper.java | 16 +++ .../pmapi/user/mapper/NdUserInfoMapper.xml | 5 + .../pmapi/user/mapper/UserAuthMapper.java | 2 +- .../pmapi/user/service/INdUserAuthService.java | 16 +++ .../pmapi/user/service/INdUserInfoService.java | 16 +++ .../user/service/impl/NdUserAuthServiceImpl.java | 20 ++++ .../user/service/impl/NdUserInfoServiceImpl.java | 20 ++++ 15 files changed, 370 insertions(+), 10 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserAuthController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserInfoController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java index f0e3436..5d6692a 100644 --- a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java +++ b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java @@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig { } public static void main(String[] args) { - generate("WendyYang", "sys", PATH_YYD, "nd_role_menu_datascope"); + generate("Lierbao", "user", PATH_LXX, "nd_user_auth"); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index ce658b9..3e34752 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1,4 +1,5 @@ package com.ningdatech.pmapi.todocenter.manage; + import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -6,6 +7,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.basic.exception.BizException; +import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.NdDateUtils; import com.ningdatech.pmapi.common.constant.ProjectDeclareConstants; import com.ningdatech.pmapi.common.util.ExcelDownUtil; @@ -16,6 +18,8 @@ import com.ningdatech.pmapi.todocenter.constant.HisProInsEndActId; import com.ningdatech.pmapi.todocenter.enums.ProcessStatusEnum; import com.ningdatech.pmapi.todocenter.extension.cmd.BackToHisApprovalNodeCmd; import com.ningdatech.pmapi.todocenter.model.dto.req.ReqProcessHandlerDTO; +import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedDTO; +import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProcessedDTO; import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProjectListExportDTO; import com.ningdatech.pmapi.user.util.LoginUserUtil; import com.wflow.bean.do_.UserDo; @@ -34,8 +38,9 @@ import com.wflow.workflow.bean.process.props.ApprovalProps; import com.wflow.workflow.bean.vo.ProcessProgressVo; import com.wflow.workflow.bean.vo.ProcessTaskVo; import com.wflow.workflow.config.WflowGlobalVarDef; -import com.wflow.workflow.service.*; import com.wflow.workflow.service.FormService; +import com.wflow.workflow.service.*; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.Maps; import org.flowable.engine.*; @@ -46,15 +51,8 @@ import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.flowable.task.api.TaskQuery; - import org.flowable.variable.api.history.HistoricVariableInstance; import org.springframework.stereotype.Component; -import com.ningdatech.basic.model.PageVo; - -import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedDTO; -import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProcessedDTO; -import lombok.RequiredArgsConstructor; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserAuthController.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserAuthController.java new file mode 100644 index 0000000..5ca59b0 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserAuthController.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.user.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *

+ * 前端控制器 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@Controller +@RequestMapping("/pmapi.user/nd-user-auth") +public class NdUserAuthController { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserInfoController.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserInfoController.java new file mode 100644 index 0000000..1ac0332 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserInfoController.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.user.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *

+ * 前端控制器 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@Controller +@RequestMapping("/pmapi.user/nd-user-info") +public class NdUserInfoController { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java new file mode 100644 index 0000000..13d0acf --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java @@ -0,0 +1,99 @@ +package com.ningdatech.pmapi.user.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@TableName("nd_user_auth") +@ApiModel(value = "NdUserAuth对象", description = "") +public class NdUserAuth implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private LocalDateTime createOn; + + private LocalDateTime updateOn; + + private Long userId; + + private String authType; + + private String identifier; + + private String credential; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public LocalDateTime getCreateOn() { + return createOn; + } + + public void setCreateOn(LocalDateTime createOn) { + this.createOn = createOn; + } + public LocalDateTime getUpdateOn() { + return updateOn; + } + + public void setUpdateOn(LocalDateTime updateOn) { + this.updateOn = updateOn; + } + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + public String getAuthType() { + return authType; + } + + public void setAuthType(String authType) { + this.authType = authType; + } + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + public String getCredential() { + return credential; + } + + public void setCredential(String credential) { + this.credential = credential; + } + + @Override + public String toString() { + return "NdUserAuth{" + + "id=" + id + + ", createOn=" + createOn + + ", updateOn=" + updateOn + + ", userId=" + userId + + ", authType=" + authType + + ", identifier=" + identifier + + ", credential=" + credential + + "}"; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java new file mode 100644 index 0000000..ac8be23 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java @@ -0,0 +1,109 @@ +package com.ningdatech.pmapi.user.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@TableName("nd_user_info") +@ApiModel(value = "NdUserInfo对象", description = "") +public class NdUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private LocalDateTime createOn; + + private LocalDateTime updateOn; + + private Long createBy; + + private Long updateBy; + + private String username; + + private String mobile; + + private String realName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public LocalDateTime getCreateOn() { + return createOn; + } + + public void setCreateOn(LocalDateTime createOn) { + this.createOn = createOn; + } + public LocalDateTime getUpdateOn() { + return updateOn; + } + + public void setUpdateOn(LocalDateTime updateOn) { + this.updateOn = updateOn; + } + public Long getCreateBy() { + return createBy; + } + + public void setCreateBy(Long createBy) { + this.createBy = createBy; + } + public Long getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(Long updateBy) { + this.updateBy = updateBy; + } + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + + @Override + public String toString() { + return "NdUserInfo{" + + "id=" + id + + ", createOn=" + createOn + + ", updateOn=" + updateOn + + ", createBy=" + createBy + + ", updateBy=" + updateBy + + ", username=" + username + + ", mobile=" + mobile + + ", realName=" + realName + + "}"; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java new file mode 100644 index 0000000..0e9c14b --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.user.mapper; + +import com.ningdatech.pmapi.user.entity.NdUserAuth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +public interface NdUserAuthMapper extends BaseMapper { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml new file mode 100644 index 0000000..618d2cf --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java new file mode 100644 index 0000000..6b98902 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.user.mapper; + +import com.ningdatech.pmapi.user.entity.NdUserInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +public interface NdUserInfoMapper extends BaseMapper { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.xml new file mode 100644 index 0000000..dd9f3df --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java index 05d4e91..84a85d9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java @@ -1,7 +1,7 @@ package com.ningdatech.pmapi.user.mapper; -import com.ningdatech.pmapi.user.entity.UserAuth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.pmapi.user.entity.UserAuth; /** *

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java new file mode 100644 index 0000000..5b2b4c0 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.user.service; + +import com.ningdatech.pmapi.user.entity.NdUserAuth; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +public interface INdUserAuthService extends IService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java new file mode 100644 index 0000000..e33e2b8 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.user.service; + +import com.ningdatech.pmapi.user.entity.NdUserInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +public interface INdUserInfoService extends IService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java new file mode 100644 index 0000000..d445598 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.user.service.impl; + +import com.ningdatech.pmapi.user.entity.NdUserAuth; +import com.ningdatech.pmapi.user.mapper.NdUserAuthMapper; +import com.ningdatech.pmapi.user.service.INdUserAuthService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@Service +public class NdUserAuthServiceImpl extends ServiceImpl implements INdUserAuthService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java new file mode 100644 index 0000000..60b69e5 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.user.service.impl; + +import com.ningdatech.pmapi.user.entity.NdUserInfo; +import com.ningdatech.pmapi.user.mapper.NdUserInfoMapper; +import com.ningdatech.pmapi.user.service.INdUserInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Lierbao + * @since 2023-02-01 + */ +@Service +public class NdUserInfoServiceImpl extends ServiceImpl implements INdUserInfoService { + +}