From d4b00c05321d9373a33bfb26618735e2a5868a81 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 24 Feb 2022 16:39:43 +0800
Subject: [PATCH] FTP异步处理
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 120 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 59 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 a1099f3..a45d34b 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -31,6 +31,7 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -59,6 +60,7 @@
private final ExamPaperService examPaperService;
private final SecurityPaperService securityPaperService;
+ private final MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -90,13 +92,16 @@
@ApiOperation(value = "新增", notes = "传入examScore")
public R save(@RequestBody ExamScore examScore) {
boolean save = 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) " +
- "values(" + "'" + sid + "'" +
- "," + "'" + format + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ 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,exam_time) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + format + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
+ }
//返回
return R.status(save);
}
@@ -115,6 +120,7 @@
/**
* 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
+ *
* @param examScore 考试成绩信息对象
*/
@GetMapping("/getExamScore")
@@ -143,12 +149,14 @@
public R updateAbsent(@RequestBody ExamScore examScore) {
examScore.setQualified(3);
boolean status = examScoreService.updateByIdAndQualifiee(examScore);
-
- //内网数据推送
- String s1 =
- "update exam_score set qualified = " + "'" + examScore.getQualified() + "'" +
- " " + "where id = " + "'" + examScore.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ if (status) {
+ //内网数据推送
+ String s1 =
+ "update exam_score set qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
return R.status(status);
}
@@ -175,7 +183,7 @@
ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
//如果已有保安证编号，不更新用户信息
- if (null==user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
+ if (null == user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -205,30 +213,17 @@
//修改为持证保安
user1.setHold("1");
//更新保安数据
- userService.updateById(user1);
-
- //数据同步
- String s1 =
- "update blade_user set hold = " + "'" + user1.getHold() + "'" +
- ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
- ",user_type = " + "'" + user1.getUserType() + "'" +
- " " + "where id = " + "'" + user1.getId() + "'";
-
-// 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() + "'" + ");" +
-// "update blade_user set hold = " + "'" + user1.getHold() + "'" +
-// ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
-// ",user_type = " + "'" + user1.getUserType() + "'" +
-// " " + "where id = " + "'" + user1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean b = userService.updateById(user1);
+ if (b) {
+ //数据同步
+ String s1 =
+ "update blade_user set hold = " + "'" + user1.getHold() + "'" +
+ ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
+ ",user_type = " + "'" + user1.getUserType() + "'" +
+ " " + "where id = " + "'" + user1.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
}
} else {
//不合格
@@ -236,18 +231,18 @@
}
//总成绩
if (user.getAge() <= 50) {
- if (null!=examScore1.getTheoryGrade()) {
+ if (null != examScore1.getTheoryGrade()) {
examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
- }else {
- examScore.setAllGrade(Math.round(examScore.getLearnGrade()/2));
+ } else {
+ examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
}
}
if (user.getAge() > 50) {
- if (null!=examScore1.getTheoryGrade()) {
+ 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))));
- }else {
- examScore.setAllGrade(Math.round(examScore.getLearnGrade()/2));
+ } else {
+ examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
}
}
}
@@ -257,7 +252,8 @@
",all_grade = " + "'" + examScore.getAllGrade() + "'" +
",qualified = " + "'" + examScore.getQualified() + "'" +
" " + "where id = " + "'" + examScore.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
//本地修改
return R.status(examScoreService.updateById(examScore));
@@ -284,7 +280,8 @@
list.forEach(id -> {
//内网同步
String s1 = "delete from exam_score where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(examScoreService.removeByIds(Func.toLongList(ids)));
}
@@ -338,7 +335,7 @@
*/
@GetMapping("export-template")
@ApiOperation(value = "导出模板")
- public void exportExamScore(HttpServletResponse response)throws IOException {
+ public void exportExamScore(HttpServletResponse response) throws IOException {
List<ExamScoreExcel> list = new ArrayList<>();
ExamScoreExcel examScoreExcel = new ExamScoreExcel();
examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
@@ -360,7 +357,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("实操成绩数据模板"+ DateUtil.time(), Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("实操成绩数据模板" + DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), ExamScoreExcel.class).sheet("实操成绩数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -386,7 +383,7 @@
List sccj = new ArrayList();
for (int i = 0; i <= 100; i++) {
- int xb1 = 0,xb2 = 0;
+ int xb1 = 0, xb2 = 0;
for (int j = 0; j < a.size(); j++) {
if (i == (int) a.get(j).get("fs")) {
@@ -402,31 +399,33 @@
}
}
- if (xb1 == 0){
+ if (xb1 == 0) {
llcj.add("0");
}
- if (xb2 == 0){
+ if (xb2 == 0) {
sccj.add("0");
}
}
- cjhz.put("llcj",llcj);
- cjhz.put("sccj",sccj);
+ cjhz.put("llcj", llcj);
+ cjhz.put("sccj", sccj);
return R.data(cjhz);
}
+
/**
* 自定义分页
*
- * @param query page,size
+ * @param query page,size
*/
@GetMapping("/score-page")
- public R<IPage<ExamScoreVO>> scorePage(Query query,ExamScoreVO examScore) {
- IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),examScore);
+ public R<IPage<ExamScoreVO>> scorePage(Query query, ExamScoreVO examScore) {
+ IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query), examScore);
return R.data(pages);
}
/**
* 考试成绩及状态修改
+ *
* @param updateParamVo
*/
@GetMapping("/update-exam-score")
@@ -437,6 +436,7 @@
/**
* 考试重置（重考）
+ *
* @param updateParamVo
*/
@PostMapping("/refreshTrainExamInfo")
@@ -450,15 +450,16 @@
@GetMapping("export-examScore")
@ApiOperationSupport(order = 14)
@ApiOperation(value = "导出成绩")
- public void exportExamScore(HttpServletResponse response,ExamScoreVO examScoreVO) {
+ public void exportExamScore(HttpServletResponse response, ExamScoreVO examScoreVO) {
//按条件查询成绩数据
List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
//导出成绩集合数据
- ExcelUtil.export(response, "成绩数据"+DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ ExcelUtil.export(response, "成绩数据" + DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
}
/**
* 考试成绩恢复状态重置（重考）
+ *
* @param
*/
@GetMapping("/refreshTrainExamScore")
@@ -468,6 +469,7 @@
/**
* 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
+ *
* @param
*/
@GetMapping("/getExamStatisInfo")
@@ -477,13 +479,13 @@
/**
* 获取当前时间
+ *
* @param
*/
@GetMapping("/getNowDate")
public R getNowDate() {
return R.data(System.currentTimeMillis());
}
-
}
--
Gitblit v1.9.3