refactor(portal):重命名webJsonStringEnglish字段为webJsonEnglish

- 将HwWeb和HwWeb1类中的webJsonStringEnglish字段重命名为webJsonEnglish
- 更新对应的getter和setter方法名称
- 修改toString方法中的字段引用
- 更新HwWebMapper.xml和HwWebMapper1.xml中的列名和参数引用
- 调整SQL映射文件中的条件查询和插入更新语句

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java

@@ -35,7 +35,7 @@ public class HwWeb extends BaseEntity
 
     /** json字符串 */
     @Excel(name = "字符串")
-    private String webJsonStringEnglish;
+    private String webJsonEnglish;
 
     public void setWebId(Long webId)
     {
@@ -82,12 +82,12 @@ public class HwWeb extends BaseEntity
         this.isDelete = isDelete;
     }
 
-    public String getWebJsonStringEnglish() {
-        return webJsonStringEnglish;
+    public String getwebJsonEnglish() {
+        return webJsonEnglish;
     }
 
-    public void setWebJsonStringEnglish(String webJsonStringEnglish) {
-        this.webJsonStringEnglish = webJsonStringEnglish;
+    public void setwebJsonEnglish(String webJsonEnglish) {
+        this.webJsonEnglish = webJsonEnglish;
     }
 
     @Override
@@ -98,7 +98,7 @@ public class HwWeb extends BaseEntity
                 .append("webJsonString", getWebJsonString())
                 .append("webCode", getWebCode())
                 .append("isDelete", getIsDelete())
-                .append("webJsonStringEnglish", getWebJsonStringEnglish())
+                .append("webJsonEnglish", getwebJsonEnglish())
                 .toString();
     }
 }

ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java

@@ -39,7 +39,7 @@ public class HwWeb1 extends BaseEntity
 
     /** json字符串 */
     @Excel(name = "字符串")
-    private String webJsonStringEnglish;
+    private String webJsonEnglish;
 
     public void setWebId(Long webId)
     {
@@ -102,12 +102,12 @@ public class HwWeb1 extends BaseEntity
         this.isDelete = isDelete;
     }
 
-    public String getWebJsonStringEnglish() {
-        return webJsonStringEnglish;
+    public String getwebJsonEnglish() {
+        return webJsonEnglish;
     }
 
-    public void setWebJsonStringEnglish(String webJsonStringEnglish) {
-        this.webJsonStringEnglish = webJsonStringEnglish;
+    public void setwebJsonEnglish(String webJsonEnglish) {
+        this.webJsonEnglish = webJsonEnglish;
     }
 
     @Override
@@ -120,7 +120,7 @@ public class HwWeb1 extends BaseEntity
                 .append("deviceId", getDeviceId())
                 .append("typeId", getTypeId())
                 .append("isDelete", getIsDelete())
-                .append("webJsonStringEnglish", getWebJsonStringEnglish())
+                .append("webJsonEnglish", getwebJsonEnglish())
                 .toString();
     }
 }

ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper.xml

@@ -10,12 +10,12 @@
         <result property="webJsonString"    column="web_json_string"    />
         <result property="webCode"    column="web_code"    />
         <result property="isDelete" column="is_delete" />
-        <result property="webJsonStringEnglish" column="web_json_string_english" />
+        <result property="webJsonEnglish" column="web_json_english" />
     </resultMap>
 
     <sql id="selectHwWebVo">
         select web_id, web_json, web_json_string, web_code,
-               web_json_string_english,
+               web_json_english,
         is_delete 
         from hw_web
     </sql>
@@ -28,7 +28,7 @@
             <if test="webJson != null  and webJson != ''"> and web_json = #{webJson}</if>
             <if test="webJsonString != null  and webJsonString != ''"> and web_json_string = #{webJsonString}</if>
             <if test="webCode != null "> and web_code = #{webCode}</if>
-             <if test="webJsonStringEnglish != null"> and web_json_string_english = #{webJsonStringEnglish}</if>
+             <if test="webJsonEnglish != null"> and web_json_english = #{webJsonEnglish}</if>
         </where>
     </select>
 
@@ -43,14 +43,14 @@
             <if test="webJson != null">web_json,</if>
             <if test="webJsonString != null">web_json_string,</if>
             <if test="webCode != null">web_code,</if>
-            <if test="webJsonStringEnglish != null">web_json_string_english,</if>
+            <if test="webJsonEnglish != null">web_json_english,</if>
             is_delete,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="webJson != null">#{webJson},</if>
             <if test="webJsonString != null">#{webJsonString},</if>
             <if test="webCode != null">#{webCode},</if>
-            <if test="webJsonStringEnglish != null">#{webJsonStringEnglish},</if>
+            <if test="webJsonEnglish != null">#{webJsonEnglish},</if>
             <choose>
                 <when test="isDelete != null and isDelete != ''">#{isDelete},</when>
                 <otherwise>'0',</otherwise>
@@ -64,7 +64,7 @@
             <if test="webJson != null">web_json = #{webJson},</if>
             <if test="webJsonString != null">web_json_string = #{webJsonString},</if>
 <!--            <if test="webCode != null">web_code = #{webCode},</if>-->
-            <if test="webJsonStringEnglish != null">web_json_string_english = #{webJsonStringEnglish},</if>
+            <if test="webJsonEnglish != null">web_json_english = #{webJsonEnglish},</if>
         </trim>
         where web_code = #{webCode}
     </update>

ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper1.xml

@@ -12,12 +12,12 @@
         <result property="deviceId"    column="device_id"    />
         <result property="typeId"    column="typeId"    />
         <result property="isDelete" column="is_delete" />
-        <result property="webJsonStringEnglish" column="web_json_string_english" />
+        <result property="webJsonEnglish" column="web_json_english" />
     </resultMap>
 
     <sql id="selectHwWebVo">
         select web_id, web_json, web_json_string, web_code,
-            device_id, typeId, web_json_string_english,
+            device_id, typeId, web_json_english,
             is_delete
          from hw_web1
     </sql>
@@ -32,7 +32,7 @@
             <if test="webCode != null "> and web_code = #{webCode}</if>
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
              <if test="typeId != null "> and typeId = #{typeId}</if>
-              <if test="webJsonStringEnglish != null "> and web_json_string_english = #{webJsonStringEnglish}</if>
+              <if test="webJsonEnglish != null "> and web_json_english = #{webJsonEnglish}</if>
         </where>
     </select>
 
@@ -56,7 +56,7 @@
             <if test="webCode != null">web_code,</if>
             <if test="deviceId != null">device_id,</if>
             <if test="typeId != null">typeId,</if>
-            <if test="webJsonStringEnglish != null">web_json_string_english,</if>
+            <if test="webJsonEnglish != null">web_json_english,</if>
             is_delete,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -65,7 +65,7 @@
             <if test="webCode != null">#{webCode},</if>
             <if test="deviceId != null">#{deviceId},</if>
             <if test="typeId != null">#{typeId},</if>
-            <if test="webJsonStringEnglish != null">#{webJsonStringEnglish},</if>
+            <if test="webJsonEnglish != null">#{webJsonEnglish},</if>
             <choose>
                 <when test="isDelete != null and isDelete != ''">#{isDelete},</when>
                 <otherwise>'0',</otherwise>
@@ -81,7 +81,7 @@
 <!--            <if test="webCode != null">web_code = #{webCode},</if>-->
 <!--            <if test="deviceId != null">device_id = #{deviceId},</if>-->
 <!--            <if test="typeId != null">typeId = #{typeId},</if>-->
-            <if test="webJsonStringEnglish != null">web_json_string_english = #{webJsonStringEnglish},</if>
+            <if test="webJsonEnglish != null">web_json_english = #{webJsonEnglish},</if>
         </trim>
         where web_code = #{webCode}
         and device_id = #{deviceId}