Browse Source

设备点位优化

LLL 1 year ago
parent
commit
36cdfb2f70

+ 3 - 0
module_tpm/src/main/java/org/jeecg/modules/tpmTag/entity/TpmTag.java

@@ -52,14 +52,17 @@ public class TpmTag implements Serializable {
 	/**点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等*/
 	/**点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等*/
 	@Excel(name = "点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等", width = 15)
 	@Excel(name = "点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等", width = 15)
     @ApiModelProperty(value = "点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等")
     @ApiModelProperty(value = "点位类型:温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等")
+    @Dict(dicCode = "tpm_tag_type")
     private java.lang.String tagtype;
     private java.lang.String tagtype;
 	/**能源分类ID*/
 	/**能源分类ID*/
 	@Excel(name = "能源分类ID", width = 15)
 	@Excel(name = "能源分类ID", width = 15)
     @ApiModelProperty(value = "能源分类ID")
     @ApiModelProperty(value = "能源分类ID")
+    @Dict(dictTable = "base_energy_type", dicText = "name", dicCode = "id")
     private java.lang.String energytypeid;
     private java.lang.String energytypeid;
 	/**能源分项ID*/
 	/**能源分项ID*/
 	@Excel(name = "能源分项ID", width = 15)
 	@Excel(name = "能源分项ID", width = 15)
     @ApiModelProperty(value = "能源分项ID")
     @ApiModelProperty(value = "能源分项ID")
+    @Dict(dictTable = "base_energy_item", dicText = "energyitemname", dicCode = "id")
     private java.lang.String energyitemid;
     private java.lang.String energyitemid;
 	/**下限*/
 	/**下限*/
 	@Excel(name = "下限", width = 15)
 	@Excel(name = "下限", width = 15)