Merge remote-tracking branch 'origin/master'

src/main/java/sys/sc/formplugin/CreatDatPlugin.java

@@ -115,25 +115,6 @@ public class CreatDatPlugin extends AbstractListPlugin {
                 throw new RuntimeException(e);
             }
         }
-        if (name.equals("uploadfile"))
-        {
-//            String remoteFilePath="/home/kingdee/cosmic/nginx-appstatic/store/appstatic/";
-//            SftpClient sftpClient=new SftpClient("192.168.10.69","root","Kd@86262007",22);
-//
-//            try {
-//                sftpClient.connect();
-//                DatFileCreatUtils datFileCreatUtils=new DatFileCreatUtils(tablenumber,bizappnum,fileList,filePath,spiltsign,endsign);
-//                Files.write(localFile, Collections.singleton("Hello, SFTP!"));
-//                sftpClient.fileCreat(localFile.toString(),remoteFilePath);  // 清理临时文件
-//                Files.delete(localFile);
-//            } catch (IOException e) {
-//                throw new RuntimeException(e);
-//            } catch (Exception e) {
-//                throw new RuntimeException(e);
-//            }
-//            sftpClient.disconnect();
-        }
-
     }
 
 }

src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -28,6 +28,7 @@ import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.epm.eb.common.model.DynamicInfoCollection;
 import kd.imc.bdm.common.constant.BotpCallBackLogConstant;
+import sys.sc.opplugin.utils.InterFaceImgUtils;
 import sys.sc.opplugin.utils.SftpClient;
 
 
@@ -799,15 +800,10 @@ public class TestPlugin  extends AbstractListPlugin {
         //获取linux服务器连接
         if ("connect".equals(e.getOperateKey()))
         {
-            try {
-                FileCreat();
-            } catch (JSchException ex) {
-                throw new RuntimeException(ex);
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
+            InterFaceImgUtils interFaceImgUtils=new InterFaceImgUtils("produceurl");
+            interFaceImgUtils.getServerPassword();
+            interFaceImgUtils.getHost();
+
         }
 
     }

src/main/java/sys/sc/opplugin/utils/InterFaceImgUtils.java

@@ -0,0 +1,55 @@
+package sys.sc.opplugin.utils;
+
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
+
+/**
+ * @author cjz
+ * @date 2024/9/24 16:56
+ * @description:根据编码获取接口配置信息
+ */
+public class InterFaceImgUtils {
+    //接口配置信息标识
+    private String nckd_jkpzxx="nckd_jkpzxx";
+    //接口编码
+    private String URL;
+    DynamicObject jkpzxx;
+
+    public InterFaceImgUtils(String URL) {
+        this.URL=URL;
+        //接口配置信息获取
+        jkpzxx = BusinessDataServiceHelper
+                .loadSingle(nckd_jkpzxx,new QFilter[]{new QFilter("number","=",URL)});
+    }
+    //端口号
+    public int getHost() {
+        return jkpzxx.getInt("nckd_port");
+    }
+    //服务器地址
+    public String getServerName() {
+        return jkpzxx.getString("nckd_servername");
+    }
+    //数仓文件路径
+    public String getServerUrl() {
+        return jkpzxx.getString("nckd_url");
+    }
+    //获取连接用户
+    public String getServerUser() {
+        return jkpzxx.getString("nckd_user");
+    }
+    //获取连接密码
+    public String getServerPassword() {
+        return jkpzxx.getString("nckd_password");
+    }
+    //获取分隔符
+    public String getServerSplit() {
+        return jkpzxx.getString("nckd_split");
+    }
+    //获取结尾符
+    public String getServerEndsign() {
+        return jkpzxx.getString("nckd_endsign");
+    }
+
+
+}

src/main/java/sys/sc/task/CreatDatDailyTask.java

@@ -102,7 +102,7 @@ public class CreatDatDailyTask extends AbstractTask {
                 //获取服务器连接
                 sftpClient.connect();
                 //从本地传文件到服务器
-                sftpClient.fileCreat(localFile.getAbsolutePath(), nckd_url);
+                sftpClient.fileCreat(localFile.getAbsolutePath(),nckd_url);
                 //上传后删除临时文件
                 localFile.delete();
                 //关闭连接

src/main/java/sys/sc/task/UpdateBankDailyTask.java

@@ -41,14 +41,6 @@ public class UpdateBankDailyTask extends AbstractTask {
 
     @Override
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
-        log.info("----------------------获取服务器连接------------------------");
-        //获取服务器连接
-        SftpClient sftpClient=new SftpClient(host,username,password,port);
-        try {
-            sftpClient.connect();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
         String mes="-----------------正在执行任务,读取行名行号---------------------";
         log.info(mes+requestContext);
         //行名行号表字段
@@ -58,6 +50,10 @@ public class UpdateBankDailyTask extends AbstractTask {
         //行名行号表标识
         String bd_bebank="bd_bebank";
         try {
+            log.info("----------------------获取服务器连接------------------------");
+            //获取服务器连接
+            SftpClient sftpClient=new SftpClient(host,username,password,port);
+            sftpClient.connect();
             List<DynamicObject> createdataList = new ArrayList<>();
             List<DynamicObject> updatedataList = new ArrayList<>();
             //文件路径

src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -49,17 +49,17 @@ public class UpdateDataDailyTask extends AbstractTask {
         log.info(mes+requestContext);
         //文件路径
         String path=getFileUrl("organduserurl");
-        //获取连接对象
-        SftpClient sftpClient=new SftpClient(host,username,password,port);
         try {
+            //获取连接对象
+            SftpClient sftpClient=new SftpClient(host,username,password,port);
             sftpClient.connect();
             //读取文件更新基础资料
             updatebasicdata(sftpClient.fileInputStream(path));
+            //关闭连接
+            sftpClient.disconnect();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        //关闭连接
-        sftpClient.disconnect();
         //更新组织
         log.info("----------------更新组织中---------------------");
         updateorg();

src/main/java/sys/sc/task/UpdateImpairmentDailyTask.java

@@ -41,17 +41,13 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
 
     @Override
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
+        String mes="-------------------------正在执行任务，读取减值数据----------------------";
+        log.info(mes+requestContext);
         log.info("---------------------获取服务器连接--------------------");
         //获取服务器连接
         SftpClient sftpClient=new SftpClient(host,username,password,port);
         try {
             sftpClient.connect();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        String mes="-------------------------正在执行任务，读取减值数据----------------------";
-        log.info(mes+requestContext);
-        try {
             //文件路径
             String filelocation=getFileUrl("jzsjurl");
             //减值数据基础资料
@@ -108,16 +104,14 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
             }
             SaveServiceHelper.save(existingData);
             DeleteServiceHelper.delete(dynamicObjectType.getName(),new QFilter[]{qFilter});
-
             log.info("-----------------------减值数据已成功保存---------------------");
             custSave(dynamicObjectlist);
             log.info("------------------------客户数据已成功保存----------------------");
-        } catch (IOException ex) {
-            ex.printStackTrace();
-            log.error("----------------------------读取文件发生错误"+ex.getMessage()+"--------------------------");
-        } catch (SftpException e) {
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
+
+
     }
 
     @Override