From e60a7a556971d0bd74ed968c292de2d28e8ff787 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Sep 2021 11:56:22 +0800
Subject: [PATCH] ftp 配置文件修改，用户修改，用户注册审核接口修改
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 48 +++++++++++++++++++++--
src/main/java/org/springblade/modules/system/controller/UserController.java | 2
src/main/resources/application-test.yml | 8 ++--
src/main/java/org/springblade/common/config/FtpConfig.java | 4 ++
4 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/FtpConfig.java b/src/main/java/org/springblade/common/config/FtpConfig.java
index 9b70ed6..2a7e1ec 100644
--- a/src/main/java/org/springblade/common/config/FtpConfig.java
+++ b/src/main/java/org/springblade/common/config/FtpConfig.java
@@ -93,4 +93,8 @@
public void setIp(String ip) {
FtpConfig.ip = ip;
}
+
+ public void setJsonUrl(String jsonUrl) {
+ FtpConfig.jsonUrl = jsonUrl;
+ }
}
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 e3810ea..a23e03b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -231,7 +231,7 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- userService.updateUser(user);
+ userService.updateById(user);
Date birthday1 = user.getBirthday();
String birthday;
String rtime;
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 dbd10ab..21d96a6 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -17,6 +17,12 @@
package org.springblade.modules.zc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,11 +30,14 @@
import lombok.AllArgsConstructor;
import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.exception.ServiceException;
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.DigestUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
@@ -40,11 +49,9 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 控制器
@@ -138,15 +145,46 @@
String times = df.format(new Date());
zc.setZctime(times);
if (type.equals("1")){
+
User user = new User();
user.setAccount(zc.getUsername());
user.setTenantId("000000");
+
+ User user1 = iUserService.userByAccount(user.getTenantId(),user.getAccount());
+ if (null!=user1) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+
user.setPassword(DigestUtil.encrypt(zc.getPassword()));
user.setRealName(zc.getSname());
user.setCardid(zc.getCardid());
user.setRoleId(zc.getParentId());
user.setDeptId(zc.getDeptid());
- iUserService.saveOrUpdate(user);
+ user.setCreateTime(new Date());
+ user.setHold("2");
+ user.setDispatch("1");
+ user.setStatus(1);
+ 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) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
+ "," +"'" + user.getPassword() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + rtime + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+
}
return R.status(zcService.updateById(zc));
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 832acc7..95ae4c1 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -40,14 +40,14 @@
#ftp 设置
ftp:
sqlConnect: jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 192.168.0.199
+ ftpHost: 192.168.0.110
ftpPort: 21
- ftpUserName: arsn
+ ftpUserName: anonymous
ftpPassword:
ftpPath: anbao/
- localPath: D:\anbao\
+ localPath: D:\\anbao\\
ip: http://223.82.109.183:2081
- jsonUrl: D:\anbao\
+ jsonUrl: D:\\anbao\\
#第三方登陆
social:
--
Gitblit v1.9.3