From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index 21d96a6..cf6b8bd 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -42,6 +42,7 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.zc.entity.Zc;
import org.springblade.modules.zc.service.IZcService;
import org.springblade.modules.zc.vo.ZcVO;
@@ -70,6 +71,7 @@
private IUserService iUserService;
private final IDeptService deptFeignApi;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -164,12 +166,13 @@
user.setHold("2");
user.setDispatch("1");
user.setStatus(1);
+ user.setExaminationType("0");
user.setIsDeleted(0);
iUserService.save(user);
//内网数据同步
String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
- String s = "insert into blade_user(id,tenant_id,account,password,real_name,role_id,dept_id,create_time,status,is_deleted,cardid,hold,dispatch) " +
+ String s = "insert into blade_user(id,tenant_id,account,password,real_name,role_id,dept_id,create_time,status,is_deleted,cardid,hold,examination_type,dispatch) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -182,8 +185,10 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getCardid() + "'" +
"," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getDispatch() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
return R.status(zcService.updateById(zc));
@@ -216,6 +221,17 @@
@PostMapping("/inster")
@ApiOperation(value = "新增", notes = "传入zc")
public R inster(@Valid @RequestBody Zc zc) {
+ //获取用户名，判断该用户名是否已注册，或已有用户
+ //查询注册表中是否有相同的注册信息
+ Zc zc1 = zcService.getAuditSuccessInfo(zc.getUsername());
+ if (null!=zc1){
+ throw new com.aliyun.oss.ServiceException(StringUtil.format("当前用户名 [{}] 已被注册!", zc.getUsername()));
+ }
+ //查询用户表中未删除，未离职的用户信息
+ User user = iUserService.getUserInfo(zc.getUsername());
+ if (null!=user){
+ throw new com.aliyun.oss.ServiceException(StringUtil.format("当前用户名 [{}] 已被注册!", zc.getUsername()));
+ }
//当前时间
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String times = df.format(new Date());
--
Gitblit v1.9.3