人事对接

value

2024-05-17 2b30df90a4e281c2a37c2933a7389ea0c149ffcc

人事对接

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Department.java

@@ -4,12 +4,13 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -35,13 +36,17 @@
    @ApiModelProperty("父级id")
    private Integer fatherId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    private String companyId;
}

 framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java

@@ -1,16 +1,12 @@
package com.yuanchu.mom.config;

import cn.hutool.log.Log;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -63,8 +59,8 @@

    @Override
    protected void addInterceptors(InterceptorRegistry registry) {
//        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
//        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(logConfig).addPathPatterns("/**");
        super.addInterceptors(registry);
    }

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ

 user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java

@@ -12,11 +12,9 @@
@NoArgsConstructor
public class UserPageDto extends User {

    @ValueTableShow(10)
    @ApiModelProperty(value = "创建用户")
    private String createUserName;

    @ValueTableShow(11)
    @ApiModelProperty(value = "更新用户")
    private String updateUserName;


 user-server/src/main/java/com/yuanchu/mom/mapper/DepartmentsMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.Departments;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface DepartmentsMapper extends BaseMapper<Departments> {

}

 user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java

@@ -36,4 +36,9 @@

    public static String simple="https://ztt-connector.chinaztt.cn/api/org/v1/employees/simple?companyId=";

    /**
     * äººå‘˜å¯†ç èŽ·å–
     * */
    public static String password = "https://ztt-connector.chinaztt.cn/api/org/v1/employees/original_pwd/";

}

 user-server/src/main/java/com/yuanchu/mom/pojo/Departments.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * éƒ¨é—¨æ˜Žç»†
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-04-15 04:01:48
 */
@Data
@ApiModel(value = "Department对象", description = "部门明细")
@TableName("department")
public class Departments implements Serializable {

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("名称")
    private String name;

    @ApiModelProperty("父级id")
    private Integer fatherId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    private String companyId;
}

 user-server/src/main/java/com/yuanchu/mom/pojo/User.java

@@ -35,7 +35,6 @@
    @ApiModelProperty(value = "姓名")
    private String name;

    @ValueTableShow(2)
    @ApiModelProperty(value = "姓名EN")
    private String nameEn;

@@ -43,11 +42,9 @@
    @ApiModelProperty(value = "状态")
    private Integer state;

    @ValueTableShow(4)
    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ValueTableShow(5)
    @ApiModelProperty(value = "邮箱")
    private String email;

@@ -58,24 +55,20 @@
    @ApiModelProperty(value = "部门")
    private String department;

    @ValueTableShow(8)
    @ApiModelProperty(value = "单位")
    private String company;

    @ValueTableShow(14)
    @ApiModelProperty(value = "单位地址")
    private String address;

    @ApiModelProperty(value = "角色主键")
    private Integer roleId;

    @ValueTableShow(9)
    @ApiModelProperty(value = "创建日期")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ValueTableShow(10)
    @ApiModelProperty(value = "更新日期")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -108,7 +101,6 @@
    /**
     * ç»„织
     */
//    @ValueTableShow(value = 14,name = "组织")
    @ApiModelProperty(value = "关联的部门id")
    private String departId;


 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -9,10 +9,12 @@
import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.DepartmentsMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Departments;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.utils.QueryWrappers;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;

@Service
public class UserServiceImp implements UserService {
@@ -29,11 +32,13 @@
    @Resource
    UserMapper userMapper;
    @Resource
    Jwt jwt;
    @Resource
    private GetLook getLook;

    @Resource
    private DepartmentsMapper departmentsMapper;

    @Resource
    private HeaderToken headerToken;

    @Override
    public User selectUserByPwd(String account, String password) {
@@ -109,7 +114,55 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addPersonUser(PersonDto personDto) {
        System.out.println(personDto);
        AtomicReference<String> departId = new AtomicReference<>("");
        AtomicReference<String> companyName = new AtomicReference<>();
        personDto.getCompany().forEach(company->{
            Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
            if(BeanUtil.isEmpty(department)){
                department = new Departments();
                department.setName(company.getCompanyName());
                department.setCompanyId(company.getCompanyId());
                Departments department2 = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getParentCompanyId()));
                if(BeanUtil.isEmpty(department2)){
                    department.setFatherId(1);
                }else{
                    department.setFatherId(department2.getId());
                }
                departmentsMapper.insert(department);
            }
            departId.set(departId.get()+department.getId()+",");
            companyName.set(department.getName());
        });
        personDto.getPerson().forEach(person -> {
            User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
            if(BeanUtil.isEmpty(user)){
                user = new User();
                user.setName(person.getName());
                user.setNameEn("not write");
                user.setAccount(person.getEmployeeID());
                user.setPhone(person.getPhoneNumber());
                user.setEmail(person.getCompanyEmail());
                user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
                user.setDepartId(departId.get());
//                user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
                user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
                user.setCompany(companyName.get());
                user.setAddress("未填写");
                userMapper.insert(user);
            }else{
                user.setName(person.getName());
                user.setPhone(person.getPhoneNumber());
                user.setEmail(person.getCompanyEmail());
                user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
                user.setDepartId(departId.get());
                user.setCompany(companyName.get());
                user.setCreateUser(null);
                user.setCreateTime(null);
                user.setUpdateUser(null);
                user.setUpdateTime(null);
                userMapper.updateById(user);
            }
        });
        return 1;
    }
}

 user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java

@@ -98,4 +98,13 @@
            return false;
        }).collect(Collectors.toList());
    }

    public String getPassword(String employeeId) {
        String accessToken = getAccessToken();
        HttpRequest request = HttpRequest.get(AuthApi.password + employeeId)
                .header("Authorization", "Bearer " + accessToken);
        System.out.println(AuthApi.password + employeeId);
        System.out.println(request.execute().body());
        return JSON.parseObject(request.execute().body()).get("originalPwd").toString();
    }
}

 user-server/src/main/resources/mapper/DepartmentsMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.DepartmentsMapper">
</mapper>