diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java index 496b75f..e8ffb0d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java @@ -9,6 +9,6 @@ package com.ningdatech.pmapi.ding.constants; public interface DingOrganizationContant { String UNIT_TYPE = "GOV_UNIT"; - + String GOV_TEMPORARY = "GOV_TEMPORARY"; String HOLLOW = "GOV_HOLLOW_DIVISION_NODE"; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java index f07e985..2107e02 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java @@ -1,36 +1,13 @@ package com.ningdatech.pmapi.ding.controller; -import cn.hutool.crypto.digest.MD5; -import com.alibaba.fastjson.JSON; -import com.ningdatech.pmapi.common.util.CryptUtils; -import com.ningdatech.pmapi.common.util.HttpUtil; -import com.ningdatech.pmapi.common.util.Md5Utils; -import com.ningdatech.pmapi.common.util.RefreshKeyUtil; import com.ningdatech.pmapi.ding.task.EmployeeBatchGetTask; import com.ningdatech.pmapi.ding.task.GovBusinessStripsTask; import com.ningdatech.pmapi.ding.task.OrganizationBatchGetTask; -import com.ningdatech.pmapi.irs.utils.RefreshTokenUtil; import com.ningdatech.pmapi.organization.manage.ProcDefManage; import io.swagger.annotations.ApiOperation; -import liquibase.util.MD5Util; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.TrustStrategy; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.ssl.SSLContexts; -import org.springframework.http.ResponseEntity; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; - -import javax.net.ssl.SSLContext; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.security.NoSuchAlgorithmException; /** *
@@ -103,4 +80,10 @@ public class DingInfoPullController {
public String init() {
return procDefManage.init();
}
+
+ @ApiOperation(value = "系统流程配置初始化按区域", notes = "系统流程配置初始化按区域")
+ @GetMapping("/init/{areaCode}")
+ public String initByArea(@PathVariable String areaCode) {
+ return procDefManage.initByArea(areaCode);
+ }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java
index 24c6ad1..60acd33 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java
@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.organization.manage;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.ningdatech.basic.util.StrPool;
import com.ningdatech.pmapi.ding.constants.DingOrganizationContant;
import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
@@ -43,7 +44,9 @@ public class ProcDefManage {
*/
public String init() {
List