From eea36f18fc552a003c3324fc0d7c22857f20f75c Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 26 Apr 2022 21:42:17 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=98=E7=94=B5=E7=AB=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=8C=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E5=90=8E=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E5=AE=9E=E9=99=85=E4=B8=8A=E6=98=AF?=
 =?UTF-8?q?=E6=98=AF=E6=B7=BB=E5=8A=A0=E6=88=90=E5=8A=9F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/BaseSubstationInfo.java     | 28 +++++--------------
 .../system/BaseSubstationInfoMapper.xml       | 16 +++++------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSubstationInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSubstationInfo.java
index 07fa91a..dca23b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSubstationInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSubstationInfo.java
@@ -16,7 +16,7 @@ public class BaseSubstationInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键标识 */
-    private Long objid;
+    private Long objId;
 
     /** 变电站编号 */
     @Excel(name = "变电站编号")
@@ -30,16 +30,15 @@ public class BaseSubstationInfo extends BaseEntity
     @Excel(name = "是否启用")
     private Long enableFlag;
 
-    public void setObjId(Long objid)
-    {
-        this.objid = objid;
+    public Long getObjId() {
+        return objId;
     }
 
-    public Long getObjId() 
-    {
-        return objid;
+    public void setObjId(Long objId) {
+        this.objId = objId;
     }
-    public void setSubstationId(String substationId) 
+
+    public void setSubstationId(String substationId)
     {
         this.substationId = substationId;
     }
@@ -67,17 +66,4 @@ public class BaseSubstationInfo extends BaseEntity
         return enableFlag;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objid", getObjId())
-            .append("substationId", getSubstationId())
-            .append("substationName", getSubstationName())
-            .append("enableFlag", getEnableFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseSubstationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseSubstationInfoMapper.xml
index 5e2aec2..3a31b6c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseSubstationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseSubstationInfoMapper.xml
@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.system.mapper.BaseSubstationInfoMapper">
     
     <resultMap type="BaseSubstationInfo" id="BaseSubstationInfoResult">
-        <result property="objid"    column="ObjId"    />
+        <result property="objId"    column="ObjId"    />
         <result property="substationId"    column="Substation_Id"    />
         <result property="substationName"    column="Substation_Name"    />
         <result property="enableFlag"    column="Enable_Flag"    />
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseSubstationInfoVo">
-        select ObjId, Substation_Id, Substation_Name, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time from base_substation_info
+        select objId, Substation_Id, Substation_Name, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time from base_substation_info
     </sql>
 
     <select id="selectBaseSubstationInfoList" parameterType="BaseSubstationInfo" resultMap="BaseSubstationInfoResult">
@@ -30,10 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBaseSubstationInfoByObjId" parameterType="Long" resultMap="BaseSubstationInfoResult">
         <include refid="selectBaseSubstationInfoVo"/>
-        where ObjId = #{objid}
+        where ObjId = #{objId}
     </select>
         
-    <insert id="insertBaseSubstationInfo" parameterType="BaseSubstationInfo" useGeneratedKeys="true" keyProperty="ObjId">
+    <insert id="insertBaseSubstationInfo" parameterType="BaseSubstationInfo" useGeneratedKeys="true" keyProperty="objId">
         insert into base_substation_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="substationId != null">Substation_Id,</if>
@@ -66,17 +66,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">Update_By = #{updateBy},</if>
             <if test="updateTime != null">Update_Time = #{updateTime},</if>
         </trim>
-        where ObjId = #{objid}
+        where ObjId = #{objId}
     </update>
 
     <delete id="deleteBaseSubstationInfoByObjId" parameterType="Long">
-        delete from base_substation_info where ObjId = #{ObjId}
+        delete from base_substation_info where ObjId = #{objId}
     </delete>
 
     <delete id="deleteBaseSubstationInfoByObjIds" parameterType="String">
         delete from base_substation_info where ObjId in 
-        <foreach item="ObjId" collection="array" open="(" separator="," close=")">
-            #{ObjId}
+        <foreach item="objId" collection="array" open="(" separator="," close=")">
+            #{objId}
         </foreach>
     </delete>