查询峰平谷指定日期数据

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

@@ -291,8 +291,9 @@ public class DeviceInformationController extends JeecgController<DeviceInformati
 	 @ApiOperation(value="设备模型信息-通过区域id查询", notes="设备模型信息-通过区域id查询")
 	 @GetMapping(value = "/queryDeviceModelById")
 	 public Result<DeviceModelInfo> queryDeviceModelById(@RequestParam(name="deviceRegionId") String deviceRegionId,
-														 @RequestParam(name="deviceType") String deviceType) {
-		 DeviceModelInfo deviceModelInfo = deviceInformationService.queryDeviceModelById(deviceRegionId, deviceType);
+														 @RequestParam(name="deviceType") String deviceType,
+														 @RequestParam(name="dates", required = false) String dates) {
+		 DeviceModelInfo deviceModelInfo = deviceInformationService.queryDeviceModelById(deviceRegionId, deviceType, dates);
 		 if(deviceModelInfo == null) {
 			 return Result.ok("未找到对应数据");
 		 }

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

@@ -12,5 +12,5 @@ import org.jeecg.modules.deviceLesm.entity.DeviceModelInfo;
  */
 public interface IDeviceInformationService extends IService<DeviceInformation> {
 
-    DeviceModelInfo queryDeviceModelById(String deviceRegionId, String deviceType);
+    DeviceModelInfo queryDeviceModelById(String deviceRegionId, String deviceType, String dates);
 }

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

@@ -37,7 +37,7 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
     MongoTemplate mongoTemplate;
 
     @Override
-    public DeviceModelInfo queryDeviceModelById(String deviceRegionId, String deviceType) {
+    public DeviceModelInfo queryDeviceModelById(String deviceRegionId, String deviceType, String dates) {
         DeviceModelInfo result = new DeviceModelInfo();
         LambdaQueryWrapper<DeviceInformation> wrapper = new LambdaQueryWrapper<>();
         if ("0".equals(deviceType)){
@@ -80,10 +80,16 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         // 将当前日期格式化为字符串
         String formattedDate = currentDate.format(formatter);
+        String  queryDateParam = "";
+        if (oConvertUtils.isEmpty(dates)){
+            queryDateParam = formattedDate;
+        }else {
+            queryDateParam = dates;
+        }
         Query querys = new Query();
         querys.addCriteria(Criteria.where("deviceRegionId").is(deviceRegionId))// 设备区域ID
                 .addCriteria(Criteria.where("deviceInformationId").in(deviceInformationIds))// 虚拟设备
-                .addCriteria(Criteria.where("dates").is(formattedDate));
+                .addCriteria(Criteria.where("dates").is(queryDateParam));
         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);