Browse Source

feat: 更新云枢查询、金蝶单据查询、打包跳过测试配置

ht 1 week ago
parent
commit
88164acbd2

+ 7 - 0
mjava-jinlun/pom.xml

@@ -69,6 +69,13 @@
     <build>
         <finalName>jinlun</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

+ 0 - 1
mjava-jinlun/src/main/java/com/malk/jinlun/controller/JinlunController.java

@@ -6,7 +6,6 @@ import com.malk.server.common.McR;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.Map;
 
 @RestController

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

@@ -85,15 +85,15 @@ public class CpClientImpl implements CpClient {
      * @return
      */
     @Override
-    public Map updateCpBo(String schemaCode, Map data, String userId){
+    public Map updateCpBo(String schemaCode, Map data, String userId) {
         Map body = new HashMap();
 
-        body.put("data",data);
-        body.put("schemaCode",schemaCode);
-        if (Strings.isNullOrEmpty(userId)){
-            body.put("userId",cloudpivotConfig.getOperatorUserId());
-        }else {
-            body.put("userId",userId);
+        body.put("data", data);
+        body.put("schemaCode", schemaCode);
+        if (Strings.isNullOrEmpty(userId)) {
+            body.put("userId", cloudpivotConfig.getOperatorUserId());
+        } else {
+            body.put("userId", userId);
         }
 
         String s = UtilHttp.doPost(cloudpivotConfig.getRedirectUri() + "openapi/v3/bo/update", CloudpivotConfig.initTokenHeader(getCpAccessToken()), null, body);
@@ -151,6 +151,7 @@ public class CpClientImpl implements CpClient {
         body.put("size",size);
         body.put("showTotal",true);
 
+        System.out.println("cloudpivotConfig"+cloudpivotConfig);
         if (Strings.isNullOrEmpty(userId)){
             body.put("userId",cloudpivotConfig.getOperatorUserId());
         }else {
@@ -239,4 +240,5 @@ public class CpClientImpl implements CpClient {
             throw new RuntimeException("云枢接口调用失败:" + errmsg);
         }
     }
+
 }

File diff suppressed because it is too large
+ 7 - 1
mjava-jinlun/src/main/java/com/malk/jinlun/service/impl/JinlunTaskServiceImpl.java


+ 2 - 1
mjava-jinlun/src/main/resources/application-dev.yml

@@ -41,7 +41,8 @@ cloudpivot:
   client_id: xclient
   client_secret: 0a417ecce58c31b32364ce19ca8fcd15
   redirect_uri: http://172.16.10.1/api/
-  operator_user_id: 8ac194c0811240a6b483ebc86aeb9147
+  ##operator_user_id: 8ac194c0811240a6b483ebc86aeb9147
+  operator_user_id: 2098b083a6d34ac38cc93b30838c28bd
 
 kingdee:
 # 第三方系统登录授权的账套ID

+ 2 - 2
mjava-jinlun/src/test/java/com/malk/jinlun/YsTest.java

@@ -26,8 +26,8 @@ public class YsTest {
 
     @Test
     public void test(){
-        McR result = jinlunService.queryFromData(UtilMap.map("schemaCode, propertyCode, propertyValue","KHDA","ShortText1758195840127","K02219"));
+       // McR result = jinlunService.queryFromData(UtilMap.map("schemaCode, propertyCode, propertyValue","KHDA","ShortText1758195840127","K02219"));
 //        Map result=cpClient.getCpBoList("KHDA", UtilMap.map("queryFilterType, propertyCode, propertyValue", "Eq", "ShortText1758195840127", "K02219"), null, 0, 1, null);
-        System.out.println(JSONObject.toJSONString(result));
+        //System.out.println(JSONObject.toJSONString(result));
     }
 }