From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java | 110 ++++++++++---------------------------------------------
1 files changed, 20 insertions(+), 90 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
index f3b18a9..551faab 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
@@ -3,37 +3,23 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.AllArgsConstructor;
-import org.springblade.common.utils.QRCodeUtil;
-import org.springblade.modules.FTP.FtpUtil;
-import org.springblade.modules.accreditation.excel.ExportSecurityPaperExcel;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.entity.ScoreAuditRecords;
import org.springblade.modules.exam.mapper.ScoreAuditRecordsMapper;
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.service.ScoreAuditRecordsService;
-import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ScoreAuditRecordsVO;
-import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-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.*;
/**
* 考试成绩修改申请记录服务实现类
@@ -53,6 +39,8 @@
@Autowired
private SecurityPaperService securityPaperService;
+ @Autowired
+ private MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -146,7 +134,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -156,49 +145,11 @@
user.setUserType(7);
//如果已有保安证编号，不更保安证编号信息
if (null == user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
- //去生成保安证编号
- String pre = SecurityPaperUtil.getSecurityPaper();
- //查询当前年份已有的保安证编号
- int count = userService.getSecurityPaperCount(pre);
- String result = null;
- if (count == 0) {
- result = pre + "00001";
- } else {
- //格式化
- DecimalFormat decimalFormat = new DecimalFormat("00000");
- count++;
- result = pre + (decimalFormat.format(count));
- }
- user.setSecuritynumber(result);
- //修改为持证保安
- user.setHold("1");
- //更新保安数据
- userService.updateById(user);
-
- //生成保安证的同时向保安证管理表中插入一条数据
- SecurityPaper securityPaper = new SecurityPaper();
- securityPaper.setUserId(user.getId());
- securityPaper.setNumber(result);
- securityPaper.setCreateTime(new Date());
- securityPaper.setIdCardNo(user.getCardid());
- securityPaper.setPeopleName(user.getRealName());
- securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
- securityPaper.setApplyId(examScore.getApplyId());
- //新增保安员证信息
- securityPaperService.save(securityPaper);
-
- //数据同步
- String s1 =
- "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id) " +
- "values(" + "'" + securityPaper.getId() + "'"
- + "," + "'" + securityPaper.getNumber() +"'"
- + "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(securityPaper.getCreateTime()) +"'"
- + "," + "'" + securityPaper.getPeopleName() + "'"
- + "," + "'" + securityPaper.getIdCardNo() + "'"
- + "," + "'" + securityPaper.getUserId() + "'"
- + "," + "'" + securityPaper.getApplyId() + "'"
- + "," +"'" + securityPaper.getExamId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //去内网生成保安证编号，由内网生成，无需返回
+ //数据推送
+ Map<String, Object> map = new HashMap<>(1);
+ map.put("key",examScore);
+ myAsyncService.FTPSecurityNumberBit(map);
}
} else {
//不合格
@@ -238,7 +189,7 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
@@ -312,7 +263,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -322,33 +274,11 @@
user.setUserType(7);
//如果已有保安证编号，不更保安证编号信息
if (null == user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
- //去生成保安证编号
- String pre = SecurityPaperUtil.getSecurityPaper();
- //查询当前年份已有的保安证编号
- int count = userService.getSecurityPaperCount(pre);
- String result = null;
- if (count == 0) {
- result = pre + "00001";
- } else {
- //格式化
- DecimalFormat decimalFormat = new DecimalFormat("00000");
- count++;
- result = pre + (decimalFormat.format(count));
- }
- user.setSecuritynumber(result);
- //发证日期
-// user.setPaperTime(new Date());
- //修改为持证保安
- user.setHold("1");
- //更新保安数据
- userService.updateById(user);
-
-// String s1 =
-// "update blade_user set hold = " + "'" + user.getHold() + "'" +
-// ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
-// ",is_train = " + "'" + user.getIsTrain() + "'" +
-// " " + "where id = " + "'" + user.getId() + "'";
-// FtpUtil.sqlFileUpload(s1);
+ //去内网生成保安证编号，由内网生成，无需返回
+ //数据推送
+ Map<String, Object> map = new HashMap<>(1);
+ map.put("key",examScore);
+ myAsyncService.FTPSecurityNumberBit(map);
}
} else {
//不合格
@@ -387,7 +317,7 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
--
Gitblit v1.9.3