金轮

mjava-jinlun/src/main/java/com/malk/jinlun/schedule/JinlunTask.java

@@ -56,4 +56,10 @@ public class JinlunTask {
         jinlunTaskService.syncXingneng();
     }
 
+    //定时同步销售订单
+    @Scheduled(cron = "0 6 0 * * ?")
+    public void syncSaleOrder(){
+        jinlunTaskService.syncSaleOrder();
+    }
+
 }

mjava-jinlun/src/main/java/com/malk/jinlun/service/CpClient.java

@@ -1,5 +1,6 @@
 package com.malk.jinlun.service;
 
+import java.util.List;
 import java.util.Map;
 
 public interface CpClient {
@@ -11,7 +12,9 @@ public interface CpClient {
 
     Map getCpBo(String schemaCode, String objectId, String userId);
 
-    Map getCpBoList(String schemaCode, Map queryCondition,int page, int size, String userId);
+    Map getCpBoList(String schemaCode, Map queryCondition, Map options,int page, int size, String userId);
+
+    List<Map> getCpUserInfo(String corpId, List<String> departmentIds, List<String> ids, String mobile, String name, int page, int size);
 
     Map getCpBoResultData(Map result);
 

mjava-jinlun/src/main/java/com/malk/jinlun/service/JinlunTaskService.java

@@ -12,4 +12,7 @@ public interface JinlunTaskService {
     void syncSaleReturn();
 
     void syncXingneng();
+
+    void syncSaleOrder();
+
 }

mjava-jinlun/src/main/java/com/malk/jinlun/service/impl/CpClientImpl.java

@@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class CpClientImpl implements CpClient {
@@ -139,11 +141,12 @@ public class CpClientImpl implements CpClient {
      * @return
      */
     @Override
-    public Map getCpBoList(String schemaCode, Map queryCondition,int page, int size, String userId){
+    public Map getCpBoList(String schemaCode, Map queryCondition, Map options,int page, int size, String userId){
         Map body = new HashMap();
 
         body.put("queryCondition",queryCondition);
         body.put("schemaCode",schemaCode);
+        body.put("options",options);
         body.put("page",page);
         body.put("size",size);
         body.put("showTotal",true);
@@ -163,6 +166,43 @@ public class CpClientImpl implements CpClient {
         return result;
     }
 
+    /**
+     * 云枢分页查询用户详情
+     * @param corpId
+     * @param departmentIds
+     * @param ids
+     * @param mobile
+     * @param name
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public List<Map> getCpUserInfo(String corpId, List<String> departmentIds, List<String> ids, String mobile, String name, int page, int size) {
+        Map body = new HashMap();
+        if (Objects.nonNull(corpId)) body.put("corpId",corpId);
+        if (Objects.nonNull(departmentIds)) body.put("departmentIds",departmentIds);
+        if (Objects.nonNull(ids)) body.put("ids",ids);
+        if (Objects.nonNull(mobile)) body.put("mobile",mobile);
+        if (Objects.nonNull(name)) body.put("name",name);
+
+        body.put("page",page);
+        body.put("size",size);
+
+        String s = UtilHttp.doPost(cloudpivotConfig.getRedirectUri() + "openapi/v3/organization/user/detail/query", CloudpivotConfig.initTokenHeader(getCpAccessToken()), null, body);
+
+        Map result = (Map) JSONObject.parse(s);
+
+        isSuccess(result);
+
+        Map data = UtilMap.getMap(result, "data");
+
+        List<Map> content = UtilMap.getList(data, "content");
+
+        return content;
+    }
+
+
     //获取云枢表单详情返回结果中单据字段值
     @Override
     public Map getCpBoResultData(Map result){

mjava-jinlun/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.12:3306/cloudpivot?serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.16.10.1:3306/cloudpivot?serverTimezone=GMT%2B8
     username: root
     password: test123456!@#$%
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -40,7 +40,7 @@ cloudpivot:
   grant_type: client_credentials
   client_id: xclient
   client_secret: 0a417ecce58c31b32364ce19ca8fcd15
-  redirect_uri: http://192.168.0.12/api/
+  redirect_uri: http://172.16.10.1/api/
   operator_user_id: 8ac194c0811240a6b483ebc86aeb9147
 
 kingdee:

mjava-jinlun/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.12:3306/cloudpivot?serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.16.10.1:3306/cloudpivot?serverTimezone=GMT%2B8
     username: root
     password: test123456!@#$%
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -40,7 +40,7 @@ cloudpivot:
   grant_type: client_credentials
   client_id: xclient
   client_secret: 0a417ecce58c31b32364ce19ca8fcd15
-  redirect_uri: http://192.168.0.12/api/
+  redirect_uri: http://172.16.10.1/api/
   operator_user_id: 8ac194c0811240a6b483ebc86aeb9147
 
 kingdee:

mjava-jinlun/src/test/java/com/malk/jinlun/DdTest.java

@@ -71,6 +71,10 @@ public class DdTest {
     public void test7() {
         jinlunTaskService.syncSaleReturn();
     }
+    @Test
+    public void test16() {
+        jinlunTaskService.syncSaleOrder();
+    }
 
     @Test
     public void test8() {