From 354ca3e06039fbd59a774b6fa168b283f5f1d392 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Wed, 24 Aug 2022 15:38:43 +0800
Subject: [PATCH] dev 数据库连接配置修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 189 ++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 60 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 beab64e..3de436a 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,7 +1,6 @@
package org.springblade.modules.exam.controller;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -9,11 +8,11 @@
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.springblade.common.excel.RowWriteHandler;
-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;
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.exam.entity.ExamPaper;
@@ -26,11 +25,13 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
-import org.springblade.modules.system.entity.Role;
+import org.springblade.modules.information.vo.InformationVO;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.excel.UserExcel;
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;
@@ -38,7 +39,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.sql.Array;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -59,7 +59,9 @@
private final ExamPaperService examPaperService;
- private final IRoleService roleService;
+ private final SecurityPaperService securityPaperService;
+
+ private final MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -91,13 +93,17 @@
@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.dataSync(s);
+ }
//返回
return R.status(save);
}
@@ -110,8 +116,18 @@
*/
@PostMapping("/saveExamScore")
public R saveExamScore(@RequestBody ExamScoreVO examScore) {
-
return R.status(examScoreService.saveExamScore(examScore));
+ }
+
+
+ /**
+ * 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
+ *
+ * @param examScore 考试成绩信息对象
+ */
+ @GetMapping("/getExamScore")
+ public R getExamScore(ExamScoreVO examScore) {
+ return R.status(examScoreService.getExamScore(examScore));
}
@@ -135,12 +151,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.dataSync(s1);
+ }
return R.status(status);
}
@@ -155,12 +173,19 @@
ExamScore examScore1 = examScoreService.getById(examScore.getId());
//查询当前保安信息
UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
+ //再根据身份证号查询用户,方式用户考了试，被删除，又新建的情况,修改最新用户的状态信息
+ User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
+ //考试合格
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
//合格
examScore.setQualified(0);
+ //设置为未制证的状态
+ user1.setUserType(7);
//正式考试通过生成保安证编号
ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
+ //如果已有保安证编号，不更新用户信息
+ if (null == user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -174,37 +199,55 @@
max++;
result = pre + (decimalFormat.format(max));
}
- user.setSecuritynumber(result);
- //发证日期
- user.setPaperTime(new Date());
- //修改为持证保安
- user.setHold("1");
- //分配保安角色
-// Role role = new Role();
-// role.setRoleAlias("保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-// user.setRoleId(oneRole.getId().toString());
- //更新保安数据
- userService.updateById(user);
+ user1.setSecuritynumber(result);
- String s1 =
- "update blade_user set hold = " + "'" + user.getHold() + "'" +
- ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
- ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
- " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
-// }
+ //生成保安证的同时向保安证管理表中插入一条数据
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setUserId(user1.getId());
+ securityPaper.setNumber(result);
+ securityPaper.setCreateTime(new Date());
+ securityPaper.setIdCardNo(user.getCardid());
+ securityPaper.setPeopleName(user1.getRealName());
+ securityPaper.setExamId(Long.parseLong(examScore1.getExamId()));
+ securityPaper.setApplyId(examScore1.getApplyId());
+ securityPaper.setSource(1);
+ //新增保安员证信息
+ securityPaperService.save(securityPaper);
+ //修改为持证保安
+ user1.setHold("1");
+ user1.setUpdateTime(new Date());
+ //更新保安数据
+ boolean b = userService.updateById(user1);
+ if (b) {
+ //数据同步
+ String s1 =
+ "update blade_user set hold = " + "'" + user1.getHold() + "'" +
+ ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
+ ",user_type = " + "'" + user1.getUserType() + "'" +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user1.getUpdateTime()) + "'" +
+ " " + "where id = " + "'" + user1.getId() + "'";
+ myAsyncService.dataSync(s1);
+ }
+ }
} else {
//不合格
examScore.setQualified(1);
}
//总成绩
if (user.getAge() <= 50) {
- examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ if (null != examScore1.getTheoryGrade()) {
+ examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ } else {
+ examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
+ }
}
if (user.getAge() > 50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
- + Integer.parseInt(String.valueOf(Math.round(examScore1.getLearnGrade() * 0.5))));
+ 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));
+ }
}
}
//内网同步
@@ -213,8 +256,8 @@
",all_grade = " + "'" + examScore.getAllGrade() + "'" +
",qualified = " + "'" + examScore.getQualified() + "'" +
" " + "where id = " + "'" + examScore.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
-
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
//本地修改
return R.status(examScoreService.updateById(examScore));
@@ -241,7 +284,8 @@
list.forEach(id -> {
//内网同步
String s1 = "delete from exam_score where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(examScoreService.removeByIds(Func.toLongList(ids)));
}
@@ -295,13 +339,13 @@
*/
@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月**日保安员证培训考试");
examScoreExcel.setName("张三");
examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel.setCandidateNo("2110**m0001");
+// examScoreExcel.setCandidateNo("2110**m0001");
examScoreExcel.setLearnGrade(80);
list.add(examScoreExcel);
@@ -309,7 +353,7 @@
examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel1.setName("李四");
examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel1.setCandidateNo("2110**m0002");
+// examScoreExcel1.setCandidateNo("2110**m0002");
examScoreExcel1.setLearnGrade(88);
list.add(examScoreExcel1);
// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
@@ -317,7 +361,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("实操成绩数据模板", 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);
@@ -343,7 +387,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")) {
@@ -359,31 +403,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, String deptid, String jurisdiction) {
- IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
+ 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")
@@ -394,6 +440,7 @@
/**
* 考试重置（重考）
+ *
* @param updateParamVo
*/
@PostMapping("/refreshTrainExamInfo")
@@ -407,20 +454,42 @@
@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, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ ExcelUtil.export(response, "成绩数据" + DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
}
-
/**
* 考试成绩恢复状态重置（重考）
+ *
* @param
*/
@GetMapping("/refreshTrainExamScore")
public R refreshTrainExamScore() {
return R.status(examScoreService.refreshTrainExamScore());
}
+
+ /**
+ * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
+ *
+ * @param
+ */
+ @GetMapping("/getExamStatisInfo")
+ public R getExamStatisInfo(InformationVO information) {
+ return R.data(examScoreService.getExamStatisInfo(information));
+ }
+
+ /**
+ * 获取当前时间
+ *
+ * @param
+ */
+ @GetMapping("/getNowDate")
+ public R getNowDate() {
+ return R.data(System.currentTimeMillis());
+ }
+
+
}
--
Gitblit v1.9.3