金蝶连接更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/Dao/CategoryDao.java

@@ -10,6 +10,7 @@ import org.jeecg.common.exception.ConnectConstant.KingDeeConstant;
 import org.jeecg.common.exception.KingdeeChangeException;
 import org.jeecg.common.exception.KingdeeConnectException;
 import org.jeecg.modules.iost.ims.Util.JsonUtil;
+import org.jeecg.modules.iost.ims.Util.JsonUtils;
 import org.jeecg.modules.iost.ims.Util.KingdeeLogUtil;
 import org.jeecg.modules.iost.ims.Util.KingdeeResultParseUtil;
 import org.jeecg.modules.iost.ims.client.KingdeeK3CloudApiClient;
@@ -56,7 +57,7 @@ public class CategoryDao {
     KingdeeK3CloudApiClient client;
     KingdeeK3CloudApiClient client2;
     KingdeeK3CloudApiClient client3;
-    Boolean result = false;
+    Boolean result = true;
     private Boolean IsCloseKingDee = false;
     String loginResult;
     @Autowired
@@ -882,7 +883,7 @@ public class CategoryDao {
     }
 
     public String push(String KingdeeLogName, String FormId, String FEntryId, String RuleId, String TargetFormId) {
-        String result2 = null;
+        Object result2 = null;
         try {
             if (result) {
                 Map<String, String> map = new LinkedHashMap<>();
@@ -892,10 +893,10 @@ public class CategoryDao {
                 map.put("IsDraftWhenSaveFail", "true");
                 String mapjson = JsonUtil.Mapjson(map);
                 /* String content = "{\"EntryIds\":"+FEntryId+",\"RuleId\":"+RuleId+",\"TargetFormId\":"+TargetFormId+"}";*/
-                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, String.class);
+                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, Object.class);
                 //记录下推金蝶云数据的请求和响应信息
                 KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
-                kingdeeLogUtil.KingdeeLog2(mapjson, result2, KingdeeLogName);
+                kingdeeLogUtil.KingdeeLog2(mapjson, JsonUtils.toString(result2), KingdeeLogName);
             } else {
                 throw new KingdeeConnectException(loginResult);
             }
@@ -905,11 +906,11 @@ public class CategoryDao {
             e.printStackTrace();
             throw new KingdeeConnectException(KingDeeConstant.URL, baseCommonService);
         }
-        return result2;
+        return JsonUtils.toString(result2);
     }
 
     public String pushMore(String KingdeeLogName, String FormId, List<String> FEntryIDs, String RuleId, String TargetFormId) {
-        String result2 = null;
+        Object result2 = null;
         String EntryIds = new String();
         for (String fEntryID : FEntryIDs) {
             EntryIds = EntryIds + "," + fEntryID;
@@ -923,10 +924,10 @@ public class CategoryDao {
                 map.put("IsDraftWhenSaveFail", "true");
                 String mapjson = JsonUtil.Mapjson(map);
                 /* String content = "{\"EntryIds\":"+FEntryId+",\"RuleId\":"+RuleId+",\"TargetFormId\":"+TargetFormId+"}";*/
-                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, String.class);
+                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, Object.class);
                 //记录下推金蝶云数据的请求和响应信息
                 KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
-                kingdeeLogUtil.KingdeeLog2(mapjson, result2, KingdeeLogName);
+                kingdeeLogUtil.KingdeeLog2(mapjson, JsonUtils.toString(result2), KingdeeLogName);
             } else {
                 throw new KingdeeConnectException(loginResult);
             }
@@ -936,11 +937,11 @@ public class CategoryDao {
             e.printStackTrace();
             throw new KingdeeConnectException(KingDeeConstant.URL, baseCommonService);
         }
-        return result2;
+        return JsonUtils.toString(result2);
     }
 
     public String pushByNumber(String KingdeeLogName, String FormId, List<String> number, String RuleId, String TargetFormId) {
-        String result2 = null;
+        Object result2 = null;
         String EntryIds = new String();
         try {
             if (result) {
@@ -951,10 +952,10 @@ public class CategoryDao {
                 map.put("IsDraftWhenSaveFail", "true");
                 String mapjson = JsonUtil.Mapjson(map);
                 /* String content = "{\"EntryIds\":"+FEntryId+",\"RuleId\":"+RuleId+",\"TargetFormId\":"+TargetFormId+"}";*/
-                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, String.class);
+                result2 = client.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push", new Object[]{FormId, mapjson}, Object.class);
                 //记录下推金蝶云数据的请求和响应信息
                 KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
-                kingdeeLogUtil.KingdeeLog2(mapjson, result2, KingdeeLogName);
+                kingdeeLogUtil.KingdeeLog2(mapjson, JsonUtils.toString(result2), KingdeeLogName);
             } else {
                 throw new KingdeeConnectException(loginResult);
             }
@@ -964,7 +965,7 @@ public class CategoryDao {
             e.printStackTrace();
             throw new KingdeeConnectException(KingDeeConstant.URL, baseCommonService);
         }
-        return result2;
+        return JsonUtils.toString(result2);
     }
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/TimeTask/SynTimed.java

 package org.jeecg.modules.iost.ims.TimeTask;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.iost.ims.Dao.CategoryDao;
-import org.jeecg.common.exception.ConnectConstant.KingDeeConstant;
-import org.jeecg.modules.iost.ims.client.KingdeeK3CloudApiClient;
 import org.jeecg.modules.iost.ims.service.ISynService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
@@ -14,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -30,7 +25,7 @@ public class SynTimed implements Job {
     /*金蝶云自动登录定时任务20分钟执行一次*/
     @Scheduled(fixedRate = 1000*60*20)
     public void timed() throws IOException, ParseException {
-        Boolean isCloseKingDee = categoryDao.getIsCloseKingDee();
+        /*Boolean isCloseKingDee = categoryDao.getIsCloseKingDee();
         KingdeeK3CloudApiClient client2 = categoryDao.getClient();
         KingdeeK3CloudApiClient client3 = categoryDao.getClient();
         Boolean result=categoryDao.getResult();
@@ -128,7 +123,7 @@ public class SynTimed implements Job {
         }
 
         categoryDao.setClient(client3);
-        categoryDao.setResult(result2);
+        categoryDao.setResult(result2);*/
     }
 
     //可以使用页面上的任务来控制方法

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/client/KingdeeApiClient.java

@@ -6,17 +6,15 @@
 package org.jeecg.modules.iost.ims.client;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import kingdee.bos.json.JSONObject;
-import kingdee.bos.webapi.client.ApiHttpClient;
-import kingdee.bos.webapi.client.ApiRequest;
-import kingdee.bos.webapi.client.ApiServiceRequest;
-import kingdee.bos.webapi.client.IAsyncActionCallBack;
+import com.kingdee.bos.webapi.entity.IdentifyInfo;
+import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import org.apache.http.client.CookieStore;
 import org.jeecg.common.util.ThreadLocalConfig;
 import org.jeecg.modules.iost.ims.Util.JsonUtils;
 import org.jeecg.modules.iost.ims.Util.KingdeeLogUtil;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class KingdeeApiClient {
@@ -27,9 +25,9 @@ public class KingdeeApiClient {
         this._serverUrl = serverUrl;
     }
 
-    public <T> ApiRequest<T> createRequest(String servicename, Object[] parameters, Class<T> returnType) {
+/*    public <T> ApiRequest<T> createRequest(String servicename, Object[] parameters, Class<T> returnType) {
         return new ApiServiceRequest(this._serverUrl, this._cookieStore, servicename, parameters, returnType);
-    }
+    }*/
 
     public <T> T execute(String servicename, Object[] parameters, Class<T> returnType) throws Exception {
         Map map2 = ThreadLocalConfig.get();
@@ -38,20 +36,40 @@ public class KingdeeApiClient {
              map2 = new HashMap();
              map2.put("test","test");
         }
-        ApiRequest<T> request = this.createRequest(servicename, parameters, returnType);
+        /*ApiRequest<T> request = this.createRequest(servicename, parameters, returnType);
         ApiHttpClient<T> httpClient = new ApiHttpClient();
         request.setListener(httpClient);
+        T send = httpClient.Send(request, returnType);*/
         long beginTime=System.currentTimeMillis();
-        T send = httpClient.Send(request, returnType);
-        System.out.println("----------------------------------"+ send);
-        KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
-        String name = "没有名称";
-        String requests = "";
-        if (parameters != null && parameters.length > 1) {
-            name = parameters[0].toString();
-            requests = parameters[1].toString();
+
+        IdentifyInfo identifyInfo = new IdentifyInfo() {};
+        identifyInfo.setAppId("225533_53fA1cht1lH8S88GT/3ozxUK2t3b2AnE");
+        identifyInfo.setAppSecret("bd70ee8503b24e8386022a360e057605");
+        identifyInfo.setServerUrl("https://jcg-666.ik3cloud.com/K3Cloud/");
+        identifyInfo.setdCID("20210727181855027");
+        identifyInfo.setlCID(2052);
+        identifyInfo.setUserName("Administrator");
+        K3CloudApi k3CloudApi = new K3CloudApi(identifyInfo);
+        T send = k3CloudApi.execute(servicename, parameters, returnType);
+        try{
+            if ("java.lang.Object".equals(returnType.getName())) {
+                Object sendStr = send;
+            }else {
+                List sendList = (List) send;
+            }
+        } catch (Exception e) {
+            System.out.println("----------------------------------"+ send);
+            KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
+            String name = "没有名称";
+            String requests = "";
+            if (parameters != null && parameters.length > 1) {
+                name = parameters[0].toString();
+                requests = parameters[1].toString();
+            }else if (parameters != null && parameters.length > 0) {
+                requests = parameters[0].toString();
+            }
+            kingdeeLogUtil.addKingdeeLog(JsonUtils.toString(send), name, requests);
         }
-        kingdeeLogUtil.addKingdeeLog(JsonUtils.toString(send), name, requests);
         long Costime=System.currentTimeMillis()-beginTime;
         if(!ObjectUtils.isEmpty(map2)) {
             map2.put("Costime", Costime);
@@ -60,16 +78,16 @@ public class KingdeeApiClient {
         return send;
     }
 
-    public <T> ApiRequest<T> executeAsync(String servicename, Object[] parameters, Class<T> returnType, IAsyncActionCallBack<T> callback) throws Exception {
+    /*public <T> ApiRequest<T> executeAsync(String servicename, Object[] parameters, Class<T> returnType, IAsyncActionCallBack<T> callback) throws Exception {
         ApiRequest<T> request = this.createRequest(servicename, parameters, returnType);
         ApiHttpClient<T> httpClient = new ApiHttpClient(callback);
         request.setListener(httpClient);
         httpClient.syncSend(request);
         return request;
-    }
+    }*/
 
     public Boolean login(String dbId, String userName, String password, int lcid) throws Exception {
-        KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
+        /*KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
         String ret = "";
         try {
             Object[] loginInfo = new Object[]{dbId, userName, password, lcid};
@@ -90,6 +108,7 @@ public class KingdeeApiClient {
             var10.printStackTrace();
             kingdeeLogUtil.addKingdeeLog(ret, "金蝶云登陆失败", null);
             return false;
-        }
+        }*/
+        return false;
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/client/KingdeeK3CloudApiClient.java

@@ -5,6 +5,8 @@
 
 package org.jeecg.modules.iost.ims.client;
 
+import org.jeecg.modules.iost.ims.Util.JsonUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,35 +16,43 @@ public class KingdeeK3CloudApiClient extends KingdeeApiClient {
     }
 
     public String excuteOperation(String formid, String opNumber, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation", new Object[]{formid, opNumber, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation", new Object[]{formid, opNumber, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String save(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String batchSave(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.BatchSave", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.BatchSave", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String audit(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String delete(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Delete", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Delete", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String unAudit(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.UnAudit", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.UnAudit", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String submit(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public String view(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.View", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.View", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 
     public List<List<Object>> executeBillQuery(String data) throws Exception {
@@ -50,6 +60,7 @@ public class KingdeeK3CloudApiClient extends KingdeeApiClient {
     }
 
     public String draft(String formid, String data) throws Exception {
-        return (String)this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Draft", new Object[]{formid, data}, String.class);
+        Object execute = this.execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Draft", new Object[]{formid, data}, Object.class);
+        return JsonUtils.toString(execute);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/WebService.java

 package org.jeecg.modules.iost.ims.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.exception.ConnectConstant.KingDeeConstant;
-import org.jeecg.common.exception.KingdeeConnectException;
 import org.jeecg.common.util.RedisLock;
 import org.jeecg.common.util.ThreadLocalConfig;
 import org.jeecg.modules.iost.ims.Dao.CategoryDao;
 import org.jeecg.modules.iost.ims.ExternalInterface.IMSApi;
-import org.jeecg.modules.iost.ims.client.KingdeeK3CloudApiClient;
 import org.jeecg.modules.iost.ims.entity.ImsInitConnectParm;
 import org.jeecg.modules.iost.ims.entity.Vo.*;
 import org.jeecg.modules.iost.ims.service.*;
@@ -401,20 +396,20 @@ public class WebService {
         /*  imsInitConnectParm.setIsAutoSubmit(Integer.valueOf(connectParmVo.getKingdeeConnectParm().getIsAutoSubmit()));*/
         imsInitConnectParm.setUrl(connectParmVo.getImsConParm().getUrl());
         iImsInitConnectParmService.getBaseMapper().updateById(imsInitConnectParm);
-        //改变单例categoryDao值
+        /*//改变单例categoryDao值
         categoryDao.setK3CloudURL(connectParmVo.getKingdeeConnectParm().getK3CloudURL());
         categoryDao.setDbId(connectParmVo.getKingdeeConnectParm().getDbId());
         categoryDao.setUid(connectParmVo.getKingdeeConnectParm().getUid());
         categoryDao.setPwd(connectParmVo.getKingdeeConnectParm().getPwd());
         categoryDao.setLang(connectParmVo.getKingdeeConnectParm().getLang());
-        /*  categoryDao.setIsAutoSubmit(Integer.valueOf(connectParmVo.getKingdeeConnectParm().getIsAutoSubmit()));*/
+        *//*  categoryDao.setIsAutoSubmit(Integer.valueOf(connectParmVo.getKingdeeConnectParm().getIsAutoSubmit()));*//*
         imsApi.setUrl(connectParmVo.getImsConParm().getUrl());
         KingdeeK3CloudApiClient client = categoryDao.getClient();
         client = new KingdeeK3CloudApiClient(connectParmVo.getKingdeeConnectParm().getK3CloudURL());
         categoryDao.setClient2(new KingdeeK3CloudApiClient(connectParmVo.getKingdeeConnectParm().getK3CloudURL()));
         categoryDao.setClient3(new KingdeeK3CloudApiClient(connectParmVo.getKingdeeConnectParm().getK3CloudURL()));
         categoryDao.setClient(client);
-        AfterKingdeelogin();
+        AfterKingdeelogin();*/
         return Result.OK("保存成功");
     }
 
@@ -423,7 +418,7 @@ public class WebService {
     @AutoLog(value = "IMS通用接口-检验连接参数功能")
     @ApiOperation(value = "IMS通用接口-检验连接参数功能", notes = "IMS通用接口-检验连接参数功能")
     public Result ManualCheck(@RequestBody ConnectParmVo connectParmVo) {
-        Boolean result = false;
+        /*Boolean result = false;
         KingdeeK3CloudApiClient client = new KingdeeK3CloudApiClient(connectParmVo.getKingdeeConnectParm().getK3CloudURL());
         String k3CloudURL = connectParmVo.getKingdeeConnectParm().getK3CloudURL();
         String dbId = connectParmVo.getKingdeeConnectParm().getDbId();
@@ -450,7 +445,7 @@ public class WebService {
                 throw new KingdeeConnectException(KingDeeConstant.DBID);
             }
             return Result.OK("参数正确,金蝶云连接成功");
-        }
+        }*/
         return Result.OK("参数正确,金蝶云连接成功");
     }
 
@@ -496,7 +491,7 @@ public class WebService {
 
     //金蝶云登录公用方法
     public void Kingdeelogin() {
-        KingdeeK3CloudApiClient client = categoryDao.getClient();
+        /*KingdeeK3CloudApiClient client = categoryDao.getClient();
         Boolean result = categoryDao.getResult();
         String dbId = categoryDao.getDbId();
         String uid = categoryDao.getUid();
@@ -540,12 +535,12 @@ public class WebService {
             e.printStackTrace();
         }
         categoryDao.setClient(client);
-        categoryDao.setResult(result);
+        categoryDao.setResult(result);*/
     }
 
     //金蝶云保存后检验登录参数
     public void AfterKingdeelogin() {
-        KingdeeK3CloudApiClient client = categoryDao.getClient();
+        /*KingdeeK3CloudApiClient client = categoryDao.getClient();
         Boolean result = categoryDao.getResult();
         String dbId = categoryDao.getDbId();
         String uid = categoryDao.getUid();
@@ -589,6 +584,6 @@ public class WebService {
             e.printStackTrace();
         }
         categoryDao.setClient(client);
-        categoryDao.setResult(result);
+        categoryDao.setResult(result);*/
     }
 }