diff --git a/business-service-api/src/main/java/com/ho/business/entity/DeviceTypeCol.java b/business-service-api/src/main/java/com/ho/business/entity/DeviceTypeCol.java
index cbd3fdc..625938f 100644
--- a/business-service-api/src/main/java/com/ho/business/entity/DeviceTypeCol.java
+++ b/business-service-api/src/main/java/com/ho/business/entity/DeviceTypeCol.java
@@ -50,8 +50,18 @@ public class DeviceTypeCol implements Serializable {
/**
* 字段英文名
*/
- @ApiModelProperty(value = "字段英文名")
+ @ApiModelProperty(value = "字段(英语)")
private String colEn;
+ @ApiModelProperty(value = "字段(法语)")
+ private String colFra;
+ @ApiModelProperty(value = "字段(西班牙语)")
+ private String colSpa;
+ @ApiModelProperty(value = "字段(德语)")
+ private String colDe;
+ @ApiModelProperty(value = "字段(波兰语)")
+ private String colPl;
+ @ApiModelProperty(value = "字段(阿拉伯语)")
+ private String colAra;
/**
* INT BIGDECIMAL 等
diff --git a/business-service-dao/src/main/resources/mapper/DeviceTypeColMapper.xml b/business-service-dao/src/main/resources/mapper/DeviceTypeColMapper.xml
index 38d7296..d4d14c5 100644
--- a/business-service-dao/src/main/resources/mapper/DeviceTypeColMapper.xml
+++ b/business-service-dao/src/main/resources/mapper/DeviceTypeColMapper.xml
@@ -26,7 +26,9 @@
id
,device_type_id,device_type,
- device_type_name,col,col_name,col_en,sens_type,is_show,is_save,
+ device_type_name,col,col_name,
+ col_en,col_fra,col_spa,col_de,col_pl,col_ara,
+ sens_type,is_show,is_save,
max_value,min_value,specified_value,offset_value,factor,unit,
data_type,filter_type
@@ -418,10 +420,14 @@
insert into device_type_col
- (device_type_id,device_type,device_type_name,col,col_name,col_en,sens_type,is_show,is_save,max_value,min_value,offset_value,factor,unit)
+ (device_type_id,device_type,device_type_name,col,col_name,
+ col_en,col_fra,col_spa,col_de,col_pl,col_ara,
+ sens_type,is_show,is_save,max_value,min_value,offset_value,factor,unit)
values
- (#{item.deviceTypeId},#{item.deviceType},#{item.deviceTypeName},#{item.col},#{item.colName},#{item.colEn},#{item.sensType},#{item.isShow},#{item.isSave},#{item.maxValue},#{item.minValue},#{item.offsetValue},#{item.factor},#{item.unit})
+ (#{item.deviceTypeId},#{item.deviceType},#{item.deviceTypeName},#{item.col},#{item.colName},
+ #{item.colEn},#{item.colFra},#{item.colSpa},#{item.colDe},#{item.colPl},#{item.colAra},
+ #{item.sensType},#{item.isShow},#{item.isSave},#{item.maxValue},#{item.minValue},#{item.offsetValue},#{item.factor},#{item.unit})
diff --git a/business-service-dao/src/main/resources/mapper/StationMapper.xml b/business-service-dao/src/main/resources/mapper/StationMapper.xml
index 74bb210..4c7147d 100644
--- a/business-service-dao/src/main/resources/mapper/StationMapper.xml
+++ b/business-service-dao/src/main/resources/mapper/StationMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
id
,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power,
name,name_en,name_fra,name_spa,name_de,name_pl,name_ara,
@@ -14,14 +14,6 @@
update_time,deleted,is_enable,cabin_num,district,ad_code,is_daily_count,topology_type,cupboard_type,plan_version,inverter_flag,pv_power,icc_id,province,city,
electricity_type,customer_type,voltage_level,batch_number
-
- id
- ,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power,
- name,nation,province,
- status,type,create_time,contact,contact_details,grid_time,
- update_time,deleted,is_enable,cabin_num,district,ad_code,is_daily_count,topology_type,cupboard_type,plan_version,inverter_flag,pv_power,icc_id,province,city,
- electricity_type,customer_type,voltage_level,batch_number
-
id
,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power,
@@ -100,7 +92,7 @@