From 681d6ef15d8dcfe3ce657fbe2a760bde3f555492 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 8 Aug 2025 10:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E9=9D=A0=E6=8E=88=E4=BF=A1=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=A1=A8=20=EF=BC=8C=E9=94=80=E5=94=AE=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E8=A1=A8=E5=90=8C=E6=AD=A5BIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CreditauditServiceImpl.java  | 113 +++++++++---------
 .../main/resources/application-kekaotest.yml  |   2 +-
 .../src/main/resources/application-llg.yml    |   8 +-
 fw-bip/pom.xml                                |   7 --
 .../service/impl/SeeYonInterFaceImpl.java     |  76 ------------
 5 files changed, 66 insertions(+), 140 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
index ca7e64dd..099c384f 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class CreditauditServiceImpl extends BaseService<CreditauditEntity, String> implements ICreditauditService {
     @Value("${zt.url}")
@@ -40,44 +42,41 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         if (jsonStr == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr");
+        JSONArray businessDataStr = jsonStr.getJSONArray("businessDataStr");
         if (businessDataStr == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        JSONObject mainData = businessDataStr.getJSONObject("formmain_9555");
+        JSONObject mainData = businessDataStr.getJSONObject(0);
         if (mainData == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         //组装数据
         //获取token
-        String token = null; //todo
+        String token = null;
         JSONObject tokenData = new JSONObject();
-        tokenData.put("userName","beis");
-        tokenData.put("password","64de4de7-23ce-4946-ac91-dd9e322d86e5");
-        tokenData.put("loginName","seeyon");
         String tokenResult = HttpRequest.post(url).
-                header("appId", "800051").
-                header("apiCode", "8000510005").
-                header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj").
-                header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                header("appId", "800053").
+                header("apiCode", "8000530000").
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
                 body(tokenData.toJSONString()).
                 execute().
                 body();
         logger.error("BIP Token：" + tokenResult);
         JSONObject resoutJson = JSONObject.parseObject(tokenResult);
         if (resoutJson.getBoolean("flag")) {
-            token = resoutJson.getJSONObject("attribute").getString("id");
+            token = resoutJson.getJSONObject("attribute").getJSONObject("data").getString("access_token");
         } else {
             return BaseResult.getFailureMessageEntity("获取BIP token失败");
         }
         JSONObject sendData = setSendCreditauditData(mainData);
         logger.error("同步信用额度审批单保存提交单据发送参数：" + sendData.toJSONString());
-        String sendResult = HttpRequest.post(url).//todo
-                header("appId", "800051").
-                header("apiCode", "8000510001").
-                header("token", token).
-                header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj").
-                header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+        String sendResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530001").
+                header("access_token", token).
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
                 body(sendData.toJSONString()).
                 execute().
                 body();
@@ -99,33 +98,42 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
      **/
     private JSONObject setSendCreditauditData(JSONObject mainData) {
         JSONObject sendData = new JSONObject();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         // 构建headVO对象
         JSONObject headVO = new JSONObject();
-        headVO.put("pk_org", "COCO_CS");
-        headVO.put("ctrantypeid", "4320-01");
-        headVO.put("vtrantypecode", "4320-01");
-        headVO.put("capplyerid", "subo");
-        headVO.put("vbillcode", "wxz08051210");
-        headVO.put("dbilldate", "2025-08-05 09:30:19");
-        headVO.put("vnote", "wxz备注");
-        headVO.put("creator", "sub");
-        headVO.put("vdef1", "wxzvdef1");
+        headVO.put("pk_org", mainData.getString("field0031"));//信用控制域
+        headVO.put("ctrantypeid", mainData.getString("field0026"));//额度审批单类型
+        headVO.put("vtrantypecode", mainData.getString("field0027"));//交易类型编码
+        headVO.put("vbillcode", mainData.getString("field0033"));//单据号
+        headVO.put("dbilldate", mainData.getString("field0003"));//单据日期
+        headVO.put("dmakedate", mainData.getString("field0003"));//制单日期
+        headVO.put("fstatusflag", mainData.getString("field0028"));//单据状态
+        headVO.put("billmaker", mainData.getString("field0029"));//制单人
+        headVO.put("vnote",  mainData.getString("field0011"));//备注
+        headVO.put("capplyerid", mainData.getString("field0001"));//申请人
+        headVO.put("capplydeptid", mainData.getString("field0002"));//申请部门
+        headVO.put("creator", mainData.getString("field0001"));//// TODO
+        //headVO.put("vdef1", "wxzvdef1");
 
         // 构建bodyVOList数组中的第一个对象
         JSONObject bodyVO = new JSONObject();
-        bodyVO.put("climittypeid", "COCO_01");
-        bodyVO.put("ccurrencyid", "CNY");
-        bodyVO.put("nlimitmny", "12.00");
-        bodyVO.put("dtodate", "2099-12-31 23:59:59");
-        bodyVO.put("dfromdate", "2025-08-05 00:00:00");
-        bodyVO.put("csaleorgid", "001");
-        bodyVO.put("ccustid", "01020017");
-        bodyVO.put("dbilldate", "2025-08-05 09:36:37");
-        bodyVO.put("vnote", "wxzB备注");
-        bodyVO.put("vbdef1", "wxzvbdef1");
-        bodyVO.put("pk_saleorg", "001");
-        bodyVO.put("pk_income", "1010");
+        bodyVO.put("climittypeid", mainData.getString("field0030"));//额度类型
+        bodyVO.put("pk_org", mainData.getString("field0031"));//信用控制域
+        //bodyVO.put("csaleorgid", mainData.getString("field0002"));//销售组织
+            bodyVO.put("ccustid", mainData.getString("field0005"));//客户
+        //bodyVO.put("climitlevel", mainData.getString("field0002"));//信用等级
+        bodyVO.put("ccurrencyid", mainData.getString("field0023"));//币种
+        //bodyVO.put("nlimitmny", mainData.getString("field0002"));//信用额度// TODO
+        bodyVO.put("dfromdate", mainData.getString("field0020"));//有效期从
+        Date dtodate = mainData.getDate("field0014");
+        bodyVO.put("dtodate", sdf.format(dtodate)+" 23:59:59");//有效期至
+        bodyVO.put("pk_income", mainData.getString("field0032"));//收款协议-虚拟字段
+        bodyVO.put("pk_saleorg", mainData.getString("field0031"));//销售组织-虚拟字段
+
+        //bodyVO.put("dbilldate", "2025-08-05 09:36:37");
+        //bodyVO.put("vnote", "wxzB备注");
+        //bodyVO.put("vbdef1", "wxzvbdef1");
 
         // 创建JSON数组并添加bodyVO对象
         JSONArray bodyVOList = new JSONArray();
@@ -155,11 +163,11 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         if (jsonStr == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr");
+        JSONArray businessDataStr = jsonStr.getJSONArray("businessDataStr");
         if (businessDataStr == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        JSONObject mainData = businessDataStr.getJSONObject("formmain_9555");
+        JSONObject mainData = businessDataStr.getJSONObject(0);
         if (mainData == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
@@ -167,32 +175,29 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         //获取token
         String token = null; //todo
         JSONObject tokenData = new JSONObject();
-        tokenData.put("userName","beis");
-        tokenData.put("password","64de4de7-23ce-4946-ac91-dd9e322d86e5");
-        tokenData.put("loginName","seeyon");
         String tokenResult = HttpRequest.post(url).
-                header("appId", "800051").
-                header("apiCode", "8000510005").
-                header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj").
-                header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                header("appId", "800053").
+                header("apiCode", "8000530000").
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
                 body(tokenData.toJSONString()).
                 execute().
                 body();
         logger.error("BIP Token：" + tokenResult);
         JSONObject resoutJson = JSONObject.parseObject(tokenResult);
         if (resoutJson.getBoolean("flag")) {
-            token = resoutJson.getJSONObject("attribute").getString("id");
+            token = resoutJson.getJSONObject("attribute").getJSONObject("data").getString("access_token");
         } else {
             return BaseResult.getFailureMessageEntity("获取BIP token失败");
         }
         JSONObject sendData = setSalesRebateData(mainData);
         logger.error("同步销售返利发送参数：" + sendData.toJSONString());
-        String sendResult = HttpRequest.post(url).//todo
-                header("appId", "800051").
-                header("apiCode", "8000510001").
-                header("token", token).
-                header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj").
-                header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+        String sendResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530002").
+                header("access_token", token).
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
                 body(sendData.toJSONString()).
                 execute().
                 body();
diff --git a/base-buildpackage/src/main/resources/application-kekaotest.yml b/base-buildpackage/src/main/resources/application-kekaotest.yml
index b96e0d2d..d3439bf2 100644
--- a/base-buildpackage/src/main/resources/application-kekaotest.yml
+++ b/base-buildpackage/src/main/resources/application-kekaotest.yml
@@ -29,7 +29,7 @@ savefile:
   tomcatpath: D:\yongansystem\log\test
   pluginpath: D:\yongansystem\log\test
 zt:
-  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
+  url: http://127.0.0.1:10087/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
   appId: 1P4AGrpz
   appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
diff --git a/base-buildpackage/src/main/resources/application-llg.yml b/base-buildpackage/src/main/resources/application-llg.yml
index 11273505..353058e1 100644
--- a/base-buildpackage/src/main/resources/application-llg.yml
+++ b/base-buildpackage/src/main/resources/application-llg.yml
@@ -30,9 +30,12 @@ spring:
 #          password: 62e4295b615a30dbf3b8ee96f41c820b
 #          driver-class-name: dm.jdbc.driver.DmDriver
 #          type: com.alibaba.druid.pool.DruidDataSource
-          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          username: root
+#          password: 62e4295b615a30dbf3b8ee96f41c820b
+          url: jdbc:mysql://172.16.10.252:3306/businesscentertest?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
-          password: 62e4295b615a30dbf3b8ee96f41c820b
+          password: bd993088e8a7c3dc5f44441617f9b4bf
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 #          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
 #          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
@@ -44,6 +47,7 @@ savefile:
   path: /Users/apple/Desktop/log/local
   tomcatpath: /Users/apple/Desktop/log/local
   pluginpath: /Users/apple/Desktop/log/local
+
 zt:
   url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
diff --git a/fw-bip/pom.xml b/fw-bip/pom.xml
index f0f762fa..00a95ae7 100644
--- a/fw-bip/pom.xml
+++ b/fw-bip/pom.xml
@@ -53,13 +53,6 @@
 <!--            <version>1</version>-->
 <!--            <scope>system</scope>-->
 <!--            <systemPath>${basedir}/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar</systemPath>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.hzya.openBasicSDK</groupId>-->
-<!--            <artifactId>openBasicSDK</artifactId>-->
-<!--            <version>1</version>-->
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${basedir}/src/main/resources/lib/openBasicSDK-2.1.230630.jar</systemPath>-->
 <!--        </dependency>-->
     </dependencies>
     <build>
diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java
index 7475c8f4..8699a2ae 100644
--- a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java
+++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java
@@ -204,26 +204,10 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace {
         JSONObject jsonObject = requestData.getJSONObject("jsonStr");
         OAWorkflowEventDataEntity entity = JSON.parseObject(jsonStr, OAWorkflowEventDataEntity.class);
         logger.info("监听OA事件入参：" + jsonObject.toJSONString());
-        JSONObject formBeanData = jsonObject.getJSONObject("businessDataStr");
         String eventType = jsonObject.getString("eventType");
-        /** 流程ID*/
-        String summaryId = entity.getSummaryId();
-        /** 节点ID*/
-        String affairId = entity.getAffairId();
-        String currentActivityId = entity.getCurrentActivityId();
-        /****/
-        String formViewOperation = entity.getFormViewOperation();
-        Object summaryObj = entity.getSummaryObj();
-        String deeCfgId = entity.getDeeCfgId();
-        String currentNodeLast = entity.getCurrentNodeLast();
-        Map<String, Object> businessData = JSON.parseObject(entity.getBusinessDataStr(), Map.class);
-        Map<String, Object> extData = entity.getExtData();
         /** 表单表的FORM ID,用此字段标记是哪个流程*/
         String formApp = entity.getFormApp();
-
         //formApp 最好过滤一下
-
-
         JsonResultEntity result = null;
         try {
             //流程事件处理
@@ -232,66 +216,6 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace {
             return BaseResult.getFailureMessageEntity("传递失败", e.getMessage());
         }
         return result;
-//        try {
-//            /** 根据事件类型处理相关事件*/
-//            switch (eventType) {
-//                /** 发起前事件*/
-//                case "onBeforeStart":
-//                    break;
-//                /** 发起事件*/
-//                case "onStart":
-//                    //流程发起 新增grpu8单据
-//                    break;
-//                /** 终止前事件*/
-//                case "onBeforeStop":
-//                    break;
-//                /** 终止事件*/
-//                case "onStop":
-//                    //流程终止，更新grpu8单据
-//                    break;
-//                /** 撤销前事件*/
-//                case "onBeforeCancel":
-//                    break;
-//                /** 撤销事件*/
-//                case "onCancel":
-//                    //流程撤销，更新grpu8单据
-//                    break;
-//                /** 结束事件*/
-//                case "onProcessFinished":
-//                    break;
-//                /** 处理前事件*/
-//                case "onBeforeFinishWorkitem":
-//                    /** 根据form处理相关业务表单的数据*/
-//                    switch (formApp) {
-//                        case "abc123":
-//                            break;
-//                        default:
-//                            return   BaseResult.getFailureMessageEntity("未匹配到表单！当前formID：" + formApp,  "");
-//                    }
-//                    break;
-//                /** 处理事件*/
-//                case "onFinishWorkitem":
-//                    break;
-//                /** 回退前事件*/
-//                case "onBeforeStepBack":
-//                    break;
-//                /** 回退事件*/
-//                case "onStepBack":
-//                    break;
-//                /** 取回前事件*/
-//                case "onBeforeTakeBack":
-//                    break;
-//                /** 取回事件*/
-//                case "onTakeBack":
-//                    break;
-//                default:
-////                throw new RuntimeException("传入了非法事件类型！请参照：" + eventTypeBuffer.toString());
-//                    return   BaseResult.getFailureMessageEntity("传入了非法事件类型！请参照：" + eventTypeBuffer.toString(), "", "");
-//            }
-//            return BaseResult.getSuccessMessageEntity("传递成功",  result);
-//        }catch (Exception e){
-//            return BaseResult.getFailureMessageEntity("传递失败",e.getMessage());
-//        }
     }