枪支，考试成绩，保安员证编号生成，单位信息基本信息，许可证信息，主要管理人，出资人信息，社保记录信息新增导入敏感数据处理

Administrator

2022-05-06 49c5471cc12d7ec57db3cad6964b7e4f61d472f2

枪支，考试成绩，保安员证编号生成，单位信息基本信息，许可证信息，主要管理人，出资人信息，社保记录信息新增导入敏感数据处理

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

@@ -32,8 +32,7 @@
    private RedisTemplate redisTemplate;



    /**
    /**
     * 初始化
     */
    @PostConstruct
@@ -44,6 +43,26 @@
    }

    /**
     * 获取保安员证编号位数
     * @param json
     * @param uuid
     * @return
     */
    public static Result handlerSecurityNumberBit(String json, String uuid) {
        Map map = JSON.parseObject(json, Map.class);
        //获取结果
        Object o = map.get(uuid);
        if (null== o || o.equals("")){
            return new Result(400,null,"uuid 不匹配",null);
        }else {
            //转换
            Result result = JSON.parseObject(o.toString(), Result.class);
            //返回
            return result;
        }
    }

    /**
     * 读取数据
     * @param json
     * @param uuid
@@ -51,16 +70,14 @@
     */
    public static Result handlerList(String json, String uuid) {
        Map map = JSON.parseObject(json, Map.class);
        System.out.println("map = " + map);
        //获取结果
        Object o = map.get(uuid);
        System.out.println("o = " + o);
        if (null== o || o.equals("")){
            return new Result(400,null,"uuid 不匹配",null);
        }else {
            //转换
            Result result = JSON.parseObject(o.toString(), Result.class);
            System.out.println("result = " + result);
            //返回
            return result;
        }
    }

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

@@ -347,7 +347,6 @@
     */
    public static void objectFileUploadListUserId(Map<String, Object> map){
        String json1 = JSON.toJSONString(map);
        System.out.println("json1 = " + json1);
        String response1 = String.valueOf((new Date()).getTime());
        OutJson.createJsonFile(json1, localPath, "t"+response1);
        FileInputStream in1 = null;
@@ -359,4 +358,22 @@
        FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "t"+response1+".json", in1);
        MysqlCenlint.deletess("t"+response1+".json");
    }

    /**
     * 查询保安员证编号位数
     * @param map
     */
    public static void getSecurityNumberBit(Map<String, Object> map) {
        String json1 = JSON.toJSONString(map);
        String response1 = String.valueOf((new Date()).getTime());
        OutJson.createJsonFile(json1, localPath, "s"+response1);
        FileInputStream in1 = null;
        try {
            in1 = new FileInputStream(new File(localPath + "s"+response1+".json"));
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        }
        FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "s"+response1+".json", in1);
        MysqlCenlint.deletess("s"+response1+".json");
    }
}

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

@@ -10,6 +10,8 @@

import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.SocketException;
import java.util.List;

import static org.springblade.common.config.FtpConfig.*;
@@ -348,4 +350,79 @@
        }
        return false;
    }

    /**
     * 获取保安证编号位数
     * @param uuid 随机数
     * @return
     */
    public static Result getSecurityNumberBit(String uuid) {
        //创建 ftp 对象
        FTPClient ftp = new FTPClient();
        boolean flag = false;
        try {
            //连接
            ftp.connect(ftpHost, ftpPort);
            // 登陆
            ftp.login(ftpUserName, ftpPassword);
            // 检验登陆操作的返回码是否正确
            if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                ftp.disconnect();
                return new Result(400,null,"ftp 连接失败",null);
            }

            ftp.enterLocalActiveMode();

            // 设置文件类型为二进制，与ASCII有区别
            ftp.setFileType(FTP.BINARY_FILE_TYPE);

            // 设置编码格式
            ftp.setControlEncoding("GBK");

            // 检验文件是否存在
            ftp.changeWorkingDirectory(ftpPath);
            FTPFile[] files = ftp.listFiles();
            if (files.length==0){
                return new Result(400,null,"未读取到文件",null);
            } else {
                for (FTPFile file : files){
                    String fileName = file.getName();
                    InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
                    String substring1 = fileName.substring(0, 2);
                    if (substring1.equals("ns")){
                        //把文件下载到本地
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        //数据处理
                        Result result = DataHandler.handlerSecurityNumberBit(s,uuid);
                        //匹配上了删除文件
                        if (result.getCode()==200) {
                            //删除本地文件
                            MysqlCenlint.deletess(fileName);
                            //删除 ftp 文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
                            //返回
                            return result;
                        }
                        is.close();
                        ftp.completePendingCommand();
                    }
                }
                return new Result(400,null,"未读取到对应的文件",null);
            }
        } catch (Exception e) {
            System.out.println("ftp连接失败");
            e.printStackTrace();
        } finally {
            if (ftp != null) {
                try {
                    ftp.disconnect();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return new Result(400,null,"失败",null);
    }
}

 src/main/java/org/springblade/modules/equipage/controller/GunController.java

@@ -86,15 +86,33 @@
    @PostMapping("/submit")
    public R submit(@RequestBody Gun gun) {
        boolean status = false;
        //脱敏处理
        Gun gun1 = gun;
        gun1.setCardNumber("***");
        gun1.setIssueTime(null);
        gun1.setValidTime(null);
        if (null!=gun1.getIssueUnit() && !gun1.getIssueUnit().equals("")){
            gun1.setIssueUnit("***");
        }
        if (null!=gun1.getGunMode() && !gun1.getGunMode().equals("")){
            gun1.setGunMode("***");
        }
        if (null!=gun1.getPersonInCharge() && !gun1.getPersonInCharge().equals("")){
            gun1.setPersonInCharge("***");
        }
        if (null!=gun1.getCardNo() && !gun1.getCardNo().equals("")){
            gun1.setCardNo("***");
        }
        gun1.setValidTime(null);
        if (null == gun.getId()) {
            //新增
            status = gunService.save(gun);
            status = gunService.save(gun1);
            if (status) {
                //数据同步
                String s1 =
                    "insert into sys_gun(id,issue_unit,card_number,gun_mode," +
                        "dept_id,person_in_charge,issue_time,valid_time,jurisdiction,card_no) " +
                        "values(" + "'" + gun.getId() + "'" + "," +
                        "values(" + "'" + gun1.getId() + "'" + "," +
                        "'" + gun.getIssueUnit() + "'" + "," +
                        "'" + gun.getCardNumber() + "'" + "," +
                        "'" + gun.getGunMode() + "'" + "," +
@@ -104,12 +122,11 @@
                        "'" + new SimpleDateFormat("yyyy-MM-dd").format(gun.getValidTime()) + "'" + "," +
                        "'" + gun.getCardNo() + "'" + "," +
                        "'" + gun.getJurisdiction() + "'" + ")";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.FTP(s1);
            }
        } else {
            //修改
            status = gunService.updateById(gun);
            status = gunService.updateById(gun1);
            if (status) {
                //内网同步
                String s1 =
@@ -123,7 +140,6 @@
                        ",jurisdiction = " + "'" + gun.getJurisdiction() + "'" +
                        ",card_no = " + "'" + gun.getCardNo() + "'" +
                        " " + "where id = " + "'" + gun.getId() + "'";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.FTP(s1);
            }
        }

 src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java

@@ -80,14 +80,32 @@
                    throw new ServiceException("导入失败!公司名:["+gunExcel.getDeptId()+"]不存在!");
                }

                //脱敏处理
                Gun gun1 = gun;
                gun1.setCardNumber("***");
                gun1.setIssueTime(null);
                gun1.setValidTime(null);
                if (null!=gun1.getIssueUnit() && !gun1.getIssueUnit().equals("")){
                    gun1.setIssueUnit("***");
                }
                if (null!=gun1.getGunMode() && !gun1.getGunMode().equals("")){
                    gun1.setGunMode("***");
                }
                if (null!=gun1.getPersonInCharge() && !gun1.getPersonInCharge().equals("")){
                    gun1.setPersonInCharge("***");
                }
                if (null!=gun1.getCardNo() && !gun1.getCardNo().equals("")){
                    gun1.setCardNo("***");
                }

                //新增车辆数据
                this.save(gun);
                this.save(gun1);

                //数据同步
                String s1 =
                    "insert into sys_gun(id,issue_unit,card_number,gun_mode," +
                        "dept_id,person_in_charge,card_no) " +
                        "values(" + "'" + gun.getId() + "'" + "," +
                        "values(" + "'" + gun1.getId() + "'" + "," +
                        "'" + gun.getIssueUnit() + "'" + "," +
                        "'" + gun.getCardNumber() + "'" + "," +
                        "'" + gun.getGunMode() + "'" + "," +

 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java

@@ -1,6 +1,7 @@
package org.springblade.modules.exam.controller;

import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +17,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExamScoreExcel;
@@ -34,6 +37,7 @@
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -63,6 +67,8 @@
    private final SecurityPaperService securityPaperService;

    private final MyAsyncService myAsyncService;

    private final RedisTemplate redisTemplate;

    /**
     * 自定义分页
@@ -172,9 +178,9 @@
        if (null != examScore.getLearnGrade() && null != examScore.getTheoryGrade()) {
            ExamScore examScore1 = examScoreService.getById(examScore.getId());
            //查询当前保安信息
            UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
            UserVO user1 = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
            //再根据身份证号查询用户,方式用户考了试，被删除，又新建的情况,修改最新用户的状态信息
            User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
//            User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
            //考试合格
            if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
                //合格
@@ -189,7 +195,40 @@
                    //去生成保安证编号
                    String pre = SecurityPaperUtil.getSecurityPaper();
                    //查询当前年份已有的保安证编号
                    int max = userService.getSecurityPaperCount(pre);
//                    int max = userService.getSecurityPaperCount(pre);
                    //需调用内网查询
                    //生成随机数
                    String uuid = UUID.randomUUID().toString();

                    //数据推送
                    Map<String, Object> map = new HashMap<>(1);
                    map.put(uuid,pre);
                    myAsyncService.FTPSecurityNumberBit(map);

                    int count = 0;
                    Result result0 = new Result();
                    //调用ftp获取返回数据
                    while (true){
                        try {
                            Thread.sleep(1000);
                        } catch (InterruptedException e) {
                            e.printStackTrace();
                        }
                        //调用ftp获取返回数据
                        result0 = Monitor.getSecurityNumberBit(uuid);
                        //如果返回true,就退处
                        if (result0.getCode()==200){
                            break;
                        }else{
                            //计数
                            count++;
                            //如果超过100s 没有读取到，则退出
                            if (count == 100) {
                                break;
                            }
                        }
                    }
                    int max = Integer.parseInt(result0.getMsg());
                    String result = null;
                    if (max == 0) {
                        result = pre + "00001";
@@ -205,7 +244,7 @@
                    securityPaper.setUserId(user1.getId());
                    securityPaper.setNumber(result);
                    securityPaper.setCreateTime(new Date());
                    securityPaper.setIdCardNo(user.getCardid());
                    securityPaper.setIdCardNo(user1.getCardid());
                    securityPaper.setPeopleName(user1.getRealName());
                    securityPaper.setExamId(Long.parseLong(examScore1.getExamId()));
                    securityPaper.setApplyId(examScore1.getApplyId());
@@ -256,14 +295,14 @@
                examScore.setQualified(1);
            }
            //总成绩
            if (user.getAge() <= 50) {
            if (user1.getAge() <= 50) {
                if (null != examScore1.getTheoryGrade()) {
                    examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
                } else {
                    examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
                }
            }
            if (user.getAge() > 50) {
            if (user1.getAge() > 50) {
                if (null != examScore1.getTheoryGrade()) {
                    examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
                        + Integer.parseInt(String.valueOf(Math.round(examScore.getLearnGrade() * 0.5))));

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -8,6 +8,8 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.service.ApplyService;
import org.springblade.modules.exam.entity.*;
@@ -305,15 +307,48 @@
                                            //去生成保安证编号
                                            String pre = SecurityPaperUtil.getSecurityPaper();
                                            //查询当前年份已有的保安证编号
                                            int count = userService.getSecurityPaperCount(pre);
//                                            int count = userService.getSecurityPaperCount(pre);
                                            //需调用内网查询
                                            //生成随机数
                                            String uuid = UUID.randomUUID().toString();

                                            //数据推送
                                            Map<String, Object> map = new HashMap<>(1);
                                            map.put(uuid,pre);
                                            myAsyncService.FTPSecurityNumberBit(map);

                                            int count = 0;
                                            Result result0 = new Result();
                                            //调用ftp获取返回数据
                                            while (true){
                                                try {
                                                    Thread.sleep(1000);
                                                } catch (InterruptedException e) {
                                                    e.printStackTrace();
                                                }
                                                //调用ftp获取返回数据
                                                result0 = Monitor.getSecurityNumberBit(uuid);
                                                //如果返回true,就退处
                                                if (result0.getCode()==200){
                                                    break;
                                                }else{
                                                    //计数
                                                    count++;
                                                    //如果超过100s 没有读取到，则退出
                                                    if (count == 100) {
                                                        break;
                                                    }
                                                }
                                            }
                                            int max = Integer.parseInt(result0.getMsg());
                                            String result = null;
                                            if (count == 0) {
                                            if (max == 0) {
                                                result = pre + "00001";
                                            } else {
                                                //格式化
                                                DecimalFormat decimalFormat = new DecimalFormat("00000");
                                                count++;
                                                result = pre + (decimalFormat.format(count));
                                                max++;
                                                result = pre + (decimalFormat.format(max));
                                            }
                                            //脱敏处理
                                            user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(result));

 src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java

@@ -7,6 +7,8 @@
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
import org.springblade.modules.accreditation.excel.ExportSecurityPaperExcel;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.entity.ScoreAuditRecords;
@@ -32,10 +34,7 @@
import java.net.URLEncoder;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 考试成绩修改申请记录服务实现类
@@ -164,15 +163,48 @@
                        //去生成保安证编号
                        String pre = SecurityPaperUtil.getSecurityPaper();
                        //查询当前年份已有的保安证编号
                        int count = userService.getSecurityPaperCount(pre);
//                        int count = userService.getSecurityPaperCount(pre);
                        //需调用内网查询
                        //生成随机数
                        String uuid = UUID.randomUUID().toString();

                        //数据推送
                        Map<String, Object> map = new HashMap<>(1);
                        map.put(uuid,pre);
                        myAsyncService.FTPSecurityNumberBit(map);

                        int count = 0;
                        Result result0 = new Result();
                        //调用ftp获取返回数据
                        while (true){
                            try {
                                Thread.sleep(1000);
                            } catch (InterruptedException e) {
                                e.printStackTrace();
                            }
                            //调用ftp获取返回数据
                            result0 = Monitor.getSecurityNumberBit(uuid);
                            //如果返回true,就退处
                            if (result0.getCode()==200){
                                break;
                            }else{
                                //计数
                                count++;
                                //如果超过100s 没有读取到，则退出
                                if (count == 100) {
                                    break;
                                }
                            }
                        }
                        int max = Integer.parseInt(result0.getMsg());
                        String result = null;
                        if (count == 0) {
                        if (max == 0) {
                            result = pre + "00001";
                        } else {
                            //格式化
                            DecimalFormat decimalFormat = new DecimalFormat("00000");
                            count++;
                            result = pre + (decimalFormat.format(count));
                            max++;
                            result = pre + (decimalFormat.format(max));
                        }
                        user.setSecuritynumber(result);
                        //修改为持证保安

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -26,6 +26,7 @@
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -193,8 +194,20 @@

        information.setCreateTime(new Date());

        Information information1 = information;
        //敏感数据处理
        if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
            information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
        }
        if (null!=information1.getContacts() && !information1.getContacts().equals("")) {
            information1.setContacts(DesensitizedUtil.desensitizedName(information1.getContacts()));
        }
        if (null!=information1.getContactscell() && !information1.getContactscell().equals("")) {
            information1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(information1.getContactscell()));
        }

        //公司新增
        boolean status = informationService.save(information);
        boolean status = informationService.save(information1);

        //公司新增成功则创建默认账户，公司名即为账号名，默认密码为 123456
        if (status) {
@@ -230,7 +243,7 @@
                    ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
                    " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
                    "contacts,contactscell,create_time,create_user_id) " +
                    "values(" + "'" + information.getId() + "'" +
                    "values(" + "'" + information1.getId() + "'" +
                    "," + "'" + information.getCreditcode() + "'" +
                    "," + "'" + information.getEnterprisename() + "'" +
                    "," + "'" + information.getRepresentative() + "'" +
@@ -284,7 +297,18 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入information")
    public R update(@Valid @RequestBody Information information) throws Exception {
        boolean b = informationService.updateById(information);
        Information information1 = information;
        //敏感数据处理
        if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
            information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
        }
        if (null!=information1.getContacts() && !information1.getContacts().equals("")) {
            information1.setContacts(DesensitizedUtil.desensitizedName(information1.getContacts()));
        }
        if (null!=information1.getContactscell() && !information1.getContactscell().equals("")) {
            information1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(information1.getContactscell()));
        }
        boolean b = informationService.updateById(information1);
        if (b) {
            String businessLicense = null;
            String businessLicenses = null;
@@ -306,6 +330,8 @@
            if (information.getEstablishtime() != null && !"".equals(information.getEstablishtime())) {
                format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
            }


            //内网同步
            String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
                ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +

 src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java

@@ -3,14 +3,17 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.licence.entity.LicencePaper;
import org.springblade.modules.licence.service.LicencePaperService;
import org.springblade.modules.licence.vo.LicencePaperVo;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@@ -25,6 +28,8 @@
public class LicencePaperController {

    private final LicencePaperService licencePaperService;

    private final MyAsyncService myAsyncService;


//    /**
@@ -64,13 +69,64 @@
     */
    @PostMapping("/submit")
    public R submit(@RequestBody LicencePaper licencePaper){
        LicencePaper licencePaper1 = licencePaper;
        //脱敏处理
        if (null!= licencePaper.getApprovalNumber() && !licencePaper.getApprovalNumber().equals("")){
            licencePaper.setApprovalNumber(DesensitizedUtil.desensitizedSecurityNumber(licencePaper.getApprovalNumber()));
        }
        if (null!= licencePaper.getLicenceIssuingUnit() && !licencePaper.getLicenceIssuingUnit().equals("")){
            licencePaper.setLicenceIssuingUnit(DesensitizedUtil.desensitizedSecurityNumber(licencePaper.getLicenceIssuingUnit()));
        }
        if (null!= licencePaper.getRegisterCapital() && !licencePaper.getRegisterCapital().equals("")){
            licencePaper.setRegisterCapital("**");
        }
        if (null!= licencePaper.getCode() && !licencePaper.getCode().equals("")){
            licencePaper.setCode(DesensitizedUtil.desensitizedSecurityNumber(licencePaper.getCode()));
        }
        if (null==licencePaper.getId()){
            licencePaper.setCreateTime(new Date());
            licencePaper.setUpdateTime(new Date());
            licencePaperService.save(licencePaper);
            //内网同步
            String s = "insert into sys_licence_paper(" +
                "id,type,unit_name,address,legal_people,content,approval_number,licence_issuing_unit,register_capital,code," +
                "licence_issuing_time,create_user,create_time,update_time,dept_id,url) " +
                "values(" + "'" + licencePaper.getId() + "'" + "," +
                "'" + licencePaper1.getType() + "'" + "," +
                "'" + licencePaper1.getUnitName() + "'" + "," +
                "'" + licencePaper1.getLegalPeople() + "'" + "," +
                "'" + licencePaper1.getContent() + "'" + "," +
                "'" + licencePaper1.getApprovalNumber() + "'" + "," +
                "'" + licencePaper1.getLicenceIssuingUnit() + "'" + "," +
                "'" + licencePaper1.getRegisterCapital() + "'" + "," +
                "'" + licencePaper1.getCode() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd").format(licencePaper1.getLicenceIssuingTime()) + "'" + "," +
                "'" + licencePaper1.getCreateUser() + "'" + "," +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(licencePaper1.getCreateTime()) + "'" +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(licencePaper1.getUpdateTime()) + "'" +
                "," + "'" + licencePaper1.getDeptId() + "'" +
                "," + "'" + licencePaper1.getUrl() + "'"
                + ")";
            myAsyncService.FTP(s);
        }else {
            licencePaper.setUpdateTime(new Date());
            licencePaperService.updateById(licencePaper);
            //内网同步
            String s1 =
                "update sys_licence_paper set unit_name = " + "'" + licencePaper1.getUnitName() + "'"
                    + ",address = " + "'" + licencePaper1.getAddress() + "'"
                    + ",legal_people = " + "'" + licencePaper1.getLegalPeople() + "'"
                    + ",content = " + "'" + licencePaper1.getContent() + "'"
                    + ",approval_number = " + "'" + licencePaper1.getApprovalNumber() + "'"
                    + ",licence_issuing_unit = " + "'" + licencePaper1.getLicenceIssuingUnit() + "'"
                    + ",register_capital = " + "'" + licencePaper1.getRegisterCapital() + "'"
                    + ",code = " + "'" + licencePaper1.getCode() + "'"
                    + ",licence_issuing_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(licencePaper1.getLicenceIssuingTime())  + "'"
                    + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(licencePaper1.getUpdateTime()) + "'"
                    + ",dept_id = " + "'" + licencePaper1.getDeptId() + "'"
                    + ",url = " + "'" + licencePaper1.getUrl() + "'"
                    + " " + "where id = " + "'" + licencePaper1.getId() + "'";
            myAsyncService.FTP(s1);
        }
        return R.data(licencePaper);
    }

 src/main/java/org/springblade/modules/member/controller/MemberController.java

@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@@ -103,11 +104,25 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入member")
    public R save(@Valid @RequestBody Member member) throws Exception {
        boolean save = memberService.save(member);
        Member member1 = member;
        if (null!=member1.getName() && !member1.getName().equals("")){
            member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
        }
        if (null!=member1.getPost() && !member1.getPost().equals("")){
            member1.setPost("***");
        }
        if (null!=member1.getCardid() && !member1.getCardid().equals("")){
            member1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(member1.getCardid()));
        }
        if (null!=member1.getCell() && !member1.getCell().equals("")){
            member1.setCell(DesensitizedUtil.desensitizedPhoneNumber(member1.getCell()));
        }
        //脱敏处理
        boolean save = memberService.save(member1);
        if (save) {
            String s1 =
                "insert into sys_member(id,name,post,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + member.getId() + "'" + "," +
                    "values(" + "'" + member1.getId() + "'" + "," +
                    "'" + member.getName() + "'" + "," +
                    "'" + member.getPost() + "'" + "," +
                    "'" + member.getCardid() + "'" + "," +
@@ -127,7 +142,20 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入member")
    public R update(@Valid @RequestBody Member member) throws Exception {
        boolean b = memberService.updateById(member);
        Member member1 = member;
        if (null!=member1.getName() && !member1.getName().equals("")){
            member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
        }
        if (null!=member1.getPost() && !member1.getPost().equals("")){
            member1.setPost("***");
        }
        if (null!=member1.getCardid() && !member1.getCardid().equals("")){
            member1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(member1.getCardid()));
        }
        if (null!=member1.getCell() && !member1.getCell().equals("")){
            member1.setCell(DesensitizedUtil.desensitizedPhoneNumber(member1.getCell()));
        }
        boolean b = memberService.updateById(member1);
        if (b) {
            String s1 = "update sys_member set name = " + "'" + member.getName() + "'" +
                ",post = " + "'" + member.getPost() + "'" +

 src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.member.entity.Member;
@@ -28,6 +29,7 @@
import org.springblade.modules.member.vo.MemberVO;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -47,6 +49,9 @@

    @Autowired
    private IUserDeptService userDeptService;

    @Autowired
    private MyAsyncService myAsyncService;

    @Override
    public IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member) {
@@ -72,7 +77,32 @@
            } catch (ParseException e) {
                e.printStackTrace();
            }
            this.save(member);
            Member member1 = member;
            if (null!=member1.getName() && !member1.getName().equals("")){
                member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
            }
            if (null!=member1.getPost() && !member1.getPost().equals("")){
                member1.setPost("***");
            }
            if (null!=member1.getCardid() && !member1.getCardid().equals("")){
                member1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(member1.getCardid()));
            }
            if (null!=member1.getCell() && !member1.getCell().equals("")){
                member1.setCell(DesensitizedUtil.desensitizedPhoneNumber(member1.getCell()));
            }
            this.save(member1);

            //同步
            String s1 =
                "insert into sys_member(id,name,post,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + member1.getId() + "'" + "," +
                    "'" + member.getName() + "'" + "," +
                    "'" + member.getPost() + "'" + "," +
                    "'" + member.getCardid() + "'" + "," +
                    "'" + member.getCell() + "'" + "," +
                    "'" + member.getCreditcode() + "'" + "," +
                    "'" + member.getDeptId() + "'" + ")";
            myAsyncService.FTP(s1);
        });
    }


 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -431,9 +431,10 @@
                User user = userService.getUserInfoByIdCardNo(idCardNo);
                //设置用户头像url
                if (null!=user){
                    user.setAvatar(urls);
//                    user.setAvatar(urls);
//                    user.setAvatar("");
                    //更新用户信息
                    userService.updateById(user);
//                    userService.updateById(user);

                    //内网数据推送
                    //数据推送

 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java

@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@@ -102,11 +103,19 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入shareholder")
    public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
        boolean save = shareholderService.save(shareholder);
        Shareholder shareholder1 = shareholder;
        //脱敏处理
        if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
            shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
        }
        if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
            shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
        }
        boolean save = shareholderService.save(shareholder1);
        if (shareholder.getCapitaltime() == null) {
            String s1 =
                "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + shareholder.getId() + "'" + "," +
                    "values(" + "'" + shareholder1.getId() + "'" + "," +
                    "'" + shareholder.getShareholder() + "'" + "," +
                    "'" + shareholder.getShareholdingratio() + "'" + "," +
                    "'" + shareholder.getCapital() + "'" + "," +
@@ -119,7 +128,7 @@
        } else {
            String s1 =
                "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + shareholder.getId() + "'" + "," +
                    "values(" + "'" + shareholder1.getId() + "'" + "," +
                    "'" + shareholder.getShareholder() + "'" + "," +
                    "'" + shareholder.getShareholdingratio() + "'" + "," +
                    "'" + shareholder.getCapital() + "'" + "," +
@@ -141,7 +150,15 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入shareholder")
    public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
        boolean b = shareholderService.updateById(shareholder);
        Shareholder shareholder1 = shareholder;
        //脱敏处理
        if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
            shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
        }
        if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
            shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
        }
        boolean b = shareholderService.updateById(shareholder1);
        if (shareholder.getCapitaltime() == null) {
            //内网同步
            String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +

 src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.information.entity.Information;
@@ -27,6 +28,7 @@
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -46,6 +48,9 @@

    @Autowired
    private IUserDeptService userDeptService;

    @Autowired
    private MyAsyncService myAsyncService;

    @Override
    public IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder) {
@@ -77,7 +82,44 @@
            if (null!=shareExcel.getShareholdingratio() && shareExcel.getShareholdingratio()!=""){
                shareholder.setShareholdingratio(shareExcel.getShareholdingratio());
            }
            this.save(shareholder);

            Shareholder shareholder1 = shareholder;
            //脱敏处理
            if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
                shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
            }
            if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
                shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
            }
            //新增
            this.save(shareholder1);

            if (shareholder.getCapitaltime() == null) {
                String s1 =
                    "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
                        "values(" + "'" + shareholder1.getId() + "'" + "," +
                        "'" + shareholder.getShareholder() + "'" + "," +
                        "'" + shareholder.getShareholdingratio() + "'" + "," +
                        "'" + shareholder.getCapital() + "'" + "," +
                        "'" + shareholder.getCardid() + "'" + "," +
                        "'" + shareholder.getCell() + "'" + "," +
                        "'" + shareholder.getCreditcode() + "'" + "," +
                        "'" + shareholder.getDeptId() + "'" + ")";
                myAsyncService.FTP(s1);
            } else {
                String s1 =
                    "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
                        "values(" + "'" + shareholder1.getId() + "'" + "," +
                        "'" + shareholder.getShareholder() + "'" + "," +
                        "'" + shareholder.getShareholdingratio() + "'" + "," +
                        "'" + shareholder.getCapital() + "'" + "," +
                        "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" + "," +
                        "'" + shareholder.getCardid() + "'" + "," +
                        "'" + shareholder.getCell() + "'" + "," +
                        "'" + shareholder.getCreditcode() + "'" + "," +
                        "'" + shareholder.getDeptId() + "'" + ")";
                myAsyncService.FTP(s1);
            }
        });
    }


 src/main/java/org/springblade/modules/social/controller/SocialController.java

@@ -38,6 +38,7 @@
import org.springblade.modules.social.service.ISocialService;
import org.springblade.modules.social.vo.SocialVO;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -63,6 +64,8 @@
public class SocialController extends BladeController {

    private final ISocialService socialService;

    private final MyAsyncService myAsyncService;

    /**
     * 详情
@@ -104,8 +107,31 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入social")
    public R save(@Valid @RequestBody Social social) {
        socialService.upSoil(social.getCardid());
        return R.status(socialService.save(social));
        //修改为已参保
        socialService.upSoil(social.getNamb());
        //新增社保记录
        boolean save = socialService.save(social);
        if (save){
            //内网同步
            String s = "insert into sys_socil(" +
                "id,namb,sex,nation,telephone,cardid,residence,address," +
                "nature,amount,insuredtime,deptid) " +
                "values(" + "'" + social.getId() + "'" + "," +
                "'" + social.getNamb() + "'" + "," +
                "'" + social.getSex() + "'" + "," +
                "'" + social.getNation() + "'" + "," +
                "'" + social.getTelephone() + "'" + "," +
                "'" + social.getCardid() + "'" + "," +
                "'" + social.getResidence() + "'" + "," +
                "'" + social.getAddress() + "'" + "," +
                "'" + social.getNature() + "'" + "," +
                "'" + social.getAmount() + "'" + "," +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(social.getInsuredtime()) + "'" +
                "," + "'" + social.getDeptid() + "'"
                + ")";
            myAsyncService.FTP(s);
        }
        return R.status(save);
    }

    /**

 src/main/java/org/springblade/modules/social/mapper/SocialMapper.java

@@ -39,5 +39,10 @@
     * @return
     */
    List<SocialVO> selectSocialPage(IPage page, SocialVO social);
  void upSoil(String cardid);

    /**
     * 修改为已参保
     * @param cardid
     */
    void upSoil(String cardid);
}

 src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml

@@ -21,7 +21,7 @@
    </resultMap>


    <select id="selectSocialPage" resultMap="socialResultMap">
    <select id="selectSocialPage" resultType="org.springblade.modules.social.vo.SocialVO">
        SELECT
        s.*,
        u.real_name as realname
@@ -57,7 +57,7 @@
    </select>

    <update id="upSoil">
        update blade_user set soil=0 where cardid=#{cardid}
        update blade_user set soil=0 where id=#{cardid}
    </update>

</mapper>

 src/main/java/org/springblade/modules/social/service/ISocialService.java

@@ -48,5 +48,10 @@
     * @return
     */
    void importUser(List<SocialExcel> data, Boolean isCovered,String deptid);

    /**
     * 修改为已参保
     * @param cardid
     */
    void upSoil(String cardid);
}

 src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java

@@ -25,9 +25,11 @@
import org.springblade.modules.social.mapper.SocialMapper;
import org.springblade.modules.social.service.ISocialService;
import org.springblade.modules.social.vo.SocialVO;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -41,7 +43,8 @@
@Service
public class SocialServiceImpl extends ServiceImpl<SocialMapper, Social> implements ISocialService {


    @Autowired
    private MyAsyncService myAsyncService;

    @Override
    public IPage<SocialVO> selectSocialPage(IPage<SocialVO> page, SocialVO social) {
@@ -81,10 +84,35 @@
            }
            social.setDeptid(deptid);
            this.upSoil(social.getCardid());
            this.save(social);

            boolean save = this.save(social);
            if (save) {
                //内网同步
                String s = "insert into sys_socil(" +
                    "id,namb,sex,nation,telephone,cardid,residence,address," +
                    "nature,amount,insuredtime,deptid) " +
                    "values(" + "'" + social.getId() + "'" + "," +
                    "'" + social.getNamb() + "'" + "," +
                    "'" + social.getSex() + "'" + "," +
                    "'" + social.getNation() + "'" + "," +
                    "'" + social.getTelephone() + "'" + "," +
                    "'" + social.getCardid() + "'" + "," +
                    "'" + social.getResidence() + "'" + "," +
                    "'" + social.getAddress() + "'" + "," +
                    "'" + social.getNature() + "'" + "," +
                    "'" + social.getAmount() + "'" + "," +
                    "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(social.getInsuredtime()) + "'" +
                    "," + "'" + social.getDeptid() + "'"
                    + ")";
                myAsyncService.FTP(s);
            }
        });
    }

    /**
     * 修改为已参保
     * @param cardid
     */
    @Override
    public void upSoil(String cardid) {
        baseMapper.upSoil(cardid);

 src/main/java/org/springblade/modules/system/service/MyAsyncService.java

@@ -183,4 +183,12 @@
    public void FTPObjectListUserId(Map<String, Object> map) {
        FtpUtil.objectFileUploadListUserId(map);
    }

    /**
     * 查询保安员证编号位数
     * @param map
     */
    public void FTPSecurityNumberBit(Map<String, Object> map) {
        FtpUtil.getSecurityNumberBit(map);
    }
}