用户新增修改

Administrator

2022-06-09 7bc2aa0d4f620c57206f30b4ceb2284fb6073baf

用户新增修改

 src/main/java/org/springblade/modules/quartz/task/Task.java

@@ -212,8 +212,8 @@

            FTPFile[] files = ftp.listFiles();
            //文件个数大于10个时开始处理
            if (files.length==0 || files.length<10){
//            if (files.length==0){
//            if (files.length==0 || files.length<10){
            if (files.length==0){
                ftp.logout();
                return false;
            }

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

@@ -1621,133 +1621,133 @@
        map.put("user",user1);
        myAsyncService.FTPObject(map);

        int count = 0;
        int flag = 1;
        Result result0 = new Result();
        //调用ftp获取返回数据
        while (true){
            System.out.println("用户新增开始接收消息......................");
            Thread.sleep(2000);
            //调用ftp获取返回数据
            result0 = Monitor.isFTPFileExist(uuid);
            System.out.println("result0 ftp 返回结果 = " + result0);
            //如果返回true,就退处
            if (result0.getCode()==200){
                break;
            }else{
                //计数
                count++;
                //如果超过60s 没有读取到，则退出
                if (count == 20) {
                    break;
                }
            }
        }

        //将不能导入的保安员账号存起来
        List<String> errorList = new ArrayList<>();
        //保安员证编号不符的保安员信息存入集合
        List<String> securityInvalidList = new ArrayList<>();
        //导入状态，默认为true ,如果有一个出现问题则为 false
        AtomicBoolean status = new AtomicBoolean(true);
        AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
        if (null!=result0){
            Result result = result0.getData().get(0);
            //用户数处理
            User users = handlerUserInfo(uuid);
            System.out.println("用户数据处理---------------");
            System.out.println("用户数据 = " + users);
            //判断结果
            if (result.getCode()==200){
                //新增
                users.setId(result.getUserId());
                users.setStatus(1);
                //插入数据库
                boolean save = userService.save(users);
                if (save){
                    //异步同步到群防群控
                    myAsyncService.qfqkUserSave(users);
                }
            }else if (result.getCode()==201) {
                //修改
                users.setId(result.getUserId());
                //先查询当前库是否有改用户？
                User user2 = userService.getById(result.getUserId());
                if (null!=user2) {
                    //数据修改
                    boolean b = userService.updateById(users);
                    if (b) {
                        //异步同步到群防群控
                        myAsyncService.updateUserByQfqk(users);
                    }
                }else {
                    //新增
                    boolean save = userService.save(users);
                    if (save){
                        //异步同步到群防群控
                        myAsyncService.qfqkUserSave(users);
                    }
                }
            }else if (result.getCode()==203){
                //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
                //新增
                users.setId(result.getUserId());
                //插入数据库
                boolean save = userService.save(users);
                if (save) {
                    //异步同步到群防群控
                    myAsyncService.qfqkUserSave(users);
                }
                securityInvalidStatus.set(false);
                //保安证编号不匹配
                securityInvalidList.add(user.getCardid());
            }else if (result.getCode()==204){
                //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
                users.setId(result.getUserId());
                //先查询当前库是否有改用户？
                User user2 = userService.getById(result.getUserId());
                //判断
                if (null!=user2) {
                    //修改
                    //数据修改
                    boolean b = userService.updateById(users);
                    if (b){
                        //异步同步到群防群控
                        myAsyncService.updateUserByQfqk(users);
                    }
                }else {
                    //新增
                    boolean save = userService.save(users);
                    if (save){
                        //异步同步到群防群控
                        myAsyncService.qfqkUserSave(users);
                    }
                }
                securityInvalidStatus.set(false);
                //保安证编号不匹配
                securityInvalidList.add(user.getCardid());
            }else {
                status.set(false);
                //已在其他单位存在
                errorList.add(user.getCardid());
            }
        }
//        int count = 0;
//        int flag = 1;
//        Result result0 = new Result();
//        //调用ftp获取返回数据
//        while (true){
//            System.out.println("用户新增开始接收消息......................");
//            Thread.sleep(2000);
//            //调用ftp获取返回数据
//            result0 = Monitor.isFTPFileExist(uuid);
//            System.out.println("result0 ftp 返回结果 = " + result0);
//            //如果返回true,就退处
//            if (result0.getCode()==200){
//                break;
//            }else{
//                //计数
//                count++;
//                //如果超过60s 没有读取到，则退出
//                if (count == 20) {
//                    break;
//                }
//            }
//        }
//
//        //将不能导入的保安员账号存起来
//        List<String> errorList = new ArrayList<>();
//        //保安员证编号不符的保安员信息存入集合
//        List<String> securityInvalidList = new ArrayList<>();
//        //导入状态，默认为true ,如果有一个出现问题则为 false
//        AtomicBoolean status = new AtomicBoolean(true);
//        AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
//        if (null!=result0){
//            Result result = result0.getData().get(0);
//            //用户数处理
//            User users = handlerUserInfo(uuid);
//            System.out.println("用户数据处理---------------");
//            System.out.println("用户数据 = " + users);
//            //判断结果
//            if (result.getCode()==200){
//                //新增
//                users.setId(result.getUserId());
//                users.setStatus(1);
//                //插入数据库
//                boolean save = userService.save(users);
//                if (save){
//                    //异步同步到群防群控
//                    myAsyncService.qfqkUserSave(users);
//                }
//            }else if (result.getCode()==201) {
//                //修改
//                users.setId(result.getUserId());
//                //先查询当前库是否有改用户？
//                User user2 = userService.getById(result.getUserId());
//                if (null!=user2) {
//                    //数据修改
//                    boolean b = userService.updateById(users);
//                    if (b) {
//                        //异步同步到群防群控
//                        myAsyncService.updateUserByQfqk(users);
//                    }
//                }else {
//                    //新增
//                    boolean save = userService.save(users);
//                    if (save){
//                        //异步同步到群防群控
//                        myAsyncService.qfqkUserSave(users);
//                    }
//                }
//            }else if (result.getCode()==203){
//                //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
//                //新增
//                users.setId(result.getUserId());
//                //插入数据库
//                boolean save = userService.save(users);
//                if (save) {
//                    //异步同步到群防群控
//                    myAsyncService.qfqkUserSave(users);
//                }
//                securityInvalidStatus.set(false);
//                //保安证编号不匹配
//                securityInvalidList.add(user.getCardid());
//            }else if (result.getCode()==204){
//                //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
//                users.setId(result.getUserId());
//                //先查询当前库是否有改用户？
//                User user2 = userService.getById(result.getUserId());
//                //判断
//                if (null!=user2) {
//                    //修改
//                    //数据修改
//                    boolean b = userService.updateById(users);
//                    if (b){
//                        //异步同步到群防群控
//                        myAsyncService.updateUserByQfqk(users);
//                    }
//                }else {
//                    //新增
//                    boolean save = userService.save(users);
//                    if (save){
//                        //异步同步到群防群控
//                        myAsyncService.qfqkUserSave(users);
//                    }
//                }
//                securityInvalidStatus.set(false);
//                //保安证编号不匹配
//                securityInvalidList.add(user.getCardid());
//            }else {
//                status.set(false);
//                //已在其他单位存在
//                errorList.add(user.getCardid());
//            }
//        }

        //如果所有数据导入有一个异常
        StringBuilder errorBuilder = new StringBuilder();
        if (!status.get()){
            String errorAccount = StringUtils.join(errorList, "\\\n");
            errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
        }
        //抛出异常
        if (errorBuilder.length()>0){
            throw new org.springblade.core.log.exception.ServiceException(errorBuilder.toString());
        }

        if (!securityInvalidStatus.get()){
//            return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
            return R.data(201, null, "保安证编号不匹配,请核实!");
        }
//        StringBuilder errorBuilder = new StringBuilder();
//        if (!status.get()){
//            String errorAccount = StringUtils.join(errorList, "\\\n");
//            errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
//        }
//        //抛出异常
//        if (errorBuilder.length()>0){
//            throw new org.springblade.core.log.exception.ServiceException(errorBuilder.toString());
//        }
//
//        if (!securityInvalidStatus.get()){
////            return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
//            return R.data(201, null, "保安证编号不匹配,请核实!");
//        }
        return R.data(200, null, "新增成功!");
    }