From 0007a2064fff2751fbb3d41db825ab5acb99a1ba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 13:25:01 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/application.yml | 2 +-
zy-acs-flow/src/page/code/importTemp.csv | 5 +----
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 6 +++++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/page/code/importTemp.csv b/zy-acs-flow/src/page/code/importTemp.csv
index 9fccf29..086cdbc 100644
--- a/zy-acs-flow/src/page/code/importTemp.csv
+++ b/zy-acs-flow/src/page/code/importTemp.csv
@@ -1,4 +1 @@
-first_name,last_name,gender,title,company,email,phone_1_number,phone_1_type,phone_2_number,phone_2_type,background,first_seen,last_seen,has_newsletter,status,tags,linkedin_url
-John,Doe,male,Sales Executive,Acme,john@doe.example,659-980-2015,work,740.645.3807,home,,2024-07-01,2024-07-01T11:54:49.950Z,FALSE,in-contract,"influencer, developer",https://www.linkedin.com/in/johndoe
-Jane,Doe,female,Designer,Acme,jane@doe.example,659-980-2020,work,740.647.3802,home,,2024-07-01,2024-07-01T11:54:49.950Z,FALSE,in-contract,"UI, design",https://www.linkedin.com/in/janedoe
-Camille,Brown,nonbinary,Accountant,Atomic Corp,person@doe.example,659-910-3010,work,740.698.3752,home,,2024-07-01,2024-07-01T11:54:49.950Z,FALSE,in-contract,"payroll, accountant",,
\ No newline at end of file
+data,x,y
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index ce8b2c6..f47d989 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -129,7 +129,11 @@
@PreAuthorize("hasAuthority('manager:code:save')")
@PostMapping("/code/import")
public R importBatch(@RequestBody List<Map<String, Object>> list) {
- return R.ok().add(GsonUtils.toJson(list));
+ for (Map<String, Object> map : list) {
+ Code code = Cools.conver(map, Code.class);
+ System.out.println(GsonUtils.toJson(code));
+ }
+ return R.ok();
}
}
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index 3160f99..77a205c 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -8,7 +8,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/react_admin_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/react_admin_dev_copy1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://192.168.2.46:3306/zy_acs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
--
Gitblit v1.9.1