Administrator
/
FenXiNspJavaGather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整配置，适配新服务器

This commit is contained in:
zy 2026-03-09 10:50:19 +08:00
parent ea9ff682c1
commit 1debbe7b1f
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lanhai/entity/SurvConfig.java
View File

@ -109,7 +109,7 @@ public class SurvConfig extends Model<SurvConfig> {
/**
* 创建人
*/
@TableField("CREATE_BY")
@TableField("CREATED_BY")
private String createBy;
/**
@ -121,7 +121,7 @@ public class SurvConfig extends Model<SurvConfig> {
/**
* 更新人
*/
@TableField("UPDATE_BY")
@TableField("UPDATED_BY")
private String updateBy;
/**
@ -133,7 +133,7 @@ public class SurvConfig extends Model<SurvConfig> {
/**
* 更新时间
*/
@TableField("UPDATE_TIME")
@TableField("UPDATED_TIME")
private Date updateTime;

2
src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
View File

@ -276,6 +276,7 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
hisdataLivestockwater.setCreatedBy("ftask");
hisdataLivestockwater.setCreateTime(nowTime);
hisdataLivestockwater.setIsDel(0);
hisdataLivestockwater.setTenantId(deploy.getTenantId());
hisdataLivestockwater.setDataDateTime(nowTime);
hisdataLivestockwater.setDataGatherType(IotConstants.MARK_GENDATA);
@ -327,6 +328,7 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
BeanUtil.copyProperties(hisdataLivestockwater, newestData);
newestData.setId(orgId);
newestData.setTenantId(deploy.getTenantId());
newestData.setDataDateTime(nowTime);
newestData.setRuleType(newestData.getRuleType());
newestData.setDataGatherType(newestData.getDataGatherType());

2
src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
View File

@ -296,6 +296,7 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
hisdataOrientwater.setCreatedBy("ftask");
hisdataOrientwater.setCreateTime(nowTime);
hisdataOrientwater.setIsDel(0);
hisdataOrientwater.setTenantId(deploy.getTenantId());
hisdataOrientwater.setDataDateTime(nowTime);
hisdataOrientwater.setDataGatherType(IotConstants.MARK_GENDATA);
@ -348,6 +349,7 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
BeanUtil.copyProperties(hisdataOrientwater, newestData);
newestData.setId(orgId);
newestData.setTenantId(deploy.getTenantId());
newestData.setDataDateTime(nowTime);
newestData.setRuleType(newestData.getRuleType());
newestData.setDataGatherType(newestData.getDataGatherType());

2
src/main/java/com/lanhai/service/Impl/SurvHisdataSoilServiceImpl.java
View File

@ -120,6 +120,7 @@ public class SurvHisdataSoilServiceImpl extends ServiceImpl<SurvHisdataSoilMappe
saveEnt.setStationCode(deploy.getStationCode());
saveEnt.setDeployCode(deploy.getDeployCode());
saveEnt.setDeviceName(deploy.getDeployDes());
saveEnt.setTenantId(deploy.getTenantId());
saveEnt.setTransDate(nowTime);
saveEnt.setReVision(0);
saveEnt.setCreatedBy("ftask");
@ -150,6 +151,7 @@ public class SurvHisdataSoilServiceImpl extends ServiceImpl<SurvHisdataSoilMappe
save(saveEnt);
BeanUtil.copyProperties(saveEnt, newestData);
newestData.setId(orgId);
newestData.setTenantId(deploy.getTenantId());
newestData.setDataDateTime(nowTime);
newestData.setRuleType(newestData.getRuleType());
newestData.setDataGatherType(newestData.getDataGatherType());

1
src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
View File

@ -154,5 +154,6 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
}
public void saveData(SurvTransdataOrientwater orientwater) {
}
}

15
src/main/resources/application-prod.yml
View File

@ -7,7 +7,7 @@ server:
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.7:13306/fx_nsp?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
url: jdbc:mysql://172.23.82.152:13306/fx_nsp?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: user_fx
password: user_fx
type: com.alibaba.druid.pool.DruidDataSource
@ -39,10 +39,10 @@ spring:
matching-strategy: ant_path_matcher #解决springboot高版本和swagger的集成问题
redis:
port: 16379
host: 192.168.0.75
port: 6379
host: 172.23.82.152
database: 11
password: zhkj.20231120
password: ZhiHang.20230629
jedis:
pool:
min-idle: 0
@ -66,14 +66,15 @@ logging:
xxl:
job:
accessToken: lhzn.20251111
#accessToken: lhzn.20251111 盂县服务器版
accessToken: lhzn.20250409
admin:
addresses: http://192.168.0.7:10006/xxl-job-admin
addresses: http://172.23.82.152:10003/xxl-job-admin
executor:
appname: fxTask
address:
ip:
port: 10007
port: 10004
logpath: /logs/xxl-job/jobhandler
logretentiondays: 30
mqtt: