From cc709eac68820b86c5312ba9fb017adbf6fe1b52 Mon Sep 17 00:00:00 2001 From: wgx <31655391@qq.com> Date: Tue, 24 Mar 2026 11:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8E=9F=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/entity/SurvConfig.java | 2 +- .../jeecg/common/entity/SurvDeviceDeploy.java | 4 +- .../common/entity/SurvDeviceOpration.java | 2 +- .../org/jeecg/common/entity/SurvDictEle.java | 2 +- .../common/entity/SurvDisplayDetail.java | 2 +- .../jeecg/common/entity/SurvHisdataAir.java | 4 +- .../entity/SurvHisdataLivestockwater.java | 2 +- .../jeecg/common/entity/SurvHisdataSoil.java | 44 ++++++++--------- .../entity/SurvIotManufacturerConfig.java | 2 +- .../jeecg/common/entity/SurvIotProtocol.java | 6 +-- .../jeecg/common/entity/SurvTransdataAir.java | 4 +- .../entity/SurvTransdataOrientwater.java | 4 +- .../common/entity/SurvTransdataSoil.java | 48 +++++++++---------- 13 files changed, 63 insertions(+), 63 deletions(-) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java index fd76ed8..c935a3d 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java @@ -76,7 +76,7 @@ public class SurvConfig implements Serializable { @Excel(name = "参数json配置", width = 15) @ApiModelProperty(value = "参数json配置") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "CONFIG_JSON") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "config_json") private JSONObject configJson; /**系统内置*/ @Excel(name = "系统内置", width = 15) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java index b0213f6..a384538 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java @@ -188,7 +188,7 @@ public class SurvDeviceDeploy implements Serializable { /** * 设备配置id */ - @TableField("SURV_CONFIG_ID") + @TableField("surv_config_id") @Excel(name = "物联网配置ID", width = 15) @ApiModelProperty(value = "物联网配置ID") private String survConfigId; @@ -197,7 +197,7 @@ public class SurvDeviceDeploy implements Serializable { * 设备配置串 */ @ApiModelProperty(value = "设备配置串") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "DEVICE_CONFIG") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "device_config") private cn.hutool.json.JSONObject deviceConfig; /** diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceOpration.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceOpration.java index 00b41b0..226337e 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceOpration.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceOpration.java @@ -136,7 +136,7 @@ public class SurvDeviceOpration implements Serializable { * 指令原文 */ @ApiModelProperty(value = "指令原文") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "OPERATOR_CONTENT") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "operator_content") private JSONObject operatorContent; /** diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDictEle.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDictEle.java index 7b26690..ba5e842 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDictEle.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDictEle.java @@ -61,7 +61,7 @@ public class SurvDictEle implements Serializable { /** * 字段名称 */ - @TableField("COLUMN_NAME") + @TableField("column_name") private String columnName; /**名称*/ diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDisplayDetail.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDisplayDetail.java index 781fe72..ab3f503 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDisplayDetail.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDisplayDetail.java @@ -47,7 +47,7 @@ public class SurvDisplayDetail implements Serializable { /**详情值2*/ @Excel(name = "详情值2", width = 15) @ApiModelProperty(value = "详情值2") - @TableField("DETAIL_VALUE2") + @TableField("detail_value2") private java.lang.String detailValue2; /**属性值1*/ @Excel(name = "属性值1", width = 15) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java index 4cbe84d..0a33637 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataAir.java @@ -150,13 +150,13 @@ public class SurvHisdataAir implements Serializable { /** * 更新时间 */ - @TableField("DEPLOY_ID") + @TableField("deploy_id") private String deployId; /** * 更新时间 */ - @TableField("DEPLOY_TYPE") + @TableField("deploy_type") private String deployType; @ApiModelProperty(value = "设备名称") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java index 77eecde..5142515 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java @@ -148,7 +148,7 @@ public class SurvHisdataLivestockwater implements Serializable { @ApiModelProperty(value = "2#球阀状态") private String secondValveStatus; /**3#球阀状态 */ - @TableField("THIRD_VALVE_STATUS") + @TableField("third_valve_status") private String thirdValveStatus; /**急停状态*/ @Excel(name = "急停状态", width = 15) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java index 281e339..2ffa38d 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java @@ -127,21 +127,21 @@ public class SurvHisdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION") + @TableField("data_soil_nion") private String dataSoilNion; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION") + @TableField("data_soil_pion") private String dataSoilPion; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION") + @TableField("data_soil_kion") private String dataSoilKion; @@ -150,21 +150,21 @@ public class SurvHisdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION2") + @TableField("data_soil_nion2") private String dataSoilNion2; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION2") + @TableField("data_soil_pion2") private String dataSoilPion2; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION2") + @TableField("data_soil_kion2") private String dataSoilKion2; @@ -172,21 +172,21 @@ public class SurvHisdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION3") + @TableField("data_soil_nion3") private String dataSoilNion3; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION3") + @TableField("data_soil_pion3") private String dataSoilPion3; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION3") + @TableField("data_soil_kion3") private String dataSoilKion3; @@ -194,80 +194,80 @@ public class SurvHisdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION4") + @TableField("data_soil_nion4") private String dataSoilNion4; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION4") + @TableField("data_soil_pion4") private String dataSoilPion4; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION4") + @TableField("data_soil_kion4") private String dataSoilKion4; /** * 土壤铵离子 */ @Excel(name = "土壤铵离子", width = 15) - @TableField("DATA_SOIL_NHION") + @TableField("data_soil_nhion") private String dataSoilNhion; /** * 土壤硝酸根离子 */ @Excel(name = "土壤硝酸根离子", width = 15) - @TableField("DATA_SOIL_NOION") + @TableField("data_soil_noion") private String dataSoilNoion; /** * 土壤铜离子 */ @Excel(name = "土壤铜离子", width = 15) - @TableField("DATA_SOIL_CUION") + @TableField("data_soil_cuion") private String dataSoilCuion; /** * 土壤铅离子 */ @Excel(name = "土壤铅离子", width = 15) - @TableField("DATA_SOIL_PBION") + @TableField("data_soil_pbion") private String dataSoilPbion; /** * 土壤镉离子 */ @Excel(name = "土壤镉离子", width = 15) - @TableField("DATA_SOIL_CDION") + @TableField("data_soil_cdion") private String dataSoilCdion; /**ph*/ @Excel(name = "ph", width = 15) - @TableField(value = "DATA_WATER_PH") + @TableField(value = "data_water_ph") private String dataWaterPh; /**电导率*/ - @TableField(value = "DATA_WATER_DDL") + @TableField(value = "data_water_ddl") private String dataWaterDdl; /**水温*/ - @TableField(value = "DATA_WATER_TEMP") + @TableField(value = "data_water_temp") private String dataWaterTemp; /**浊度*/ - @TableField(value = "DATA_WATER_NTU") + @TableField(value = "data_water_ntu") private String dataWaterNtu; /**溶解氧*/ - @TableField(value = "DATA_WATER_DO") + @TableField(value = "data_water_do") private String dataWaterDo; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java index c1d2d08..6e230ce 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java @@ -56,7 +56,7 @@ public class SurvIotManufacturerConfig implements Serializable { /**配置*/ @Excel(name = "配置", width = 15) @ApiModelProperty(value = "配置") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "CONFIG_JSON") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "config_json") private JSONObject configJson; /**租户号*/ diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotProtocol.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotProtocol.java index 119caeb..a70b052 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotProtocol.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotProtocol.java @@ -61,19 +61,19 @@ public class SurvIotProtocol implements Serializable { /**参数指令模板*/ @Excel(name = "参数指令模板", width = 15) @ApiModelProperty(value = "参数指令模板") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "CMD_STR") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "cmd_str") private JSONObject cmdStr; /**启动指令模板*/ @Excel(name = "启动指令模板", width = 15) @ApiModelProperty(value = "启动指令模板") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "LAUNCH_CMD_STR") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "launch_cmd_str") private JSONObject launchCmdStr; /**停止指令模板*/ @Excel(name = "停止指令模板", width = 15) @ApiModelProperty(value = "停止指令模板") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "STOP_CMD_STR") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "stop_cmd_str") private JSONObject stopCmdStr; /**排序*/ diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataAir.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataAir.java index e0fb7c5..fa0ef8b 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataAir.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataAir.java @@ -145,13 +145,13 @@ public class SurvTransdataAir implements Serializable { /** * 更新时间 */ - @TableField("DEPLOY_ID") + @TableField("deploy_id") private String deployId; /** * 更新时间 */ - @TableField("DEPLOY_TYPE") + @TableField("deploy_type") private String deployType; @ApiModelProperty(value = "设备名称") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java index 0a550dc..4da8988 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java @@ -145,7 +145,7 @@ public class SurvTransdataOrientwater implements Serializable { @ApiModelProperty(value = "2#球阀状态") private String secondValveStatus; /**3#球阀状态 */ - @TableField("THIRD_VALVE_STATUS") + @TableField("third_valve_status") private String thirdValveStatus; /**急停状态*/ @Excel(name = "急停状态", width = 15) @@ -207,6 +207,6 @@ public class SurvTransdataOrientwater implements Serializable { /** * 数据类型 */ - @TableField("DATA_TYPE") + @TableField("data_type") private String dataType; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataSoil.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataSoil.java index 2304489..a641eaa 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataSoil.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataSoil.java @@ -127,21 +127,21 @@ public class SurvTransdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION") + @TableField("data_soil_nion") private String dataSoilNion; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION") + @TableField("data_soil_pion") private String dataSoilPion; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION") + @TableField("data_soil_kion") private String dataSoilKion; @@ -150,21 +150,21 @@ public class SurvTransdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION2") + @TableField("data_soil_nion2") private String dataSoilNion2; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION2") + @TableField("data_soil_pion2") private String dataSoilPion2; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION2") + @TableField("data_soil_kion2") private String dataSoilKion2; @@ -172,21 +172,21 @@ public class SurvTransdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION3") + @TableField("data_soil_nion3") private String dataSoilNion3; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION3") + @TableField("data_soil_pion3") private String dataSoilPion3; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION3") + @TableField("data_soil_kion3") private String dataSoilKion3; @@ -194,80 +194,80 @@ public class SurvTransdataSoil implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION4") + @TableField("data_soil_nion4") private String dataSoilNion4; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION4") + @TableField("data_soil_pion4") private String dataSoilPion4; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION4") + @TableField("data_soil_kion4") private String dataSoilKion4; /** * 土壤铵离子 */ @Excel(name = "土壤铵离子", width = 15) - @TableField("DATA_SOIL_NHION") + @TableField("data_soil_nhion") private String dataSoilNhion; /** * 土壤硝酸根离子 */ @Excel(name = "土壤硝酸根离子", width = 15) - @TableField("DATA_SOIL_NOION") + @TableField("data_soil_noion") private String dataSoilNoion; /** * 土壤铜离子 */ @Excel(name = "土壤铜离子", width = 15) - @TableField("DATA_SOIL_CUION") + @TableField("data_soil_cuion") private String dataSoilCuion; /** * 土壤铅离子 */ @Excel(name = "土壤铅离子", width = 15) - @TableField("DATA_SOIL_PBION") + @TableField("data_soil_pbion") private String dataSoilPbion; /** * 土壤镉离子 */ @Excel(name = "土壤镉离子", width = 15) - @TableField("DATA_SOIL_CDION") + @TableField("data_soil_cdion") private String dataSoilCdion; /**ph*/ @Excel(name = "ph", width = 15) - @TableField(value = "DATA_WATER_PH") + @TableField(value = "data_water_ph") private String dataWaterPh; /**电导率*/ - @TableField(value = "DATA_WATER_DDL") + @TableField(value = "data_water_ddl") private String dataWaterDdl; /**水温*/ - @TableField(value = "DATA_WATER_TEMP") + @TableField(value = "data_water_temp") private String dataWaterTemp; /**浊度*/ - @TableField(value = "DATA_WATER_NTU") + @TableField(value = "data_water_ntu") private String dataWaterNtu; /**溶解氧*/ - @TableField(value = "DATA_WATER_DO") + @TableField(value = "data_water_do") private String dataWaterDo; @@ -314,13 +314,13 @@ public class SurvTransdataSoil implements Serializable { /** * 更新时间 */ - @TableField("DEPLOY_ID") + @TableField("deploy_id") private String deployId; /** * 更新时间 */ - @TableField("DEPLOY_TYPE") + @TableField("deploy_type") private String deployType; @ApiModelProperty(value = "设备名称")