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/apply/controller/ApplyController.java | 403 ++++++++++++++++++++++++++++----------------------------
1 files changed, 201 insertions(+), 202 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index 1e93222..8c65234 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -10,7 +10,6 @@
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-import org.springblade.common.utils.arg;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -32,6 +31,9 @@
import org.springblade.modules.exam.service.ExamScoreService;
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.training.vo.TrainingRegistrationVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -43,7 +45,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
/**
* @author zhongrj
@@ -55,16 +57,22 @@
@RequestMapping("/apply")
public class ApplyController {
+ // @Autowired
private final ApplyService applyService;
+ // @Autowired
private final ExamPaperService examPaperService;
+ // @Autowired
private final IUserService userService;
+ // @Autowired
private final ExamScoreService examScoreService;
+ private final MyAsyncService myAsyncService;
/**
* 自定义分页
+ *
* @param query page,size
* @param apply 考试报名信息对象
*/
@@ -85,14 +93,15 @@
/**
* 新增报名
+ *
* @param apply 考试报名信息对象
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入apply")
- public R save(@RequestBody Apply apply){
+ public R save(@RequestBody Apply apply) {
//查询人员是否已报名
User user = userService.getById(apply.getUserId());
- if (null==user.getIsApply()){
+ if (null == user.getIsApply()) {
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -107,14 +116,14 @@
userService.updateById(user1);
//内网数据同步
- saveApply(apply,user1);
+ saveApply(apply, user1);
- return R.data(200,"报名成功");
- }else {
- if (1==user.getIsApply()){
- return R.data(201,"已报名，不能重复报名");
+ return R.data(200, "报名成功");
+ } else {
+ if (1 == user.getIsApply()) {
+ return R.data(201, "已报名，不能重复报名");
}
- if (1!=user.getIsApply()){
+ if (1 != user.getIsApply()) {
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -128,30 +137,32 @@
userService.updateById(user1);
//内网数据同步
- saveApply(apply,user1);
+ saveApply(apply, user1);
- return R.data(200,"报名成功");
+ return R.data(200, "报名成功");
}
}
- return R.data(202,"报名失败");
+ return R.data(202, "报名失败");
}
/**
* 报名
*/
- private void saveApply(Apply apply,User user1){
+ private void saveApply(Apply apply, User user1) {
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = apply.getId();
String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
"values(" + "'" + id + "'" + "," + "'" + apply.getUserId() + "'" + "," + "'" + formatStr +
- "'" + "," + "'" + apply.getApplyStatus() + "'" + "," +"'" + apply.getIsExam() + "'" + ");" +
- "update blade_user set is_apply = " + user1.getIsApply() + " " +"where id = " + "'" + user1.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ "'" + "," + "'" + apply.getApplyStatus() + "'" + "," + "'" + apply.getIsExam() + "'" + ");" +
+ "update blade_user set is_apply = " + user1.getIsApply() + " " + "where id = " + "'" + user1.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
/**
* 修改
+ *
* @param apply 考试报名信息对象
*/
@PostMapping("/update")
@@ -161,10 +172,11 @@
/**
* 新增或修改
+ *
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply){
+ public R submit(@RequestBody Apply apply) {
return R.data(applyService.saveOrUpdate(apply));
}
@@ -175,7 +187,7 @@
@PostMapping("import-apply")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, false,null);
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false, null);
ExcelUtil.save(file, applyImporter, ApplyExcel.class);
return R.success("操作成功");
}
@@ -185,8 +197,8 @@
*/
@PostMapping("import-applys")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered,Long examId) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, false,examId);
+ public R importUser(MultipartFile file, Integer isCovered, Long examId) {
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false, examId);
ExcelUtil.save(file, applyImporter, ApplyExcel.class);
return R.success("操作成功");
}
@@ -204,61 +216,63 @@
/**
* 导出报名数数据
+ *
* @param response
- * @param apply 报名对象
+ * @param apply 报名对象
*/
@GetMapping("export-apply")
@ApiOperation(value = "导出报名清册")
- public void exportApply(HttpServletResponse response,Apply apply) {
+ public void exportApply(HttpServletResponse response, Apply apply) {
List<ApplyInfoExcel> list = applyService.getApplyExcelList(apply);
- ExcelUtil.export(response, "考试报名清册数据"+ DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
+ ExcelUtil.export(response, "考试报名清册数据" + DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
}
/**
* 生成准考证号码
+ *
* @param apply 考试报名信息对象
*/
private String getCandidateNo(Apply apply) {
//获取考试信息
ExamPaper examPaper = examPaperService.getById(apply.getExamId());
- if (null!=examPaper.getStartTime()){
+ if (null != examPaper.getStartTime()) {
String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
- String year = format.substring(2,4);
- String quarter = null;
+ String year = format.substring(2, 4);
+ String quarter = null;
String months = null;
- int month = Integer.parseInt(format.substring(5,7));
- int day = Integer.parseInt(format.substring(8,10));
+ int month = Integer.parseInt(format.substring(5, 7));
+ int day = Integer.parseInt(format.substring(8, 10));
String days = null;
- if (month>0 && month<=3){
+ if (month > 0 && month <= 3) {
quarter = "C";
}
- if (month>3 && month<=6){
+ if (month > 3 && month <= 6) {
quarter = "X";
}
- if (month>6 && month<=9){
+ if (month > 6 && month <= 9) {
quarter = "Q";
}
- if (month>9 && month<=12){
+ if (month > 9 && month <= 12) {
quarter = "D";
}
- if (month<=9){
+ if (month <= 9) {
months = "0" + month;
}
- if (day<=9){
+ if (day <= 9) {
days = "0" + day;
- }else {
- days = ""+day;
+ } else {
+ days = "" + day;
}
String type = null;
- if (examPaper.getExamType()==1){
+ if (examPaper.getExamType() == 1) {
type = "z";
}
- if (examPaper.getExamType()==2){
+ if (examPaper.getExamType() == 2) {
type = "m";
}
//获取考试名称前缀,去除数字，字母
String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+ = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0, 1);
//前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
// String result = year
@@ -269,12 +283,12 @@
//前缀 = 年的最后两位 + 月份（两位） + 日 （两位） + 考试类型 正式考试 z 模拟考试 m
String result = year
- + months
- + days
- + type;
+ + months
+ + days
+ + type;
//查询是当前前缀已生成的数量
int count = applyService.getCandidateNoCount(result);
- if (count==0){
+ if (count == 0) {
return result + "0000";
}
//格式化
@@ -288,61 +302,63 @@
/**
* 生成报名编号
+ *
* @param apply 考试报名信息对象
*/
private String getApplyCode(Apply apply) {
//获取考试信息
ExamPaper examPaper = examPaperService.getById(apply.getExamId());
- if (null!=examPaper.getStartTime()){
+ if (null != examPaper.getStartTime()) {
String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
- String year = format.substring(2,4);
- String quarter = null;
+ String year = format.substring(2, 4);
+ String quarter = null;
String months = null;
String days = null;
- int month = Integer.parseInt(format.substring(5,7));
- int day = Integer.parseInt(format.substring(8,10));
- if (month>0 && month<=3){
+ int month = Integer.parseInt(format.substring(5, 7));
+ int day = Integer.parseInt(format.substring(8, 10));
+ if (month > 0 && month <= 3) {
quarter = "C";
}
- if (month>3 && month<=6){
+ if (month > 3 && month <= 6) {
quarter = "X";
}
- if (month>6 && month<=9){
+ if (month > 6 && month <= 9) {
quarter = "Q";
}
- if (month>9 && month<=12){
+ if (month > 9 && month <= 12) {
quarter = "D";
}
- if (month<=9){
+ if (month <= 9) {
months = "0" + month;
}
- if (day<=9){
+ if (day <= 9) {
days = "0" + day;
}
//获取考试名称前缀,去除数字，字母
String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+ = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0, 1);
//前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
String result = year
- + months
- + toFirstChar(examName).toUpperCase()
- + examPaper.getExamType()
- + quarter;
+ + months
+ + toFirstChar(examName).toUpperCase()
+ + examPaper.getExamType()
+ + quarter;
//生成随机数
UUID uuid = UUID.randomUUID();
//返回
- return result + uuid.toString().replaceAll("\\-","");
+ return result + uuid.toString().replaceAll("\\-", "");
}
return null;
}
/**
* 获取字符串拼音的第一个字母
+ *
* @param chinese
* @return
*/
- private String toFirstChar(String chinese){
+ private String toFirstChar(String chinese) {
String pinyinStr = "";
char[] newChar = chinese.toCharArray();
//转为单个字符
@@ -356,7 +372,7 @@
} catch (BadHanyuPinyinOutputFormatCombination e) {
e.printStackTrace();
}
- }else{
+ } else {
pinyinStr += newChar[i];
}
}
@@ -365,15 +381,24 @@
/**
* 删除
+ *
* @param ids 考试报名信息ids 数组
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from sys_apply where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ });
return R.status(applyService.removeByIds(Func.toLongList(ids)));
}
/**
* 查询用户详情
+ *
* @param user
*/
@GetMapping("/userDetail")
@@ -387,6 +412,7 @@
/**
* 详情
+ *
* @param apply 考试报名信息对象
*/
@GetMapping("/detail")
@@ -400,11 +426,12 @@
/**
* 获取准考证信息
+ *
* @param apply
* @return
*/
@GetMapping("/getApplyInfo")
- public R<ApplyPaPerVO> getApplyInfo(Apply apply,HttpServletResponse response) {
+ public R<ApplyPaPerVO> getApplyInfo(Apply apply, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -416,13 +443,14 @@
/**
* 取消报名
+ *
* @param apply 考试报名信息对象
*/
@PostMapping("/cancelApply")
- public R cancelApply(@RequestBody Apply apply){
+ public R cancelApply(@RequestBody Apply apply) {
//查询人员是否已报名
User user = userService.getById(apply.getUserId());
- if(null==user.getIsApply()){
+ if (null == user.getIsApply()) {
apply.setApplyStatus(4);
boolean status = applyService.updateById(apply);
//修改保安报名状态
@@ -430,14 +458,14 @@
userService.updateById(user);
//取消报名同步
- cancelApplySync(apply,user);
+ cancelApplySync(apply, user);
- if (status){
- return R.data(200,"取消报名成功");
+ if (status) {
+ return R.data(200, "取消报名成功");
}
- }else {
- if(user.getIsApply()==1){
+ } else {
+ if (user.getIsApply() == 1) {
apply.setApplyStatus(4);
boolean status = applyService.updateById(apply);
//修改保安报名状态
@@ -445,40 +473,42 @@
userService.updateById(user);
//取消报名同步
- cancelApplySync(apply,user);
+ cancelApplySync(apply, user);
- if (status){
- return R.data(200,"取消报名成功");
+ if (status) {
+ return R.data(200, "取消报名成功");
}
- }else {
- return R.data(201,"尚未报名");
+ } else {
+ return R.data(201, "尚未报名");
}
}
- return R.data(202,"取消报名失败");
+ return R.data(202, "取消报名失败");
}
/**
* 取消报名同步
*/
- private void cancelApplySync(Apply apply,User user){
+ private void cancelApplySync(Apply apply, User user) {
String s =
- "update sys_apply set apply_status = " + apply.getApplyStatus() + " " +"where id = " + "'" + apply.getId() + "';" +
- "update blade_user set is_apply = " + user.getIsApply() + " " +"where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ "update sys_apply set apply_status = " + apply.getApplyStatus() + " " + "where id = " + "'" + apply.getId() + "';" +
+ "update blade_user set is_apply = " + user.getIsApply() + " " + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
/**
* 公司报名列表取消报名，无applyId
+ *
* @param apply 考试报名信息对象
*/
@PostMapping("/cancelApplyNotApplyId")
- public R cancelApplyNotApplyId(@RequestBody Apply apply){
+ public R cancelApplyNotApplyId(@RequestBody Apply apply) {
//查询人员是否已报名
User user = userService.getById(apply.getUserId());
//查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录
Apply apply1 = applyService.getMaxApplyIdByUserIdInfo(apply.getUserId());
- if(null==user.getIsApply()){
+ if (null == user.getIsApply()) {
apply1.setApplyStatus(4);
boolean status = applyService.updateById(apply1);
//修改保安报名状态
@@ -486,16 +516,16 @@
userService.updateById(user);
//取消报名同步
- cancelApplySync(apply1,user);
+ cancelApplySync(apply1, user);
- if (status){
- return R.data(200,"取消报名成功");
+ if (status) {
+ return R.data(200, "取消报名成功");
}
- }else {
- if (user.getIsApply()!=1) {
- return R.data(201,"尚未报名");
+ } else {
+ if (user.getIsApply() != 1) {
+ return R.data(201, "尚未报名");
}
- if(user.getIsApply()==1){
+ if (user.getIsApply() == 1) {
apply1.setApplyStatus(4);
boolean status = applyService.updateById(apply1);
//修改保安报名状态
@@ -503,23 +533,24 @@
userService.updateById(user);
//取消报名同步
- cancelApplySync(apply1,user);
+ cancelApplySync(apply1, user);
- if (status){
- return R.data(200,"取消报名成功");
+ if (status) {
+ return R.data(200, "取消报名成功");
}
}
}
- return R.data(202,"取消报名失败");
+ return R.data(202, "取消报名失败");
}
/**
* 批量报名
+ *
* @param ids userIds 人员
*/
@PostMapping("/batchApply")
- public R batchApply(@RequestParam String ids,@RequestParam String deptId){
+ public R batchApply(@RequestParam String ids, @RequestParam String deptId) {
if (!ids.equals("")) {
List<String> list = Arrays.asList(ids.split(","));
list.forEach(userId -> {
@@ -538,7 +569,7 @@
userService.updateById(user);
//内网数据同步
- saveApply(apply1,user);
+ saveApply(apply1, user);
} else {
if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
@@ -553,15 +584,15 @@
userService.updateById(user);
//内网数据同步
- saveApply(apply1,user);
+ saveApply(apply1, user);
}
}
});
- }else {
+ } else {
//查询所有未报名的人员
List<User> users = userService.getNotApplyIdList(deptId);
- if (users.size()>0){
- users.forEach(user ->{
+ if (users.size() > 0) {
+ users.forEach(user -> {
//未报名的新增，已报名的不做处理
if (null == user.getIsApply()) {
Apply apply1 = new Apply();
@@ -576,7 +607,7 @@
userService.updateById(user);
//内网数据同步
- saveApply(apply1,user);
+ saveApply(apply1, user);
} else {
if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
@@ -591,107 +622,68 @@
userService.updateById(user);
//内网数据同步
- saveApply(apply1,user);
+ saveApply(apply1, user);
}
}
});
}
}
- return R.data(200,"报名成功");
+ return R.data(200, "报名成功");
}
-
/**
- * 生成试卷,报名
- * @param ids 报名ids
+ * 生成考试,报名
+ *
+ * @param applyVO 报名info
*/
@PostMapping("/batchExam")
- public R batchExam(@RequestParam String ids,
- String examTime,
- @RequestParam Date startTime,
- Date endTime){
- if (!ids.equals("")){
- List<String> list = Arrays.asList(ids.split(","));
- if (list.size()>0){
- ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
- examPaper.setExamType(1);
- examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
- Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
- int year = instance.get(Calendar.YEAR);
- int month = instance.get(Calendar.MONTH)+1;
- int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证考试";
- examPaper.setExamName(examName);
- //生成考试
- examPaperService.save(examPaper);
+ public R batchExam(@RequestBody ApplyVO applyVO) {
+ //查询已报名未关联试卷的人员
+ List<Apply> applyIds = applyService.getApplyIds(applyVO);
+ if (applyIds.size() > 0) {
+ //生成考试
+ ExamPaper examPaper = new ExamPaper();
+ examPaper.setExamType(1);
+ examPaper.setStartTime(applyVO.getStartTime());
+ examPaper.setEndTime(applyVO.getEndTime());
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(applyVO.getStartTime());
+ int year = instance.get(Calendar.YEAR);
+ int month = instance.get(Calendar.MONTH) + 1;
+ int day = instance.get(Calendar.DAY_OF_MONTH);
+ String examName = year + "年" + month + "月" + day + "日" + "保安员证考试";
+ examPaper.setExamName(examName);
+ //生成考试
+ examPaperService.save(examPaper);
- Long sid = examPaper.getId();
- String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
- "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
- "'" + "," +"'" + format + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ Long sid = examPaper.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
+ String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() + "'" +
+ "," + "'" + format + "'" +
+ "," + "'" + endTimeFormat + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
- //修改报名信息
- list.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(Long.parseLong(id));
+ //修改报名信息
+ applyIds.forEach(apply -> {
+ //如果查出来的是已存在考试信息数据，则跳过
+ if (null == apply.getExamId()) {
apply.setExamId(examPaper.getId());
apply.setCandidateNo(getCandidateNo(apply));
applyService.updateById(apply);
String s1 =
"update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
- " " +"where id = " + "'" + apply.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- });
- }
-
- }else {
- //查询已报名未关联试卷的人员
- List<Long> applyIds = applyService.getApplyIds();
- if (applyIds.size()>0){
- //生成考试
- ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
- examPaper.setExamType(1);
- examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
- Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
- int year = instance.get(Calendar.YEAR);
- int month = instance.get(Calendar.MONTH)+1;
- int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证考试";
- examPaper.setExamName(examName);
- //生成考试
- examPaperService.save(examPaper);
-
- Long sid = examPaper.getId();
- String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
- "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
- "'" + "," +"'" + format + "'" + ")";
- FtpUtil.sqlFileUpload(s);
-
- //修改报名信息
- applyIds.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(id);
- apply.setExamId(examPaper.getId());
- apply.setCandidateNo(getCandidateNo(apply));
- applyService.updateById(apply);
-
- String s1 =
- "update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
- " " +"where id = " + "'" + apply.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- });
- }
+ " " + "where id = " + "'" + apply.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
+ });
}
return null;
}
@@ -699,63 +691,70 @@
/**
* 查询报名清册信息
+ *
* @param apply 报名信息
* @return
*/
@GetMapping("/getApplyDetailList")
- public Map<String,Object> getApplyDetailList(ApplyVO apply){
+ public Map<String, Object> getApplyDetailList(ApplyVO apply) {
return applyService.getApplyDetailList(apply);
}
/**
* 查询保安员个人报名信息
+ *
* @param apply 报名信息，包含userId
* @return
*/
@GetMapping("/getSecurityApplyDetail")
- public ApplyVO getSecurityApplyDetail(ApplyVO apply){
+ public ApplyVO getSecurityApplyDetail(ApplyVO apply) {
return applyService.getSecurityApplyDetail(apply);
}
/**
* 修改考试状态
+ *
* @param apply 报名信息，包含userId，applyid
* @return
*/
@PostMapping("/updateApplyStatus")
- public ExamScore updateApplyStatus(@RequestBody ApplyVO apply){
+ public ExamScore updateApplyStatus(@RequestBody ApplyVO apply) {
applyService.updateApplyStatus(apply);
//新增考试成绩，没有成绩数据，待提交答题后更新数据
ExamScore examScore = new ExamScore();
examScore.setExamId(apply.getExamId().toString());
examScore.setUserId(apply.getUserId().toString());
examScore.setApplyId(apply.getId());
+ examScore.setCandidateNo(apply.getCandidateNo());
examScore.setExamTime(new Date());
//新增考试成绩
- examScoreService.save(examScore);
- //内网同步
- Long sid = examScore.getId();
- String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
- String s = "insert into exam_score(id,exam_time,user_id,exam_id,apply_id) " +
- "values(" + "'" + sid + "'" + "," + "'" +
- format + "'" + "," + "'" +
- examScore.getUserId() +"'" + "," +"'" +
- examScore.getExamId() +"'" + "," +"'" +
- examScore.getApplyId() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ boolean save = examScoreService.save(examScore);
+ if (save) {
+ //内网同步
+ Long sid = examScore.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
+ String s = "insert into exam_score(id,candidate_no,exam_time,user_id,exam_id,apply_id) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examScore.getCandidateNo() + "'" +
+ "," + "'" + format + "'" +
+ "," + "'" + examScore.getUserId() + "'" +
+ "," + "'" + examScore.getExamId() + "'" +
+ "," + "'" + examScore.getApplyId() + "'" + ")";
+ myAsyncService.FTP(s);
+ }
return examScore;
}
-
/**
* test
+ *
* @return
*/
@GetMapping("/test")
- public Object test(){
+ public Object test() {
String s1 = "insert into exam_score(id,exam_id,apply_id) values(223,88,315)";
String s2 = "111222333";
String s3 = "select * from ksxt_exam";
@@ -764,14 +763,14 @@
// FtpUtil.sqlFileUpload(s3);
String json1 = JSON.toJSONString(s3);
String response1 = String.valueOf((new Date()).getTime());
- OutJson.createJsonFile(json1, localPath, "f"+response1);
+ OutJson.createJsonFile(json1, localPath, "f" + response1);
FileInputStream in1 = null;
try {
- in1 = new FileInputStream(new File(localPath + "f"+response1+".json"));
+ in1 = new FileInputStream(new File(localPath + "f" + response1 + ".json"));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "f"+response1+".json", in1);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "f" + response1 + ".json", in1);
return "成功";
}
--
Gitblit v1.9.3