Browse Source

东方新华手工付款单

zfc 1 year ago
parent
commit
b61f7f2864

+ 15 - 0
.idea/dataSources.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="fbi.dll" uuid="0169dada-1ae4-4bb3-813d-9903fe29ff96">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../../fbi.dll</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

+ 15 - 0
.idea/deployment.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" serverName="云璞环境" remoteFilesAllowedToDisappearOnAutoupload="false">
+    <serverData>
+      <paths name="云璞环境">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$/mjava-dongfangxinhua" web="/" />
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>

+ 8 - 0
.idea/sshConfigs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SshConfigs">
+    <configs>
+      <sshConfig authType="PASSWORD" host="47.97.181.40" id="68f58a64-2527-484c-9d64-917b3d3e2ece" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+    </configs>
+  </component>
+</project>

+ 14 - 0
.idea/webServers.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebServers">
+    <option name="servers">
+      <webServer id="b0c0d4fb-1dc3-4b12-b970-30beaf6d38f5" name="云璞环境">
+        <fileTransfer rootFolder="/home/server" accessType="SFTP" host="47.97.181.40" port="22" sshConfigId="68f58a64-2527-484c-9d64-917b3d3e2ece" sshConfig="root@47.97.181.40:22 password">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
+    </option>
+  </component>
+</project>

+ 7 - 41
mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/controller/DFXHController.java

@@ -34,6 +34,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.sql.ResultSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -151,7 +152,7 @@ public class DFXHController {
 
 
     /**
-     *推送凭证
+     *同步凭证
      * @param request
      * @return
      */
@@ -159,52 +160,17 @@ public class DFXHController {
     McR pushErp(HttpServletRequest request) {
         Map pushData = UtilServlet.getParamMap(request);
         log.info("同步Erp凭证数据, {}", pushData);
-        //调用凭证推送   实例ID   状态:1成功   2失败    失败信息
-        updateProofServer.pdateProof("","1","");
+        //查询凭证实例ID   状态:1成功   2失败    失败信息
+        updateProofServer.pdateProof("","","");
         return McR.success();
     }
 
+
+//    @RequestMapping(value = "test")
     @PostMapping(value = "test")
     McR test(String name, HttpServletRequest request) {
 
-//        XmlUtil.;
-
-//        String rsp = UtilHttp.doPost(API, null, null, null, null);
-
-//        String xmlData = "";
-//        Document document = XmlUtil.parseXml(xmlData);
-
-        StringBuffer reqXmlData = new StringBuffer();
-        try {
-            InputStream inputStream = request.getInputStream();
-            String s;
-            BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-            while ((s = in.readLine()) != null) {
-                reqXmlData.append(s);
-            }
-            in.close();
-            inputStream.close();
-        } catch (IOException e) {
-            System.out.println("流解析xml数据异常!");
-            e.printStackTrace();
-        }
-        //判断请求数据是否为空
-        if (reqXmlData.length() <= 0) {
-            System.out.println("请求数据为空!");
-        }
-
-        //json类型数据 [自动去掉标识]
-        JSONObject jsonObject = XML.toJSONObject(reqXmlData.toString());
-        log.info("xxxx,, {}", jsonObject);
-
-        String data = reqXmlData.toString();
-//        UtilHttp.doRequest(UtilHttp.METHOD.POST, API, null, null, jsonObject);
-
-        log.info("xxx, {}", "0000012001BY0004<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?>\\n\"" + jsonObject.toString());
-        String rsp = HttpRequest.post(API).body(data).execute().body();
-        log.info("xxx, {}", rsp);
-
-        return McR.success(jsonObject.toString());
+        return McR.success();
     }
 
 

+ 6 - 11
mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/service/Impl/PayServiceImpl.java

@@ -12,6 +12,7 @@ import com.malk.server.common.McException;
 import com.malk.service.aliwork.YDClient;
 import com.malk.utils.UtilHttp;
 import com.malk.utils.UtilMap;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -163,6 +164,7 @@ public class PayServiceImpl implements PayService {
      * 同步付款银行信息
      * @param map
      */
+    @SneakyThrows
     @Override
     public void syncPayBankInfo(Map map) {
         //根据企业源系统业务编码   查询付款账号表信息
@@ -173,25 +175,21 @@ public class PayServiceImpl implements PayService {
 
         List<Map> mapList = (List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
         Map fkmap = (Map) mapList.get(0).get("formData");
-
-
         log.info("fkmap:{}",fkmap);
-
         //根据收款账户  查询收款信息
         YDParam ydParam2 = YDParam.builder()
                 .formUuid("FORM-NO9667913LKF3GE09L0EHA3YMDGU3GF9NEEOLX1")
                 .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_li1w31c2", map.get("account"))))
                 .build();
         List<Map> mapList1 = (List<Map>) ydClient.queryData(ydParam2, YDConf.FORM_QUERY.retrieve_search_form).getData();
-
         Map skmap = (Map) mapList1.get(0).get("formData");
-
+        log.info("skmap:{}",skmap);
         //收款联行银行号  付款银行联行号  收款银行实例    企业编码                       付款银行简称  付款账户名称   付款开户行    付款银行账号   直连方式
         ydClient.operateData(YDParam.builder().formInstId(map.get("formInstId").toString())
                 .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lr7tmvy9, textField_lr7tmvy8, textField_lr7tmvya, textField_lmhln79w, " +
-                                "selectField_lqalbx97, textField_li1y52z5, textField_li1y52z4, selectField_li1y52z3, selectField_lqalbx98",
+                                "textField_li1y52z5, textField_li1y52z4, selectField_li1y52z3, textField_li1y52z2",
                         skmap.get("selectField_lof5vr7d"),fkmap.get("textField_li1w31c4"),mapList1.get(0).get("formInstanceId"),fkmap.get("textField_lmhln79w"),
-                        fkmap.get("textField_li1w31c5"),fkmap.get("textField_li1w31c1"),fkmap.get("textField_li1w31c3"),fkmap.get("textField_li1w31c2"),fkmap.get("selectField_li1w31c8"))))
+                        fkmap.get("textField_li1w31c1"),fkmap.get("textField_li1w31c3"),fkmap.get("textField_li1w31c2"),fkmap.get("selectField_li1w31c8"))))
                 .build(), YDConf.FORM_OPERATION.update);
     }
 
@@ -225,7 +223,6 @@ public class PayServiceImpl implements PayService {
                 .formInstId(data.get("formInstId").toString())
                 .build();
         Map formData = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_id).getFormData();
-
         log.info("formData{}",formData);
 
         //数据来源明源云则回写
@@ -233,6 +230,7 @@ public class PayServiceImpl implements PayService {
             //付款成功的更新Erp状态
             String erpRsp = UtilHttp.doPost("https://gateway.dslink.net.cn/api/webhook/E185908E63CF407B911FA870642A39A5",
                     null,null, UtilMap.map("PayGUID, BillCode",formData.get("textField_li1y52yh"),""),new HashMap());
+
             //通过 http status 判定, 200 即为成功
             Map result = (Map) JSON.parse(erpRsp);
             Boolean status = (Boolean) result.get("status");
@@ -242,9 +240,6 @@ public class PayServiceImpl implements PayService {
                 log.info("回写ERP失败{}",result);
             }
         }
-
-
-
     }
 
 

+ 10 - 9
mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/service/Impl/UpdateProofServerImpl.java

@@ -12,7 +12,7 @@ public class UpdateProofServerImpl implements UpdateProofServer {
 
 
     //配置客户的sqlist URL
-    private static final String SQLITE_URL ="jdbc:sqlite:/D:/JavaSpace/fbi.dll";
+    private static final String SQLITE_URL ="jdbc:sqlite:/D:\\JavaSpace\\etl.db";
 
     /**
      * 凭证同步
@@ -21,27 +21,28 @@ public class UpdateProofServerImpl implements UpdateProofServer {
      */
 
     @Override
-    public void pdateProof(String formInstId,String sta,String errMsg) {
+    public ResultSet pdateProof(String formInstId,String sta,String errMsg) {
 
         Connection connection = null;
         Statement statement = null;
+        ResultSet rowsAffected = null;
         try {
             // 加载SQLite的JDBC驱动程序
             Class.forName("org.sqlite.JDBC");
+
             //创建链接
             connection = DriverManager.getConnection(SQLITE_URL);
+
             // 创建Statement对象
             statement = connection.createStatement();
-            // 执行UPDATE语句
-            String sql = "UPDATE rest_drrecord SET status = sta,generate_time=CURRENT_TIMESTAMP,note=errMsg WHERE instance_id ="+formInstId; // 替换为你的UPDATE语句
 
+            // 执行查询语句
+            String sql = "SELECT * FROM rest_drrecord WHERE instance_id =" + formInstId + " ";
 
+            rowsAffected = statement.executeQuery(sql);
 
+            log.info("rowsAffected{}",rowsAffected.toString());
 
-
-            int rowsAffected = statement.executeUpdate(sql);
-            // 输出受影响的行数
-            System.out.println("实例ID:"+formInstId+"受影响的行数: " + rowsAffected);
         } catch (ClassNotFoundException | SQLException e) {
             e.printStackTrace();
         } finally {
@@ -58,6 +59,6 @@ public class UpdateProofServerImpl implements UpdateProofServer {
             }
         }
 
-
+        return rowsAffected;
     }
 }

+ 3 - 1
mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/service/UpdateProofServer.java

@@ -1,8 +1,10 @@
 package com.malk.dongfangxinhua.service;
 
+import java.sql.ResultSet;
+
 public interface UpdateProofServer {
 
-    void pdateProof(String formInstId,String status,String errMsg);
+    ResultSet pdateProof(String formInstId,String sta,String errMsg);
 
 
 }