From 4ad0633f5ad8ec34dcb4b0a652d35868b8e9a2ad Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 21 Feb 2022 15:50:59 +0800
Subject: [PATCH] 注册接口调整
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 +++
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 38 +++++++++++--------
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 10 +++++
src/main/java/org/springblade/modules/system/entity/User.java | 8 +++-
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 +
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 +
6 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 4cd92e3..98687f1 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -78,7 +78,7 @@
/**
* 生日
*/
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 性别
@@ -121,7 +121,7 @@
/**
* 审查时间
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("audit_time")
private Date auditTime;
@@ -130,5 +130,9 @@
* 身份证号
*/
private String cardid;
+ /**
+ * 审核状态 0：待审核 1 ：审核通过
+ */
+ private String stype;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index f327758..797ee53 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -123,5 +123,7 @@
* @return
*/
Integer selectCountAccount(@Param("account") String account);
+ void updateAcc(String stype,String account);
+ void delete(String account);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index e34cf14..b5cfe99 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -353,5 +353,12 @@
and account = #{account}
</select>
+ <update id="updateAcc">
+ update blade_user set stype=#{stype} where account=#{account}
+ </update>
+
+ <delete id="delete">
+ delete from blade_user where account=#{account}
+ </delete>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 69a3f8e..9a4b554 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -283,4 +283,6 @@
* @return
*/
Integer selectCount(String account);
+ void updateAcc(String stype,String account);
+ void delete(String account);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index f7d30a5..2ae3555 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -527,4 +527,14 @@
return baseMapper.selectCountAccount(account);
}
+ @Override
+ public void updateAcc(String stype, String account) {
+ baseMapper.updateAcc(stype, account);
+ }
+
+ @Override
+ public void delete(String account) {
+ baseMapper.delete(account);
+ }
+
}
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 6038c8a..9f1359a 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -171,22 +171,12 @@
@ApiOperation(value = "新增或修改", notes = "传入zc")
public R submit(@Valid @RequestBody Zc zc) {
String type = zc.getType();
+ String stype="1";
+ String account=zc.getUsername();
if (type.equals("1")) {
- User user = new User();
- user.setAccount(zc.getUsername());
- user.setPassword(DigestUtil.encrypt(zc.getPassword()));
- user.setRealName(zc.getSname());
- user.setSex(Integer.valueOf(zc.getSex()));
- user.setPhone(zc.getPhone());
- user.setDeptId(zc.getDeptid());
- user.setRoleId(zc.getParentId());
- user.setJurisdiction(zc.getJurisdiction());
- user.setExamination_type("0");
- user.setExamination_mx("正常");
- user.setCardid(zc.getCardid());
- iUserService.saveOrUpdate(user);
-
-
+ iUserService.updateAcc(stype,account);
+ } else {
+ iUserService.delete(account);
}
return R.status(zcService.saveOrUpdate(zc));
}
@@ -217,6 +207,21 @@
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", zc.getUsername()));
}
zcService.inster(zc);
+ //同时新增到用户表
+ User user = new User();
+ user.setAccount(zc.getUsername());
+ user.setPassword(DigestUtil.encrypt(zc.getPassword()));
+ user.setRealName(zc.getSname());
+ user.setSex(Integer.valueOf(zc.getSex()));
+ user.setPhone(zc.getPhone());
+ user.setDeptId(zc.getDeptid());
+ user.setRoleId(zc.getParentId());
+ user.setJurisdiction(zc.getJurisdiction());
+ user.setExamination_type("0");
+ user.setExamination_mx("正常");
+ user.setCardid(zc.getCardid());
+ user.setStype("0");
+ iUserService.saveOrUpdate(user);
String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid)" +
"values(" + "'" + zc.getId() + "'" +
"," + "'" + zc.getUsername() + "'" +
@@ -235,6 +240,7 @@
/**
* 用户验证
+ *
* @param username
* @return
*/
@@ -244,7 +250,7 @@
if (userCount > 0) {
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户{}已存在!", username));
}
- return R.success("当前用户已存在!");
+ return R.success("当前用户不存在!");
}
}
--
Gitblit v1.9.3