From 1debbe7b1f6e83a71e44d25418196963638b5ab2 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Mon, 9 Mar 2026 10:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lanhai/entity/SurvConfig.java   |  6 +++---
 .../SurvHisdataLivestockwaterServiceImpl.java     |  2 ++
 .../Impl/SurvHisdataOrientwaterServiceImpl.java   |  2 ++
 .../service/Impl/SurvHisdataSoilServiceImpl.java  |  2 ++
 .../Impl/SurvTransdataOrientwaterServiceImpl.java |  1 +
 src/main/resources/application-prod.yml           | 15 ++++++++-------
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lanhai/entity/SurvConfig.java b/src/main/java/com/lanhai/entity/SurvConfig.java
index 0832e9d..51c5b9d 100644
--- a/src/main/java/com/lanhai/entity/SurvConfig.java
+++ b/src/main/java/com/lanhai/entity/SurvConfig.java
@@ -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;
 
 
diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
index 0ab0a77..7d6e135 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
index 32df1f1..85f484a 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataSoilServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataSoilServiceImpl.java
index 7cab72a..2e1f144 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataSoilServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataSoilServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
index 2992cb4..6857750 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
@@ -154,5 +154,6 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
     }
 
     public void saveData(SurvTransdataOrientwater orientwater) {
+        
     }
 }
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 9eadeec..4e09cc6 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -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: