kangwei:重构电耗分析的，数据展示接口

@@ -5,17 +5,14 @@ import com.skua.common.constant.ReportConstant;
 import com.skua.common.report.ReportViewUtil;
 import com.skua.common.report.ReportViewUtil;
 import com.skua.common.report.vo.ReportItemVO;
 import com.skua.common.report.vo.ReportItemVO;
 import com.skua.core.context.SpringContextUtils;
 import com.skua.core.context.SpringContextUtils;
-import com.skua.modules.common.mapper.CommonSqlMapper;
 import com.skua.modules.equipment.dto.*;
 import com.skua.modules.equipment.dto.*;
 import com.skua.modules.equipment.mapper.ComprehensiveSupervisionMapper;
 import com.skua.modules.equipment.mapper.ComprehensiveSupervisionMapper;
 import com.skua.modules.equipment.service.IPowerConsumptionAnalysisService;
 import com.skua.modules.equipment.service.IPowerConsumptionAnalysisService;
 import com.skua.modules.equipment.vo.AnysisParamsVO;
 import com.skua.modules.equipment.vo.AnysisParamsVO;
 import com.skua.modules.equipment.vo.MetricVo;
 import com.skua.modules.equipment.vo.MetricVo;
-import com.skua.modules.system.service.ReportViewService;
 import com.skua.tool.util.JSUtils;
 import com.skua.tool.util.JSUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.dao.DataAccessException;
 import org.apache.shiro.dao.DataAccessException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -32,8 +29,6 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
 
 
     @Resource
     @Resource
     private ComprehensiveSupervisionMapper comprehensiveSupervisionMapper;
     private ComprehensiveSupervisionMapper comprehensiveSupervisionMapper;
-    @Resource
-    private CommonSqlMapper  commonSqlMapper;
     @Override
     @Override
     public Map<String, Object> dataDisplay(AnysisParamsVO anysisParamsVO) {
     public Map<String, Object> dataDisplay(AnysisParamsVO anysisParamsVO) {
         String time = anysisParamsVO.getTime();
         String time = anysisParamsVO.getTime();