PLC/RuoYi-Scada-springboot3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改通用页面

Browse Source
This commit is contained in:
lagos 2026-01-20 09:59:26 +08:00
parent 0fd33d7631
commit 8a481b7c26
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/resources/application.yml
View File

@ -68,15 +68,15 @@ spring:
data:
# redis 配置
redis:
host: ngtools.cn
#host: 10.75.166.165
# host: ngtools.cn
host: 10.75.166.165
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
#password: Cxc@2024!1121
password: 4877017Ldy
password: Cxc@2024!1121
# password: 4877017Ldy
# 连接超时时间
timeout: 10s
lettuce:

11
ruoyi-production/src/main/java/com/ruoyi/plc/common/domain/PlcGvlCommon.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.plc.common.domain;
import java.time.Instant;
import java.time.LocalTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -37,9 +39,8 @@ public class PlcGvlCommon extends BaseEntity
private String dPatm;
/** 计量日切换时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计量日切换时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date gResetTime;
@Excel(name = "计量日切换时间", width = 30)
private Instant gResetTime;
/** 参数变更标志 */
@Excel(name = "参数变更标志")
@ -126,12 +127,12 @@ public class PlcGvlCommon extends BaseEntity
return dPatm;
}
public void setgResetTime(Date gResetTime)
public void setgResetTime(Instant gResetTime)
{
this.gResetTime = gResetTime;
}
public Date getgResetTime()
public Instant getgResetTime()
{
return gResetTime;
}