补充字段

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecMeterHController.java

@@ -10,8 +10,6 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecMeter;
 import com.ruoyi.ems.domain.ElecMeterH;
-import com.ruoyi.ems.domain.EmsObjAttrValue;
-import com.ruoyi.ems.domain.FacsCategory;
 import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IBoundaryObjService;
 import com.ruoyi.ems.service.IElecMeterHService;
@@ -31,7 +29,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecMeterHServiceImpl.java

@@ -8,7 +8,6 @@ import com.ruoyi.ems.service.IElecMeterHService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 /**

ems/ems-core/src/main/resources/mapper/ems/ElecMeterHMapper.xml

@@ -130,6 +130,7 @@
         FROM
             adm_elec_meter_h
         <where>
+            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
             <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">
                 and record_time between #{startRecTime} and #{endRecTime}
             </if>