From 938a4d5563945075fc45a5ca84504ef9a79acdd6 Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 12 Jun 2024 14:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=81=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,excel=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3,excel=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=8E=A5=E5=8F=A3,excel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AddressBookOldController.java | 6 ++++++ .../com/whdc/model/entity/AddressBookOld.java | 5 ++++- src/main/resources/application.yml | 17 +++++++---------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/whdc/controller/AddressBookOldController.java b/src/main/java/com/whdc/controller/AddressBookOldController.java index 6d9932a..92658c4 100644 --- a/src/main/java/com/whdc/controller/AddressBookOldController.java +++ b/src/main/java/com/whdc/controller/AddressBookOldController.java @@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -134,6 +135,11 @@ public class AddressBookOldController { throw new MyException("通讯录数据删除失败"); } + // 新增创建时间 + Date date = new Date(); + appends = appends.stream().map(vo -> vo.setCreateTime(date)) + .collect(Collectors.toList()); + if (!service.saveBatch(appends)) { throw new MyException("表格数据新增失败"); } diff --git a/src/main/java/com/whdc/model/entity/AddressBookOld.java b/src/main/java/com/whdc/model/entity/AddressBookOld.java index 5bd1a53..00e8023 100644 --- a/src/main/java/com/whdc/model/entity/AddressBookOld.java +++ b/src/main/java/com/whdc/model/entity/AddressBookOld.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import com.whdc.model.group.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -15,6 +16,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; /** * Description: @@ -62,7 +64,8 @@ public class AddressBookOld extends Model implements Serializabl @Excel(name = "创建时间") @TableField("CREATE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "创建时间") - private String createTime; + private Date createTime; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 29f085b..a533313 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,15 +10,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL -# username: SYSDBA -# password: SYSDBA001 + url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL + username: SYSDBA + password: SYSDBA001 # url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL # username: SHZH # password: Shzh_890 - url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL - username: SYSDBA - password: SYSDBA001 druid: initialSize: 5 minIdle: 5 @@ -42,11 +39,11 @@ spring: # Redis redis: database: 5 -# host: 10.42.6.75 - host: 127.0.0.1 + host: 10.42.6.75 +# host: 127.0.0.1 port: 6379 - password: -# password: Whdc_890 +# password: + password: Whdc_890 servlet: multipart: