数据中台

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java

@@ -9,4 +9,10 @@ import lombok.Data;
  */
 @Data
 public class DataCenterQuery implements Query {
+    //开始时间
+    private String startDate;
+    //间隔时间
+    private String intervalTime;
+
+
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java

@@ -71,9 +71,9 @@ public class DataCenterRest {
     }
     //库存分析图
     @PostMapping("/getReportInventory")
-    public ResultBean<ProjectDailyVos> getReportInventory() {
+    public ResultBean<ProjectDailyVos> getReportInventory(@RequestBody DataCenterQuery dataCenterQuery) {
         ResultBean rb = ResultBean.fireFail();
-        Map<String,Object> pv = reportInventoryDayGatherService.getReportInventoryByOrderDate();
+        Map<String,Object> pv = reportInventoryDayGatherService.getReportInventoryByOrderDate(dataCenterQuery);
         return rb.success().setData(pv);
     }
     //告警消息

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java

@@ -4,7 +4,9 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.biz.datacenter.DataCenterQuery;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -87,11 +89,17 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
         vo.setList(pagging);
         return vo;
     }
-    public Map<String,Object> getReportInventoryByOrderDate() {
+    public Map<String,Object> getReportInventoryByOrderDate(DataCenterQuery dataCenterQuery) {
         Map<String,Object> m=new HashMap<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String startDate=sdf.format(DateUtil.yesterday());
-        String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-14));
+        String startDate="";
+        if(StringUtils.isBlank(dataCenterQuery.getStartDate())){
+            startDate=sdf.format(DateUtil.yesterday());
+        }else{
+            startDate=dataCenterQuery.getStartDate();
+        }
+        String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(dataCenterQuery.getIntervalTime())+1));
+
         long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY);
 
         QueryWrapper<ReportInventoryDayGather> qw = new QueryWrapper<>();