From 0a56b8465051c51953a9345a9e6b6b320581b470 Mon Sep 17 00:00:00 2001
From: root <zoujl@sinocat.com.cn>
Date: Mon, 19 Jan 2026 08:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ho/business/entity/DeviceTypeCol.java   | 12 +++++++++++-
 .../main/resources/mapper/DeviceTypeColMapper.xml    | 12 +++++++++---
 .../src/main/resources/mapper/StationMapper.xml      | 12 ++----------
 3 files changed, 22 insertions(+), 14 deletions(-)

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 @@
     <sql id="Base_Column_List">
         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
     </sql>
@@ -418,10 +420,14 @@
 
     <insert id="insertList" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
         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
         <foreach collection="deviceTypeColList" item="item" index="index" separator=",">
-            (#{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})
         </foreach>
     </insert>
 
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">
 <mapper namespace="com.ho.business.mapper.StationMapper">
 
-    <sql id="Base_Column_List_All">
+    <sql id="Base_Column_List">
         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
     </sql>
-    <sql id="Base_Column_List">
-        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
-    </sql>
     <sql id="Base_Column_List1">
         id
         ,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power,
@@ -100,7 +92,7 @@
 
     <select id="selectByPrimaryKey" resultType="com.ho.business.entity.Station">
         select
-        <include refid="Base_Column_List_All"/>
+        <include refid="Base_Column_List"/>
         from station
         where id = #{id,jdbcType=INTEGER}
     </select>