智慧保安后台管理-外网
Administrator
2022-07-13 91cb12265462fbee47c2d0965f967ba72248bfe8
制证申请流程修改,去除去重校验,防止丢包问题
2 files modified
64 ■■■■ changed files
src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java 60 ●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
@@ -70,42 +70,42 @@
            //判断类型,如果是上岗证则判断是否有申请,有申请的不在新增记录
            if (accreditationRecords.getType() == 1) {
                //查询当前人员是否有申请记录
                int count = baseMapper.getAccreditationRecordsByUserIdCount(id);
                if (count < 1) {
                    //新增
                    this.save(records);
//                int count = baseMapper.getAccreditationRecordsByUserIdCount(id);
//                if (count < 1) {
                //新增
                this.save(records);
                    //内网新增
                    String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
                        "values(" + "'" + records.getId() + "'" + ","
                        + "'" + records.getUserId() + "'" + ","
                        + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(records.getCreateTime()) + "'" + ","
                        + "'" + records.getCreateUser() + "'" + ","
                        + "'" + records.getStatus() + "'" + ","
                        + "'" + records.getType() + "'" + ","
                        + "'" + records.getAuditStatus() + "'" + ")";
                    myAsyncService.FTP(s);
                }
                //内网新增
                String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
                    "values(" + "'" + records.getId() + "'" + ","
                    + "'" + records.getUserId() + "'" + ","
                    + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(records.getCreateTime()) + "'" + ","
                    + "'" + records.getCreateUser() + "'" + ","
                    + "'" + records.getStatus() + "'" + ","
                    + "'" + records.getType() + "'" + ","
                    + "'" + records.getAuditStatus() + "'" + ")";
                myAsyncService.FTP(s);
//                }
            }
            //判断类型,如果是证书的,审核未通过的可以再次申请,审核通过的,暂时不给于新增记录
            if (accreditationRecords.getType() == 2) {
                //查询当前人员是否有待审核和审核通过的记录数
                int count = baseMapper.getAccreditationRecordsByUserIdAuditCount(id, 2);
                if (count < 1) {
                    //新增
                    this.save(records);
//                int count = baseMapper.getAccreditationRecordsByUserIdAuditCount(id, 2);
//                if (count < 1) {
                //新增
                this.save(records);
                    //内网新增
                    String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
                        "values(" + "'" + records.getId() + "'" + ","
                        + "'" + records.getUserId() + "'" + ","
                        + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(records.getCreateTime()) + "'" + ","
                        + "'" + records.getCreateUser() + "'" + ","
                        + "'" + records.getStatus() + "'" + ","
                        + "'" + records.getType() + "'" + ","
                        + "'" + records.getAuditStatus() + "'" + ")";
                    myAsyncService.FTP(s);
                }
                //内网新增
                String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
                    "values(" + "'" + records.getId() + "'" + ","
                    + "'" + records.getUserId() + "'" + ","
                    + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(records.getCreateTime()) + "'" + ","
                    + "'" + records.getCreateUser() + "'" + ","
                    + "'" + records.getStatus() + "'" + ","
                    + "'" + records.getType() + "'" + ","
                    + "'" + records.getAuditStatus() + "'" + ")";
                myAsyncService.FTP(s);
//                }
            }
        });
src/main/resources/application-test.yml
@@ -13,7 +13,7 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: ZHba@0112
    # rabbitmq 设置
@@ -55,7 +55,7 @@
#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 192.168.0.198
  ftpPort: 21
  ftpUserName: arsn