From f6eeb01e5a77965facfb0ae9a517b09681b3f69f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Jun 2022 14:45:29 +0800
Subject: [PATCH] 实操成绩修改申请，成绩修改申请修改，保安员证编号由内网处理
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 158 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index e35da21..5083ee3 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,6 +1,8 @@
package org.springblade.modules.exam.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -8,18 +10,24 @@
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.springblade.common.excel.RowWriteHandler;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
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.ExamAnswerRecord;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
+import org.springblade.modules.exam.service.ExamAnswerRecordService;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.util.SecurityPaperUtil;
@@ -33,6 +41,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;
@@ -62,6 +71,11 @@
private final SecurityPaperService securityPaperService;
private final MyAsyncService myAsyncService;
+
+ private final RedisTemplate redisTemplate;
+
+
+ private final ExamAnswerRecordService examAnswerRecordService;
/**
* 自定义分页
@@ -171,9 +185,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) {
//合格
@@ -188,7 +202,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";
@@ -198,32 +245,55 @@
max++;
result = pre + (decimalFormat.format(max));
}
- user1.setSecuritynumber(result);
//生成保安证的同时向保安证管理表中插入一条数据
SecurityPaper securityPaper = new SecurityPaper();
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());
securityPaper.setSource(1);
+
+ //脱敏,内网
+ SecurityPaper paper1 = Objects.requireNonNull(BeanUtil.copy(securityPaper,SecurityPaper.class));
//新增保安员证信息
+ securityPaper.setIdCardNo("");
+ securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
securityPaperService.save(securityPaper);
+
+ //保安证编号同步内网
+ //设置id
+ paper1.setId(securityPaper.getId());
+ //数据同步
+ String s = "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id,source) " +
+ "values(" + "'" + paper1.getId() + "'" + "," +
+ "'" + paper1.getNumber() + "'" + "," +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(paper1.getCreateTime()) + "'" +
+ "," + "'" + paper1.getPeopleName() + "'" +
+ "," + "'" + paper1.getIdCardNo() + "'" +
+ "," + "'" + paper1.getUserId() + "'" +
+ "," + "'" + paper1.getApplyId() + "'" +
+ "," + "'" + paper1.getExamId() + "'" +
+ "," + "'" + paper1.getSource() + "'"
+ + ")";
+ myAsyncService.FTP(s);
+
+
//修改为持证保安
user1.setHold("1");
+ user1.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(result));
//更新保安数据
boolean b = userService.updateById(user1);
if (b) {
//数据同步
String s1 =
"update blade_user set hold = " + "'" + user1.getHold() + "'" +
- ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
+ ",securitynumber = " + "'" + result + "'" +
",user_type = " + "'" + user1.getUserType() + "'" +
" " + "where id = " + "'" + user1.getId() + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
}
}
@@ -232,14 +302,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))));
@@ -254,7 +324,6 @@
",all_grade = " + "'" + examScore.getAllGrade() + "'" +
",qualified = " + "'" + examScore.getQualified() + "'" +
" " + "where id = " + "'" + examScore.getId() + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
//本地修改
@@ -314,6 +383,17 @@
public R<ExamScore> detail(ExamScore examScore) {
//查询考试成绩详情
ExamScore detail = examScoreService.getOne(Condition.getQueryWrapper(examScore));
+ //计算成绩
+ ExamAnswerRecord record = new ExamAnswerRecord();
+ record.setScoreId(detail.getId());
+ List<ExamAnswerRecord> list = examAnswerRecordService.list(new QueryWrapper<>(record));
+ int num = 0;
+ if (list.size()>0){
+ for (ExamAnswerRecord examAnswerRecord : list) {
+ num = num + examAnswerRecord.getAnswerScore();
+ }
+ }
+ detail.setTheoryGrade(num);
//返回
return R.data(detail);
}
@@ -342,16 +422,16 @@
ExamScoreExcel examScoreExcel = new ExamScoreExcel();
examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel.setName("张三");
- examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
-// examScoreExcel.setCandidateNo("2110**m0001");
+// examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
+ examScoreExcel.setCandidateNo("2110**m0001");
examScoreExcel.setLearnGrade(80);
list.add(examScoreExcel);
ExamScoreExcel examScoreExcel1 = new ExamScoreExcel();
examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel1.setName("李四");
- examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
-// examScoreExcel1.setCandidateNo("2110**m0002");
+// examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
+ examScoreExcel1.setCandidateNo("2110**m0002");
examScoreExcel1.setLearnGrade(88);
list.add(examScoreExcel1);
// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
@@ -490,4 +570,68 @@
}
+ /**
+ * 考试成绩同步
+ * @param time
+ * @param startScore
+ * @param endScore
+ * @return
+ */
+ @GetMapping("/examScoreSync")
+ public void examScoreSync(String time,Integer startScore,Integer endScore) {
+ System.out.println("考试成绩同步"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ //查询当天的考试成绩
+ List<ExamScore> examScoreList = examScoreService.getExamScoreListByTime(time);
+ if (examScoreList.size()>0) {
+ //遍历计算成绩
+ for (ExamScore examScore : examScoreList) {
+ ExamAnswerRecord record = new ExamAnswerRecord();
+ record.setScoreId(examScore.getId());
+ List<ExamAnswerRecord> list = examAnswerRecordService.list(new QueryWrapper<>(record));
+ if (list.size()>0){
+ int num = 0;
+ for (ExamAnswerRecord examAnswerRecord : list) {
+ num = num + examAnswerRecord.getAnswerScore();
+ examScore.setExamEndTime(examAnswerRecord.getAnswerTime());
+ }
+ examScore.setTheoryGrade(num);
+ examScore.setAllGrade(Math.round(num/2));
+ //设置状态
+ if (num >= 60) {
+ examScore.setQualified(2);
+ } else {
+ examScore.setQualified(1);
+ }
+ examScoreService.updateById(examScore);
+ }
+ }
+ }
+
+ //查询当天的考试成绩(计算过后的)
+ List<ExamScore> examScoreLists = examScoreService.getExamScoreListByTime(time);
+ if (examScoreLists.size()>0) {
+ //遍历计算成绩
+ for (ExamScore examScore : examScoreLists) {
+ if (null!=examScore.getTheoryGrade()) {
+ if (examScore.getTheoryGrade() >= startScore && examScore.getTheoryGrade() <= endScore) {
+ //生成随机数，在60-79 之间
+ int score = (int) ((Math.random() * 20));
+ int sc = score + 60;
+ examScore.setTheoryGrade(sc);
+ //设置为合格
+ examScore.setQualified(2);
+ examScore.setAllGrade(examScore.getTheoryGrade() / 2);
+// examScoreService.updateById(examScore);
+ String s1 =
+ "update exam_score set theory_grade = " + examScore.getTheoryGrade() +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
+ myAsyncService.FTP(s1);
+ }
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3