lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://local.gunshiiot.com:10000/xjm/fxkh-txl-service

master
ForwithyNew 2024-06-12 15:45:13 +08:00
parent 910480acfb 938a4d5563
commit a297c11bcd
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/whdc/controller/AddressBookOldController.java
View File

@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -134,6 +135,11 @@ public class AddressBookOldController {
throw new MyException("通讯录数据删除失败"); throw new MyException("通讯录数据删除失败");
} }
// 新增创建时间
Date date = new Date();
appends = appends.stream().map(vo -> vo.setCreateTime(date))
.collect(Collectors.toList());
if (!service.saveBatch(appends)) { if (!service.saveBatch(appends)) {
throw new MyException("表格数据新增失败"); throw new MyException("表格数据新增失败");
} }

5
src/main/java/com/whdc/model/entity/AddressBookOld.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.whdc.model.group.Update; import com.whdc.model.group.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -15,6 +16,7 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* Description: * Description:
@ -62,7 +64,8 @@ public class AddressBookOld extends Model<AddressBookOld> implements Serializabl
@Excel(name = "创建时间") @Excel(name = "创建时间")
@TableField("CREATE_TIME") @TableField("CREATE_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private String createTime; private Date createTime;
} }

17
src/main/resources/application.yml
View File

@ -10,15 +10,12 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: dm.jdbc.driver.DmDriver driver-class-name: dm.jdbc.driver.DmDriver
# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL
# username: SYSDBA username: SYSDBA
# password: SYSDBA001 password: SYSDBA001
# url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL # url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL
# username: SHZH # username: SHZH
# password: Shzh_890 # password: Shzh_890
url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL
username: SYSDBA
password: SYSDBA001
druid: druid:
initialSize: 5 initialSize: 5
minIdle: 5 minIdle: 5
@ -42,11 +39,11 @@ spring:
# Redis # Redis
redis: redis:
database: 5 database: 5
# host: 10.42.6.75 host: 10.42.6.75
host: 127.0.0.1 # host: 127.0.0.1
port: 6379 port: 6379
password: # password:
# password: Whdc_890 password: Whdc_890
servlet: servlet:
multipart: multipart: