设备模型信息接口日志添加

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/controller/DeviceInformationController.java

@@ -292,8 +292,8 @@ public class DeviceInformationController extends JeecgController<DeviceInformati
 	 @GetMapping(value = "/queryDeviceModelById")
 	 public Result<DeviceModelInfo> queryDeviceModelById(@RequestParam(name="deviceRegionId") String deviceRegionId) {
 		 DeviceModelInfo deviceModelInfo = deviceInformationService.queryDeviceModelById(deviceRegionId);
-		 if(deviceModelInfo==null) {
-			 return Result.error("未找到对应数据");
+		 if(deviceModelInfo == null) {
+			 return Result.ok("未找到对应数据");
 		 }
 		 return Result.OK(deviceModelInfo);
 	 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/service/impl/DeviceInformationServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.deviceLesm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
 import org.jeecg.modules.deviceLesm.entity.DeviceModelInfo;
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationMapper, DeviceInformation> implements IDeviceInformationService {
 
     @Autowired
@@ -43,7 +45,8 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
         wrapper.eq(DeviceInformation::getDeviceRegionId, deviceRegionId);
         List<DeviceInformation> deviceInformationList = baseMapper.selectList(wrapper);
         if (oConvertUtils.listIsEmpty(deviceInformationList)){
-            return null;
+            log.info("{}{}", "通过设备区域ID——未查询到设备信息:", deviceRegionId);
+            return result;
         }
         result.setDeviceInformationList(deviceInformationList);
         List<String> deviceInformationIds = deviceInformationList.stream().map(DeviceInformation::getId).collect(Collectors.toList());
@@ -55,6 +58,7 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
         // 获取上次运行时间、运行累计时间、运行累计功率
         List<StatiscsModelDataResult> statiscsModelDataResultList1 = mongoTemplate.find(query, StatiscsModelDataResult.class, "total_startstop");
         if (oConvertUtils.listIsEmpty(statiscsModelDataResultList1)){
+            log.info("{}{}", "未查询到mongoDB信息total_startstop:", "区域ID:" + deviceRegionId + "设备ID集合:" + deviceInformationIds);
             return result;
         }
         // 获取尖峰平谷 时长、用电、占比
@@ -70,6 +74,7 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
                 .addCriteria(Criteria.where("dates").is(formattedDate));
         List<StatiscsModelDataResult> statiscsModelDataResultList2 = mongoTemplate.find(querys, StatiscsModelDataResult.class, "total_day_powerproportioncurrent");
         if (oConvertUtils.listIsEmpty(statiscsModelDataResultList2)){
+            log.info("{}{}", "未查询到mongoDB信息total_day_powerproportioncurrent:", "区域ID:" + deviceRegionId + "设备ID集合:" + deviceInformationIds);
             return result;
         }
         // 使用 Map 存储列表2的数据，提高查找效率
@@ -103,9 +108,7 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
                 mergedItem.setPeaksProportion(item2.getPeaksProportion());
                 mergedItem.setFlatProportion(item2.getFlatProportion());
                 mergedItem.setValleysProportion(item2.getValleysProportion());
-
                 mergedItem.setDates(item2.getDates());
-
                 // 复制其他需要的属性
                 mergedItem.setIngTime(item1.getIngTime());// 运行累计时间
                 mergedItem.setPower(item1.getPower());// 运行累加功率
@@ -114,6 +117,7 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
             }
         }
         result.setStatiscsModelDataResultList(statiscsModelDataResultListMerge);
+        log.info("{}{}", "模型信息总数:", statiscsModelDataResultListMerge.size());
         return result;
     }
 }