From 5a1444731ea4c918904ff265516fc5d31a7ebb36 Mon Sep 17 00:00:00 2001 From: Lierbao Date: Wed, 1 Feb 2023 17:48:09 +0800 Subject: [PATCH] =?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 { + +}