去掉无用参数、增加日志信息

src/main/java/com/persagy/apm/energy/report/common/service/impl/CommonServiceImpl.java

@@ -133,6 +133,10 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public HotelProjectAlarmDealInfo getHotelProjectAlarmDealInfo(String projectId, Date reportDate) {
+        if (StringUtils.isEmpty(projectId) || null == reportDate) {
+            log.info("获取HotelProjectAlarmDealInfo信息时传入参为空,故不进行查询");
+            return new HotelProjectAlarmDealInfo();
+        }
         Integer workCount = null;
         Integer dealCount = null;
         List<WorkOrder> askEndTimeList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "ask_end_time", null);
@@ -160,6 +164,7 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public HotelProjectKpiItem getHotelProjectKpiItem(String projectId, Date reportDate, List<String> projectIdList, Function function) {
         if (CollectionUtils.isEmpty(projectIdList) || StringUtils.isEmpty(projectId) || null == reportDate || null == function || StringUtils.isEmpty(function.getItemId())) {
+            log.info("获取HotelProjectKpiItem信息时传入参为空,故不进行查询");
             return new HotelProjectKpiItem();
         }
         try {
@@ -197,6 +202,7 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public HotelProjectMaintenanceGraph getHotelProjectMaintenanceGraph(String userId, String projectId, Date reportDate, Function function) {
         if (StringUtils.isEmpty(projectId) || null == reportDate || null == function || StringUtils.isEmpty(function.getItemId())) {
+            log.info("获取HotelProjectMaintenanceGraph信息时传入参为空,故不进行查询");
             return new HotelProjectMaintenanceGraph();
         }
         HotelProjectMaintenanceGraph hotelProjectMaintenanceGraph = new HotelProjectMaintenanceGraph();
@@ -244,6 +250,10 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public HotelProjectMaintenanceInfo getHotelProjectMaintenanceInfo(String userId, String projectId, Date reportDate, List<Function> functionList, List<String> projectIdList) {
+        if (StringUtils.isEmpty(projectId) || null == reportDate || CollectionUtils.isEmpty(functionList) || CollectionUtils.isEmpty(projectIdList)) {
+            log.info("获取HotelProjectMaintenanceInfo信息时传入参为空,故不进行查询");
+            return new HotelProjectMaintenanceInfo();
+        }
         HotelProjectMaintenanceInfo hotelProjectMaintenanceInfo = new HotelProjectMaintenanceInfo();
         List<HotelProjectMaintenanceGraph> hotelProjectMaintenanceGraphList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(functionList)) {
@@ -251,7 +261,7 @@ public class CommonServiceImpl implements CommonService {
                 hotelProjectMaintenanceGraphList.add(getHotelProjectMaintenanceGraph(userId, projectId, reportDate, function));
             }
         }
-        List<AlarmInfoVo> alarmInfoVoList = iDataAnalysisWebService.getAlarmInfoVo(userId, groupCode, projectIdList, reportDate);
+        List<AlarmInfoVo> alarmInfoVoList = iDataAnalysisWebService.getAlarmInfoVo(groupCode, projectIdList, reportDate);
         Map<String, Integer> sortMap = new HashMap<>();
         sortMap.put("alarmCount", -1);
         DataUtils.sort(alarmInfoVoList, sortMap);
@@ -272,6 +282,7 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public HotelProjectEnergyWorkerOrderInfo getHotelProjectEnergyWorkerOrderInfo(String projectId, Date reportDate) {
         if (StringUtils.isEmpty(projectId) || null == reportDate) {
+            log.info("获取HotelProjectEnergyWorkerOrderInfo信息时传入参为空,故不进行查询");
             return new HotelProjectEnergyWorkerOrderInfo();
         }
         HotelProjectEnergyWorkerOrderInfo hotelProjectEnergyWorkerOrderInfo = new HotelProjectEnergyWorkerOrderInfo();

src/main/java/com/persagy/apm/energy/report/iotdataanalysis/service/IDataAnalysisWebService.java

@@ -35,12 +35,11 @@ public interface IDataAnalysisWebService {
     /**
      * 获取报警信息
      *
-     * @param userId        用户id
      * @param groupCode     集团编码
      * @param projectIdList 项目id列表
      * @param reportDate    生成报告月
      * @return
      */
-    List<AlarmInfoVo> getAlarmInfoVo(String userId, String groupCode, List<String> projectIdList, Date reportDate);
+    List<AlarmInfoVo> getAlarmInfoVo(String groupCode, List<String> projectIdList, Date reportDate);
 
 }

src/main/java/com/persagy/apm/energy/report/iotdataanalysis/service/impl/IDataAnalysisWebServiceImpl.java

@@ -90,7 +90,7 @@ public class IDataAnalysisWebServiceImpl implements IDataAnalysisWebService {
     }
 
     @Override
-    public List<AlarmInfoVo> getAlarmInfoVo(String userId, String groupCode, List<String> projectIdList, Date reportDate) {
+    public List<AlarmInfoVo> getAlarmInfoVo(String groupCode, List<String> projectIdList, Date reportDate) {
         List<AlarmInfoVo> resultList = new ArrayList<>();
         try {
             JSONObject paramObject = new JSONObject();