From f5d28298d0072bcf1fa2a7bb53c0aeef4b87a031 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 17 Sep 2021 09:40:23 +0800
Subject: [PATCH] 1.用户
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 162 +++++++++++++++++++++++++++++------------------------
1 files changed, 88 insertions(+), 74 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 1e59bd6..630b9b8 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -29,6 +29,7 @@
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
+import org.springblade.common.constant.FtpConstant;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -194,28 +195,29 @@
//根据 deptId 查询dept信息,公安管理员
Dept dept = iDeptService.getById(user.getDeptId());
Long sid = 1123598813738675201L;
- if (dept.getParentId().equals(sid)){
+ if (dept.getParentId().equals(sid)) {
//获取辖区的数据
Jurisdiction jurisdiction = new Jurisdiction();
jurisdiction.setDeptName(dept.getDeptName());
Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
user.setJurisdiction(one.getId().toString());
}
+ user.setRoleId("1412226235153731586");
userService.submit(user);
// String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
String rtime = null;
- if (null!=user.getRtime()) {
+ if (null != user.getRtime()) {
rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
}
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
+ String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
"politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
"values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
"'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
"," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
+ user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
- + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
- "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
+ + "," + "'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" + "," + "'" + user.getRegistered() + "'" + "," +
+ "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" + "," + "'" + user.getHold() + "'" + "," + "'" + user.getJurisdiction() + "'"+ ")";
FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -232,46 +234,43 @@
Date birthday1 = user.getBirthday();
String birthday;
String rtime;
- if (user.getBirthday()==null){
- birthday =null;
- }
- else {
- birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ if (user.getBirthday() == null) {
+ birthday = null;
+ } else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
}
- if ( user.getRtime()==null){
- rtime =null;
- }
- else {
- rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ if (user.getRtime() == null) {
+ rtime = null;
+ } else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
}
String s1 =
- "update blade_user set account = " + "'" + user.getAccount()+ "'"
- + ",password = " + "'" + user.getPassword()+"'"
- + ",name = " + "'" + user.getName()+"'"
- + ",real_name = " + "'" + user.getRealName()+"'"
- + ",avatar = " + "'" + user.getAvatar()+"'"
- + ",email = " + "'" + user.getEmail()+"'"
- + ",phone = " + "'" + user.getPhone()+"'"
- + ",birthday = " + "'" + birthday+"'"
- + ",sex = " + "'" + user.getSex()+"'"
- + ",role_id = " + "'" + user.getRoleId()+"'"
- + ",dept_id = " + "'" + user.getDeptId()+"'"
- + ",cardid = " + "'" + user.getCardid()+"'"
- + ",nativePlace = " + "'" +user.getNativeplace()+"'"
- + ",nation = " + "'" +user.getNation()+"'"
- + ",education = " + "'" +user.getEducation()+"'"
- + ",politicaloutlook = " + "'" +user.getPoliticaloutlook()+"'"
- + ",healstats = " + "'" +user.getHealstats()+"'"
- + ",height = " + "'" +user.getHeight()+"'"
- + ",address = " + "'" +user.getAddress()+"'"
- + ",registered = " + "'" +user.getRegistered()+"'"
- + ",rtime = " + "'" +rtime+"'"
- + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
- + ",hold = " + "'" +user.getHold()+"'"
- + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
- + " " +"where id = " + "'" + user.getId() + "'";
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",name = " + "'" + user.getName() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",avatar = " + "'" + user.getAvatar() + "'"
+ + ",email = " + "'" + user.getEmail() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",nativePlace = " + "'" + user.getNativeplace() + "'"
+ + ",nation = " + "'" + user.getNation() + "'"
+ + ",education = " + "'" + user.getEducation() + "'"
+ + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
+ + ",healstats = " + "'" + user.getHealstats() + "'"
+ + ",height = " + "'" + user.getHeight() + "'"
+ + ",address = " + "'" + user.getAddress() + "'"
+ + ",registered = " + "'" + user.getRegistered() + "'"
+ + ",rtime = " + "'" + rtime + "'"
+ + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",hold = " + "'" + user.getHold() + "'"
+ + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
}
@@ -519,7 +518,7 @@
*/
@GetMapping("/page-security-units")
public R pageSecurityUnits(@ApiIgnore User user, Query query) {
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query),user);
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user);
return R.data(pages);
}
@@ -549,8 +548,9 @@
List<Map<Object, Object>> list = userService.selectInr(deptid);
return R.data(list);
}
+
@GetMapping("/zc")
- public R zc(String username,String password) {
+ public R zc(String username, String password) {
User user = new User();
user.setTenantId("000000");
user.setAccount(username);
@@ -564,14 +564,14 @@
* 保安员新增
*/
@PostMapping("/securitySave")
- public R securitySave(@Valid @RequestBody Map<String,Object> userMap){
+ public R securitySave(@Valid @RequestBody Map<String, Object> userMap) {
//获取user
- User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
+ User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
//判断是否为空
// if (null!=user.getHold()){
- //持证
+ //持证
// if (user.getHold().equals("1")){
- //分配保安角色
+ //分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
@@ -583,7 +583,7 @@
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
// }
- //未持证
+ //未持证
// if (user.getHold().equals("2")){
// //分配未持证保安角色
// Role role = new Role();
@@ -602,41 +602,57 @@
String birthday;
String rtime;
- if (user.getBirthday()==null){
- birthday =null;
- }
- else {
+ if (user.getBirthday() == null) {
+ birthday = null;
+ } else {
birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
}
- if ( user.getRtime()==null){
- rtime =null;
- }
- else {
+ if (user.getRtime() == null) {
+ rtime = null;
+ } else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
}
+ String urla = "";
+ String[] split = user.getAvatar().split(",");
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(26, split[i].length());
+ urla += FtpConstant.ip + s + ",";
+ }
+ String substring = urla.substring(0, urla.length() - 1);
+ user.setAvatar(substring);
+ String urlf = "";
+ String[] splits = user.getFingerprint().split(",");
+ for (int i = 0; i < splits.length; i++) {
+ String s = splits[i].substring(26, splits[i].length());
+ urlf += FtpConstant.ip + s + ",";
+ }
+ String substrings = urla.substring(0, urlf.length() - 1);
+ user.setFingerprint(substrings);
-
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
- "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,status,is_deleted,dispatch) " +
+ "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+ "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
"," + "'" + user.getDeptId() + "'" +
"," + "'" + user.getCardid() + "'" +
"," + "'" + user.getNativeplace() + "'" +
"," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
"," + "'" + user.getEducation() + "'" +
"," + "'" + user.getPoliticaloutlook() + "'" +
"," + "'" + user.getHealstats() + "'"
- + "," +"'" + user.getHeight() + "'" +
+ + "," + "'" + user.getHeight() + "'" +
"," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'"+ "," +
- "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+
- "," + "'" + user.getHold() + "'"+
- "," + "'" + user.getJurisdiction() + "'"+
- "," + "'" + user.getDispatch() + "'"+")";
+ "," + "'" + user.getRegistered() + "'" + "," +
+ "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
FtpUtil.sqlFileUpload(s);
//获取从业记录
@@ -660,6 +676,7 @@
/**
* 保安员信息
+ *
* @param user
* @return
*/
@@ -670,18 +687,15 @@
/**
- *
- * @param type 1:保安 2:公安
+ * @param type 1:保安 2:公安
* @param deptid
* @param jurisdiction
* @return
*/
@GetMapping("/seleL")
- public R seleL(String type,String deptid, String jurisdiction,Long userId) {
- List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
+ public R seleL(String type, String deptid, String jurisdiction, Long userId) {
+ List<Map<String, Object>> list = userService.seleL(type, deptid, jurisdiction, userId);
return R.data(list);
}
-
-
}
--
Gitblit v1.9.3