From b9df5a579ffe790ac3bdf033aefa7f79362c3d14 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 21 Feb 2024 14:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E4=BF=A1=E6=81=AF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteOpenService.java | 2 +- .../com/op/system/api/RemoteUserService.java | 4 + .../op/system/api/domain/quality/HRInfo.java | 254 ++++++++++++++++++ .../factory/RemoteUserFallbackFactory.java | 5 + .../src/main/java/com/op/job/task/RyTask.java | 12 + .../resources/mapper/mes/MesPrepareMapper.xml | 1 + .../op/open/controller/OpenController.java | 4 +- .../op/open/service/impl/OpenServiceImpl.java | 6 +- .../java/com/op/plan/domain/ProOrder.java | 1 + .../impl/ProOrderWorkorderServiceImpl.java | 20 +- .../QcCheckTaskWarehousingController.java | 3 + .../impl/QcCheckUnqualifiedServiceImpl.java | 5 +- .../system/controller/SysUserController.java | 9 + .../com/op/system/mapper/SysUserMapper.java | 10 + .../op/system/service/ISysUserService.java | 2 + .../service/impl/SysUserServiceImpl.java | 89 +++++- .../resources/mapper/system/SysUserMapper.xml | 32 +++ 17 files changed, 437 insertions(+), 22 deletions(-) create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java index c9a8425f..5438acc8 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java @@ -25,6 +25,6 @@ public interface RemoteOpenService { public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestId); /**获取HR人员信息**/ - @GetMapping("/openInterface/GetHrUserInfo") + @GetMapping("/openInterface/GetHrUserInfo/{dateTime}") public AjaxResult GetHrUserInfo(@PathVariable("dateTime") String dateTime); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteUserService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteUserService.java index 23c5ca50..b923879f 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteUserService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteUserService.java @@ -57,4 +57,8 @@ public interface RemoteUserService { */ @PostMapping("/user/getPoolNameList") public R>> getPoolNameList(@RequestBody SysUser user); + + /**hr 人力基础数据数据-人员基本信息**/ + @PostMapping("/user/syncUserInfoTask") + public R syncUserInfoTask(); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java new file mode 100644 index 00000000..e04cb185 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java @@ -0,0 +1,254 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.web.domain.BaseEntity; +import com.op.common.core.xss.Xss; +import com.op.system.api.domain.SysDept; +import com.op.system.api.domain.SysRole; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; + +/** + * hr返回信息 + * + * @author Open Platform + * @date 2023-10-31 + */ +public class HRInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 用户ID */ + private Long userId; + /** 部门ID */ + private Long deptId; + /** 用户账号 */ + private String userName; + private String userCode; + /** 用户昵称 */ + private String nickName; + /** 用户邮箱 */ + private String email; + /** 手机号码 */ + private String phonenumber; + /** 用户性别 */ + private String sex; + /** 用户头像 */ + private String avatar; + /** 密码 */ + private String password; + /** 帐号状态（0正常 1停用） */ + private String status; + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + /** 最后登录IP */ + private String loginIp; + /** 最后登录时间 */ + private Date loginDate; + /** 部门对象 */ + private SysDept dept; + /** 角色对象 */ + private List roles; + /** 角色组 */ + private Long[] roleIds; + /** 岗位组 */ + private Long[] postIds; + /** 角色ID */ + private Long roleId; + private String datasourceId; + + public String getDatasourceId() { + return datasourceId; + } + + public void setDatasourceId(String datasourceId) { + this.datasourceId = datasourceId; + } + + //新增 微信账号 + private String wxId; + + public String getWxId() { + return wxId; + } + + public void setWxId(String wxId) { + this.wxId = wxId; + } + + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public boolean isAdmin() { + return isAdmin(this.userId); + } + + public static boolean isAdmin(Long userId) { + return userId != null && 1L == userId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhonenumber() { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getLoginIp() { + return loginIp; + } + + public void setLoginIp(String loginIp) { + this.loginIp = loginIp; + } + + public Date getLoginDate() { + return loginDate; + } + + public void setLoginDate(Date loginDate) { + this.loginDate = loginDate; + } + + public SysDept getDept() { + return dept; + } + + public void setDept(SysDept dept) { + this.dept = dept; + } + + public List getRoles() { + return roles; + } + + public void setRoles(List roles) { + this.roles = roles; + } + + public Long[] getRoleIds() { + return roleIds; + } + + public void setRoleIds(Long[] roleIds) { + this.roleIds = roleIds; + } + + public Long[] getPostIds() { + return postIds; + } + + public void setPostIds(Long[] postIds) { + this.postIds = postIds; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId()) + .append("deptId", getDeptId()).append("userName", getUserName()).append("nickName", getNickName()) + .append("email", getEmail()).append("phonenumber", getPhonenumber()).append("sex", getSex()) + .append("avatar", getAvatar()).append("password", getPassword()).append("status", getStatus()) + .append("delFlag", getDelFlag()).append("loginIp", getLoginIp()).append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()).append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()) + .append("dept", getDept()).toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteUserFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteUserFallbackFactory.java index 42cda6b4..003c3d45 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteUserFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteUserFallbackFactory.java @@ -46,6 +46,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory>> getPoolNameList(SysUser user) { return R.fail("工厂数据源获取失败:" + throwable.getMessage()); } + + @Override + public R syncUserInfoTask() { + return R.fail("hr人力资源基础数据-人员信息同步失败："+throwable.getMessage()); + } }; } } diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index 186e0565..8661bdf6 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -35,6 +35,9 @@ public class RyTask { @Autowired private RemoteQualityService remoteQualityService; + @Autowired + private RemoteUserService remoteUserService; + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i)); } @@ -158,4 +161,13 @@ public class RyTask { remoteQualityService.createProduceXJTask(); } /************质量管理系统定时任务结束*****************/ + + /************hr 人力基础数据定时任务开始*****************/ + //人力基本数据同步每天 + public void syncUserInfoTask(){ + logger.info("++hr人力基础数据同步+开始++syncUserInfoTask+++++"); + remoteUserService.syncUserInfoTask(); + } + /************hr 人力基础数据定时任务结束*****************/ } + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml index 71e99649..172258fa 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +