Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

Administrator

2022-05-23 b7feda7c2cc54e03966ecbd2ed2582097eb3ee73

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

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

@@ -123,7 +123,7 @@
                    //返回
                    return new Result(200,null,"新增成功",null);
                }else {
                    return new Result(400,null,"新增失败",null);
                    return new Result(205,null,"新增失败",null);
                }
            }else if (result.getCode()==201) {
                //修改
@@ -132,13 +132,14 @@
                user.setId(result.getUserId());
                //数据修改
                boolean b = handler.userService.updateById(user);
                System.out.println("修改状态 = " + b);
                if (b) {
                    //异步同步到群防群控
                    handler.myAsyncService.updateUserByQfqk(user);
                    //返回
                    return new Result(200, null, "修改成功", null);
                } else {
                    return new Result(400, null, "修改失败", null);
                    return new Result(205, null, "修改失败", null);
                }
            }else if (result.getCode()==203){
                //新增

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

@@ -104,6 +104,10 @@
                            //返回
                            return new Result(203,null,result.getMsg(),null);
                        }
                        if (result.getCode()==205){
                            //返回
                            return new Result(202,null,"新增失败,找不到该用户",null);
                        }
                    }
                }
                System.out.println("未读取到对应的文件");