From 75d710137ad9098e36e41f6ce8f2ccde0b6becc4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 21 Aug 2021 20:15:25 +0800
Subject: [PATCH] ftp 数据同步，考试报名，取消，导入同步
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 8 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 851b5e6..c1ce051 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -1,5 +1,6 @@
package org.springblade.modules.apply.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -16,6 +17,8 @@
import org.springblade.core.tool.api.R;
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.OutJson;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
@@ -24,16 +27,23 @@
import org.springblade.modules.apply.vo.ApplyPaPerVO;
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+
+import static org.springblade.common.constant.FtpConstant.*;
/**
* @author zhongrj
@@ -50,6 +60,8 @@
private final ExamPaperService examPaperService;
private final IUserService userService;
+
+ private final ExamScoreService examScoreService;
/**
* 自定义分页
@@ -77,7 +89,7 @@
*/
@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()){
@@ -93,12 +105,16 @@
user1.setId(apply.getUserId());
user1.setIsApply(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveApply(apply,user1);
+
return R.data(200,"报名成功");
}else {
if (1==user.getIsApply()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsApply() || -1==user.getIsApply() || 3==user.getIsApply()){
+ if (1!=user.getIsApply()){
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -110,10 +126,35 @@
user1.setId(apply.getUserId());
user1.setIsApply(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveApply(apply,user1);
+
return R.data(200,"报名成功");
}
}
return R.data(202,"报名失败");
+ }
+
+ /**
+ * 报名
+ */
+ 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() + "'";
+ 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);
}
@@ -325,7 +366,6 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- //arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
return R.status(applyService.removeByIds(Func.toLongList(ids)));
}
@@ -385,9 +425,14 @@
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply,user);
+
if (status){
return R.data(200,"取消报名成功");
}
+
}else {
if(user.getIsApply()==1){
apply.setApplyStatus(4);
@@ -395,6 +440,10 @@
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply,user);
+
if (status){
return R.data(200,"取消报名成功");
}
@@ -403,6 +452,24 @@
}
}
return R.data(202,"取消报名失败");
+ }
+
+ /**
+ * 取消报名同步
+ */
+ 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() + "'";
+ 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);
}
@@ -422,11 +489,15 @@
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply1,user);
+
if (status){
return R.data(200,"取消报名成功");
}
}else {
- if (user.getIsApply()==2) {
+ if (user.getIsApply()!=1) {
return R.data(201,"尚未报名");
}
if(user.getIsApply()==1){
@@ -435,6 +506,10 @@
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply1,user);
+
if (status){
return R.data(200,"取消报名成功");
}
@@ -466,8 +541,11 @@
//修改保安报名状态
user.setIsApply(1);
userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
} else {
- if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
+ if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -478,13 +556,15 @@
//修改保安报名状态
user.setIsApply(1);
userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
}
}
});
}else {
//查询所有未报名的人员
List<User> users = userService.getNotApplyIdList(deptId);
- System.out.println("users = " + users.size());
if (users.size()>0){
users.forEach(user ->{
//未报名的新增，已报名的不做处理
@@ -499,8 +579,11 @@
//修改保安报名状态
user.setIsApply(1);
userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
} else {
- if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
+ if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -511,6 +594,9 @@
//修改保安报名状态
user.setIsApply(1);
userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
}
}
});
@@ -618,8 +704,17 @@
* @return
*/
@PostMapping("/updateApplyStatus")
- public void 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.setExamTime(new Date());
+ //新增
+ examScoreService.save(examScore);
+ return examScore;
}
--
Gitblit v1.9.3