sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_caq
姜玉琦 2025-06-15 18:43:50 +08:00
parent 71cb6a0036
commit 621d160304
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/DevIotDatasController.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.yanzhu.jh.device.domain.DevIotDatas; import com.yanzhu.jh.device.domain.DevIotDatas;
import com.yanzhu.jh.device.service.IDevIotDatasService; import com.yanzhu.jh.device.service.IDevIotDatasService;
@ -14,9 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
* 配电箱数据Controller * 配电箱数据Controller
@ -105,16 +104,15 @@ public class DevIotDatasController extends BaseController
@GetMapping("/findIotDatasMonitor/{proId}") @GetMapping("/findIotDatasMonitor/{proId}")
public AjaxResult findProAllConfigPoint(@PathVariable("proId") Long proId, Long pointId, Integer date) public AjaxResult findProAllConfigPoint(@PathVariable("proId") Long proId, Long pointId, Integer date)
{ {
// 获取当前日期 Calendar calendar = Calendar.getInstance();
LocalDate today = LocalDate.now(); calendar.setTime(new Date()); // 设置为当前时间
// 获取最近${X}天的日期 calendar.add(Calendar.DAY_OF_MONTH, Math.negateExact(date)); // 减去x天
LocalDate todayAgo = today.minusDays(date);
DevIotDatas datasQuery = new DevIotDatas(); DevIotDatas datasQuery = new DevIotDatas();
datasQuery.setPointId(pointId); datasQuery.setPointId(pointId);
datasQuery.setProjectId(proId); datasQuery.setProjectId(proId);
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("beginCreateTime",today); params.put("beginCreateTime", DateUtils.getNowDate());
params.put("endCreateTime",todayAgo); params.put("endCreateTime",calendar.getTime());
List<DevIotDatas> list = devIotDatasService.selectDevIotDatasList(datasQuery); List<DevIotDatas> list = devIotDatasService.selectDevIotDatasList(datasQuery);
return success(list); return success(list);
} }