ftp 个人保安新增修改

Administrator

2022-06-08 5190a58ae8668c1f46ae17f6178622cbb40f9d3d

ftp 个人保安新增修改

 src/main/java/org/springblade/modules/FTP/DataHandler.java

@@ -95,9 +95,7 @@
    public static Result handler(String json, String uuid){
        Map map = JSON.parseObject(json, Map.class);
        //获取结果
        System.out.println("uuid = " + uuid);
        Object o = map.get(uuid);
        System.out.println("结果数据 = " + o);
        if (null== o || o.equals("")){
            return new Result(400,null,"uuid 不匹配",null);
        }else {

 src/main/java/org/springblade/modules/FTP/Monitor.java

@@ -77,7 +77,6 @@
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        System.out.println("s = " + s);
                        //数据处理
                        Result result = DataHandler.handler(s,uuid);
                        //匹配上了删除文件
@@ -89,7 +88,7 @@
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                            ftp.dele(fileName);
                            //返回
                            return result.getData().get(0);
                            return result;
                        }
                        ftp.completePendingCommand();
                        ftp.logout();
@@ -174,7 +173,6 @@
                            //删除 ftp 文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                            ftp.dele(fileName);

                            //返回
                            return result;
                        }
@@ -261,16 +259,16 @@
                            //删除 ftp 文件
//                            ftp.dele(fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                            ftp.completePendingCommand();
                            ftp.logout();
                            //返回
                            return result;
                        }
                        ftp.completePendingCommand();
                        ftp.logout();
                    }
                }
                if (!flag){
                    ftp.logout();
                }
//                if (!flag){
//                    ftp.logout();
//                }
                return new Result(400,null,"未读取到对应的文件",null);
            }
        } catch (Exception e) {
@@ -440,16 +438,17 @@
                            //删除 ftp 文件
//                            ftp.dele(fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                            ftp.completePendingCommand();
                            ftp.logout();

                            //返回
                            return result;
                        }
                        ftp.completePendingCommand();
                        ftp.logout();
                    }
                }
                if (!flag){
                    ftp.logout();
                }
//                if (!flag){
//                    ftp.logout();
//                }
                return new Result(400,null,"未读取到对应的文件",null);
            }
        } catch (Exception e) {

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -1623,15 +1623,15 @@

        int count = 0;
        int flag = 1;
        Result result = new Result();
        Result result0 = new Result();
        //调用ftp获取返回数据
        while (true){
            System.out.println("用户新增开始接收消息......................");
            Thread.sleep(2000);
            //调用ftp获取返回数据
            result = Monitor.isFTPFileExist(uuid);
            result0 = Monitor.isFTPFileExist(uuid);
            //如果返回true,就退处
            if (result.getCode()==200){
            if (result0.getCode()==200){
                break;
            }else{
                //计数
@@ -1650,11 +1650,10 @@
        //导入状态，默认为true ,如果有一个出现问题则为 false
        AtomicBoolean status = new AtomicBoolean(true);
        AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
        if (null!=result){
        if (null!=result0){
            Result result = result0.getData().get(0);
            //用户数处理
            User users = handlerUserInfo(uuid);
            System.out.println("用户数据处理---------------");
            System.out.println("用户数据 = " + users);
            //判断结果
            if (result.getCode()==200){
                //新增