电表通信地址调整

op-modules/op-energy/src/main/java/com/op/energy/base/domain/BaseMonitorInfo.java

@@ -185,6 +185,8 @@ public class BaseMonitorInfo extends BaseEntity {
 
     private String addressCode;
 
+    private String connCode;
+
     /**
      * 计量设备状态
      */
@@ -471,6 +473,14 @@ public class BaseMonitorInfo extends BaseEntity {
         this.addressCode = addressCode;
     }
 
+    public String getConnCode() {
+        return connCode;
+    }
+
+    public void setConnCode(String connCode) {
+        this.connCode = connCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java

@@ -95,12 +95,12 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service {
         }
 
         //判断该通信地址是否已绑定设备
-        if (StringUtils.isNotBlank(baseMonitorInfo.getAddressCode())) {
+        if (StringUtils.isNotBlank(baseMonitorInfo.getConnCode())) {
             BaseMonitorInfo temp = new BaseMonitorInfo();
-            temp.setAddressCode(baseMonitorInfo.getAddressCode());
+            temp.setConnCode(baseMonitorInfo.getConnCode());
             List<BaseMonitorInfo> list = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
             if (!CollectionUtils.isEmpty(list)){
-                throw new ServiceException("通信地址重复:" + baseMonitorInfo.getAddressCode());
+                throw new ServiceException("通信地址重复:" + baseMonitorInfo.getConnCode());
             }
         }
 

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

@@ -251,7 +251,6 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
     public void getNhEnergyDetail() {
         Map<String,String> params = new HashMap<>();
         params.put("dateType","mi15");
-        //获取当前时间的前后5分钟
         Date nowTime = DateUtils.getNowDate();
         String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addMinutes(nowTime,-20));
         String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addMinutes(nowTime,-10));
@@ -329,7 +328,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
         try {
             for (RecordDnbInstant item : list) {
                 BaseMonitorInfo temp = new BaseMonitorInfo();
-                temp.setAddressCode(item.getMonitorId());
+                temp.setConnCode(item.getMonitorId());
                 List<BaseMonitorInfo> BaseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
                 for (BaseMonitorInfo base : BaseList) {
                     item.setMonitorId(base.getMonitorId());
@@ -389,7 +388,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
                     dnb.setRecordTime(new Date());
                     dnb.setPointTime(removeLeadingZeros(DateUtils.parseDateToStr("HH",DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,startTime))));
                     BaseMonitorInfo temp = new BaseMonitorInfo();
-                    temp.setAddressCode(dnb.getMonitorId());
+                    temp.setConnCode(dnb.getMonitorId());
                     List<BaseMonitorInfo> BaseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
                     for (BaseMonitorInfo base : BaseList) {
                         dnb.setMonitorId(base.getMonitorId());

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

@@ -38,13 +38,14 @@
         <result property="roomName" column="room_name"/>
         <result property="physicalCode" column="physical_code"/>
         <result property="addressCode" column="address_code"/>
+        <result property="connCode" column="conn_code"/>
     </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,
-               create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code  from base_monitor_info
+               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>
 
     <select id="selectBaseMonitorInfoList" parameterType="BaseMonitorInfo" resultMap="BaseMonitorInfoResult">
@@ -79,6 +80,7 @@
             <if test="physicalCode != null ">and physical_code = #{physicalCode}</if>
             <if test="roomCode != null ">and room_code = #{roomCode}</if>
             <if test="addressCode != null ">and address_code = #{addressCode}</if>
+            <if test="connCode != null ">and conn_code = #{connCode}</if>
         </where>
     </select>
 
@@ -146,6 +148,7 @@
             <if test="roomName != null">room_name,</if>
             <if test="physicalCode != null">physical_code,</if>
             <if test="addressCode != null">address_code,</if>
+            <if test="connCode != null">conn_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
@@ -180,6 +183,7 @@
             <if test="roomName != null">#{roomName},</if>
             <if test="physicalCode != null">#{physicalCode},</if>
             <if test="addressCode != null">#{addressCode},</if>
+            <if test="connCode != null">#{connCode},</if>
         </trim>
     </insert>
 
@@ -218,6 +222,7 @@
             <if test="roomName != null">room_name = #{roomName},</if>
             <if test="physicalCode != null">physical_code = #{physicalCode},</if>
             <if test="addressCode != null">address_code = #{addressCode},</if>
+            <if test="connCode != null">conn_code = #{connCode},</if>
         </trim>
         where objid = #{objid}
     </update>