From 98bc9b32dd472335e24be9b2dc31338e65a73ee8 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 13:39:48 +0800
Subject: [PATCH] 新增保安员数据同步新增接口

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   21 ++++++++++
 src/main/resources/application-test.yml                                     |   48 ++++++++++++++++++++---
 2 files changed, 62 insertions(+), 7 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 5f38506..87d3397 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -533,5 +533,26 @@
 //		FtpUtil.sqlFileUpload(s);
 		return R.status(status);
 	}
+
+
+	/**
+	 * 保安员新增(数据同步调用)
+	 */
+	@PostMapping("/securitySaves")
+	@Transactional(rollbackFor = Exception.class)
+	public R securitySaves(@RequestBody User user) {
+		Integer userCount = userService.selectCount(user.getAccount());
+		//判断用户是否存在
+		if (userCount > 0) {
+			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+		}
+		user.setRoleId("1372092102682521602");
+		user.setId(null);
+		//用户新增
+		boolean status = userService.save(user);
+//		System.out.println("user = " + user);
+		//返回
+		return R.status(status);
+	}
 };
 
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index fab7885..d5647a8 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -2,8 +2,6 @@
 spring:
   redis:
     ##redis 单机环境配置
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
     host: 127.0.0.1
     port: 6379
     password:
@@ -14,9 +12,47 @@
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
-    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    # MySql
+    #    url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #    username: root
+    #    password: jfpt123
+
+    #    url: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #    username: root
+    #    password: zhba0728
+
+    url: jdbc:mysql://223.82.109.183:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: ZHba@0112
+
+    #    url: jdbc:mysql://47.49.36.191:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #    username: root
+    #    password: zhba0728
+
+    # PostgreSQL
+    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
+    #username: postgres
+    #password: 123456
+    # Oracle
+    #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+    #username: BLADEX_BOOT
+    #password: BLADEX_BOOT
+    # SqlServer
+    #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex_boot
+    #username: bladex_boot
+    #password: bladex_boot
+
+#ftp 设置
+ftp:
+  sqlConnect: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  ftpHost: 192.168.0.198
+  ftpPort: 21
+  ftpUserName: arsn
+  ftpPassword: 123456
+  ftpPath: anbao/
+  localPath: D:\\anbao\\
+  ip: http://47.49.21.216:9000
+  jsonUrl: /home/zhongsong/qfqk/
 
 #第三方登陆
 social:
@@ -29,10 +65,8 @@
   lock:
     ##是否启用分布式锁
     enabled: false
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
+    ##redis服务地址
     address: redis://127.0.0.1:6379
-    password: 123456
   #本地文件上传
   file:
     remote-mode: true

--
Gitblit v1.9.3