From 74fec1e044f4b451524f671714e4c945b3341950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= <10604541+sanbing-os@user.noreply.gitee.com> Date: Tue, 9 Sep 2025 17:44:21 +0800 Subject: [PATCH] bugfix --- .../app/initializing/InstallInitializingBean.java | 12 ++++-------- jcpp-app/src/main/resources/sql/schema-init.sql | 5 +---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/initializing/InstallInitializingBean.java b/jcpp-app/src/main/java/sanbing/jcpp/app/initializing/InstallInitializingBean.java index b1a8209..35713b6 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/initializing/InstallInitializingBean.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/initializing/InstallInitializingBean.java @@ -197,7 +197,6 @@ public class InstallInitializingBean implements InitializingBean { User adminUser = User.builder() .id(adminUserId) .createdTime(LocalDateTime.now()) - .updatedTime(LocalDateTime.now()) .additionalInfo(additionalInfo) .status(UserStatusEnum.ENABLE) .userName("sanbing") @@ -249,7 +248,6 @@ public class InstallInitializingBean implements InitializingBean { Station station = Station.builder() .id(stationId) .createdTime(LocalDateTime.now()) - .updatedTime(LocalDateTime.now()) .additionalInfo(additionalInfo) .stationName(data[1]) .stationCode(data[2]) @@ -322,7 +320,6 @@ public class InstallInitializingBean implements InitializingBean { Pile pile = Pile.builder() .id(pileId) .createdTime(LocalDateTime.now()) - .updatedTime(LocalDateTime.now()) .additionalInfo(additionalInfo) .pileName(String.format("%s-%d号充电桩", station.getStationName(), pileIndex)) .pileCode(pileCode) @@ -363,7 +360,6 @@ public class InstallInitializingBean implements InitializingBean { Gun gun = Gun.builder() .id(gunId) .createdTime(LocalDateTime.now()) - .updatedTime(LocalDateTime.now()) .additionalInfo(additionalInfo) .gunNo(String.format("%02d", gunIndex)) .gunName(String.format("%s-%d号枪", pile.getPileName(), gunIndex)) @@ -398,23 +394,23 @@ public class InstallInitializingBean implements InitializingBean { currentTime ); attributeService.save(pileId, statusAttr); - + if (isOnline) { // 在线桩设置连接时间 AttributeKvEntry connectedAtAttr = new BaseAttributeKvEntry( - new LongDataEntry(AttrKeyEnum.CONNECTED_AT.getCode(), currentTime - (3600000L * (pileIndex % 12))), + new LongDataEntry(AttrKeyEnum.CONNECTED_AT.getCode(), currentTime - (3600000L * (pileIndex % 12))), currentTime ); attributeService.save(pileId, connectedAtAttr); } else { // 离线桩设置断开时间 AttributeKvEntry disconnectedAtAttr = new BaseAttributeKvEntry( - new LongDataEntry(AttrKeyEnum.DISCONNECTED_AT.getCode(), currentTime - (1800000L * (pileIndex % 6))), + new LongDataEntry(AttrKeyEnum.DISCONNECTED_AT.getCode(), currentTime - (1800000L * (pileIndex % 6))), currentTime ); attributeService.save(pileId, disconnectedAtAttr); } - + log.info("为充电桩 {} 设置演示状态属性: {}", pileId, status); } diff --git a/jcpp-app/src/main/resources/sql/schema-init.sql b/jcpp-app/src/main/resources/sql/schema-init.sql index 52b0b9c..4c3dcab 100644 --- a/jcpp-app/src/main/resources/sql/schema-init.sql +++ b/jcpp-app/src/main/resources/sql/schema-init.sql @@ -32,9 +32,6 @@ CREATE TABLE IF NOT EXISTS t_user CREATE UNIQUE INDEX IF NOT EXISTS uni_user_name on t_user (user_name); --- 为t_user表的字段添加注释 -COMMENT ON COLUMN t_user.authority IS '用户权限: SYS_ADMIN, TENANT_ADMIN, CUSTOMER_USER, REFRESH_TOKEN, PRE_VERIFICATION_TOKEN'; - -- 为authority字段创建索引,便于按权限查询用户 CREATE INDEX IF NOT EXISTS idx_user_authority on t_user (authority); @@ -89,7 +86,7 @@ CREATE TABLE IF NOT EXISTS t_gun id uuid not null primary key, created_time timestamp default CURRENT_TIMESTAMP not null, - updated_time timestamp default CURRENT_TIMESTAMP not null, + updated_time timestamp, additional_info varchar(255), gun_no varchar(255) not null, gun_name varchar(255) not null,