新增电表类型

op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java

@@ -325,7 +325,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
 
         for (RecordDnbInstant item : list) {
             BaseMonitorInfo temp = new BaseMonitorInfo();
-            temp.setConnCode(item.getMonitorId());
+            temp.setAddressCode(item.getMonitorId());
             List<BaseMonitorInfo> baseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
             for (BaseMonitorInfo base : baseList) {
                 item.setMonitorId(base.getMonitorId());

op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml

@@ -39,12 +39,13 @@
         <result property="physicalCode" column="physical_code"/>
         <result property="addressCode" column="address_code"/>
         <result property="connCode" column="conn_code"/>
+        <result property="electricityMeterType" column="electricity_meter_type"/>
     </resultMap>
 
     <sql id="selectBaseMonitorInfoVo">
         select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status,
                collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id,
-               meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id,
+               meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, electricity_meter_type,
                create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code, conn_code  from base_monitor_info
     </sql>
 
@@ -150,6 +151,7 @@
             <if test="physicalCode != null">physical_code,</if>
             <if test="addressCode != null">address_code,</if>
             <if test="connCode != null">conn_code,</if>
+            <if test="electricityMeterType != null ">electricity_meter_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
@@ -185,6 +187,7 @@
             <if test="physicalCode != null">#{physicalCode},</if>
             <if test="addressCode != null">#{addressCode},</if>
             <if test="connCode != null">#{connCode},</if>
+            <if test="electricityMeterType != null ">#{electricityMeterType},</if>
         </trim>
     </insert>
 
@@ -224,6 +227,7 @@
             <if test="physicalCode != null">physical_code = #{physicalCode},</if>
             <if test="addressCode != null">address_code = #{addressCode},</if>
             <if test="connCode != null">conn_code = #{connCode},</if>
+            <if test="electricityMeterType != null ">electricity_meter_type = #{electricityMeterType},</if>
         </trim>
         where objid = #{objid}
     </update>