处理字典跨服务无法打包问题

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/controller/HandoverRecoveryController.java

@@ -1,11 +1,12 @@
 package com.jeeplus.human.depart.handover.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.human.depart.handover.domain.HandoverRecovery;
 import com.jeeplus.human.depart.handover.service.HandoverRecoveryService;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.feign.IDictApi;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
@@ -68,7 +69,7 @@ public class HandoverRecoveryController {
     @ApiOperation(value = "根据租户和用户数据删除钉钉用户数据")
     @PostMapping(value = "deleteDingTalkByTenantId")
     public void deleteDingTalkByTenantId(String mobilePhone) {
-        String dictValue = DictUtils.getDictValue("dd_status", "dd_status", "0");
+        String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
         if("1".equals(dictValue)) {
             recoveryService.deleteDingTalkByTenantId(mobilePhone);
         }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
 import com.dingtalk.api.response.OapiV2UserCreateResponse;
-import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
@@ -27,15 +26,9 @@ import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.DingTalkU
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.ExportDTO;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.DingTalkUtils;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.SnowFlake;
-import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.feign.IOfficeApi;
-import com.jeeplus.sys.feign.IPostApi;
-import com.jeeplus.sys.feign.IRoleApi;
-import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.*;
 import com.jeeplus.sys.service.dto.*;
-import com.jeeplus.sys.utils.DictUtils;
 import com.taobao.api.ApiException;
-import javafx.geometry.Pos;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -44,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author 王强
@@ -414,7 +406,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                     officeName = "综合管理公司";
                 }
                 dto.setRoleDTOList(roleIdList);
-                String dictValue = DictUtils.getDictValue("dd_status", "dd_status", "0");
+                String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
                 if("1".equals(dictValue)){
                     //钉钉逻辑
                     //判断用户是否为 评估 或者 会计 员工
@@ -662,7 +654,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //设置角色
             if (userDTO != null) {
                 SpringUtil.getBean(IUserApi.class).deleteById(userDTO.getId());
-                String dictValue = DictUtils.getDictValue("dd_status", "dd_status", "0");
+                String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
                 if("1".equals(dictValue)){
                     //删除钉钉表中的数据
                     //判断用户是否为 评估 或者 会计 员工
@@ -714,7 +706,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         report.setUpdateById(userDTO.getId());
         report.setUpdateTime(new Date());
 
-        String dictValue = DictUtils.getDictValue("dd_status", "dd_status", "0");
+        String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
         if("1".equals(dictValue)){
             //钉钉逻辑
             //获取用户所在部门信息

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/utils/DingTalkSyncUtil.java

@@ -12,15 +12,14 @@ import com.dingtalk.api.request.*;
 import com.dingtalk.api.response.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentRegistrationService;
+import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.utils.StringUtils;
 import com.taobao.api.ApiException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -92,7 +91,7 @@ public class DingTalkSyncUtil {
      */
     public void getUserByMobileSyncData() {
         try {
-            String dictValue = DictUtils.getDictValue("dd_status", "dd_status", "0");
+            String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
             if (!"1".equals(dictValue)) {
                 return;
             }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/utils/DingTalkUtils.java

@@ -3,23 +3,16 @@
  */
 package com.jeeplus.human.enrollment.enrollmentRegistration.utils;
 
-import cn.hutool.extra.spring.SpringUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.*;
 import com.dingtalk.api.response.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.DingTalkUserDTO;
-import com.jeeplus.sys.feign.IUserApi;
-import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.utils.StringUtils;
+
 import com.taobao.api.ApiException;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;