From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 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 c1ce051..08e8994 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -146,15 +146,7 @@
"values(" + "'" + id + "'" + "," + "'" + apply.getUserId() + "'" + "," + "'" + formatStr +
"'" + "," + "'" + apply.getApplyStatus() + "'" + "," +"'" + apply.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + user1.getIsApply() + " " +"where id = " + "'" + user1.getId() + "'";
- String json = JSON.toJSONString(s);
- OutJson.createJsonFile(json, "d:/", "wsql");
- FileInputStream in = null;
- try {
- in = new FileInputStream(new File("D:\\" + fileName));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.sqlFileUpload(s);
}
@@ -183,7 +175,18 @@
@PostMapping("import-apply")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, false);
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false,null);
+ ExcelUtil.save(file, applyImporter, ApplyExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导入报名考试数据(已生成考试)
+ */
+ @PostMapping("import-applys")
+ @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
+ 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("操作成功");
}
@@ -461,15 +464,7 @@
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() + "'";
- String json = JSON.toJSONString(s);
- OutJson.createJsonFile(json, "d:/", "wsql");
- FileInputStream in = null;
- try {
- in = new FileInputStream(new File("D:\\" + fileName));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.sqlFileUpload(s);
}
@@ -633,6 +628,14 @@
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);
+
//修改报名信息
list.forEach(id ->{
Apply apply = new Apply();
@@ -640,6 +643,11 @@
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);
});
}
@@ -662,6 +670,14 @@
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();
@@ -669,6 +685,11 @@
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);
});
}
}
@@ -712,10 +733,47 @@
examScore.setUserId(apply.getUserId().toString());
examScore.setApplyId(apply.getId());
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);
return examScore;
}
+
+ /**
+ * test
+ * @return
+ */
+ @GetMapping("/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";
+ FtpUtil.sqlFileUpload(s1);
+ FtpUtil.sqlFileUpload(s2);
+// FtpUtil.sqlFileUpload(s3);
+ String json1 = JSON.toJSONString(s3);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "f"+response1);
+ FileInputStream in1 = null;
+ try {
+ 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);
+ return "成功";
+ }
+
+
}
--
Gitblit v1.9.3