Explorar el Código

需量分析查询171、173表调整2

jichaobo hace 3 años
padre
commit
a06bf44834

+ 0 - 5
fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -866,7 +866,6 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
     @Override
     public List<CommonIcoVO> demandAnalysis(String deviceCode, String monthDate, int cycle) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat formatter1 = new SimpleDateFormat("yyyy-MM-dd");
         String date = FieldEscapeUtils.getLastDayOfMonth(monthDate);
         String date1 = monthDate + "-01 00:00:00";
@@ -880,11 +879,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 table = "ht_analog_data";
             } else if (deviceList.get(0).getDeviceType().equals("4")) {
                 table = "ht_analog_173_data";
-            } else {
-                throw new BusinessException("173用电设备无用电数据采集");
             }
-        } else {
-            throw new BusinessException("错误数据,设备不存在");
         }
         List<HtAnalogData> list1 = baseMapper.getDemandAnalysisList(deviceCode, date1, date2, table);
         List<Object> demandList = new ArrayList<>();