From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 174 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 95 insertions(+), 79 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 f616583..e03a08c 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -19,7 +19,6 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
-import org.springblade.modules.FTP.monitor;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
@@ -33,6 +32,7 @@
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.training.vo.TrainingRegistrationVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -147,16 +147,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);
- String response = String.valueOf((new Date()).getTime());
- OutJson.createJsonFile(json, "d:/", "w"+response);
- FileInputStream in = null;
- try {
- in = new FileInputStream(new File("D:\\" + "w"+response+".json"));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", "w"+response+".json", in);
+ FtpUtil.sqlFileUpload(s);
}
@@ -185,7 +176,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("操作成功");
}
@@ -463,15 +465,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);
}
@@ -610,69 +604,54 @@
/**
- * 生成试卷,报名
- * @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);
- //修改报名信息
- list.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(Long.parseLong(id));
- apply.setExamId(examPaper.getId());
- apply.setCandidateNo(getCandidateNo(apply));
- applyService.updateById(apply);
- });
- }
+ 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);
- }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);
- //修改报名信息
- applyIds.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(id);
+ 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);
+
+ //修改报名信息
+ 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);
+ }
+ });
}
return null;
}
@@ -714,10 +693,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