diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index e2ecad2e..b48bbb12 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -1,16 +1,22 @@ package com.yxt.supervise.report.biz.datacenter; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyQuery; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos; import com.yxt.supervise.report.biz.projectdaily.ProjectDailys; +import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherService; +import com.yxt.supervise.report.biz.reportinventory.ReportInventoryService; import com.yxt.supervise.report.feign.monitor.YDeviceFeign; import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + /** * @author wangpengfei * @date 2023/11/13 18:15 @@ -24,6 +30,11 @@ public class DataCenterRest { YDeviceImageFeign yDeviceImageFeign; @Autowired YDeviceFeign yDeviceFeign; + @Autowired + ReportInventoryDayGatherService reportInventoryDayGatherService; + @Autowired + DataCenterService dataCenterService; + //数据总览 @PostMapping("/getProjectDaily") public ResultBean getProjectDaily(@RequestBody ProjectDailys ProjectDailys) { @@ -50,23 +61,36 @@ public class DataCenterRest { } @ApiOperation("获取指定设备列表") @GetMapping("/getOtherList") - public ResultBean getOtherList(@RequestParam(value = "type") String type, @RequestParam(value = "ckId") String ckId){ + public ResultBean getOtherList( String type, String ckId){ return yDeviceFeign.getOtherList(type, ckId); } + @ApiOperation("获取状态数量") + @GetMapping("/getStatusCount") + public ResultBean getStatusCount(String deviceType, String statusType, String ckId){ + return yDeviceFeign.getStatusCount(deviceType, statusType, ckId); + } //库存分析图 -// @PostMapping("/getProjectDailys") -// public ResultBean getProjectDailys(@RequestBody ProjectDailyQuery ProjectDailys) { + @PostMapping("/getReportInventory") + public ResultBean getReportInventory() { + ResultBean rb = ResultBean.fireFail(); + Map pv = reportInventoryDayGatherService.getReportInventoryByOrderDate(); + return rb.success().setData(pv); + } + //告警消息 + +// @PostMapping("/getRisk") +// public ResultBean getRisk() { // ResultBean rb = ResultBean.fireFail(); -//// ResultBean b=projectDailyService.ww(ProjectDailys); -//// if(!b.getCode().equals("200")){ -//// return b; -//// } -// ProjectDailyVos pv = projectDailyService.fetchByProjectAndDay2(ProjectDailys); +// List pv = reportInventoryDayGatherService.getReportInventoryByOrderDate(); // return rb.success().setData(pv); // } - //告警消息 - - //仓库库存表 + + @GetMapping("/getInventory") + public ResultBean getInventory(String orderDate) { + ResultBean rb = ResultBean.fireFail(); + Map pv = dataCenterService.getInventoryByOrderDate(orderDate); + return rb.success().setData(pv); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java index f943b69b..d92e9295 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java @@ -2,13 +2,43 @@ package com.yxt.supervise.report.biz.datacenter; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport; +import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; +import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo; import com.yxt.supervise.report.biz.dailysalesreport.DailySalesReportMapper; +import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherService; +import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayStoreService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + /** * @author wangpengfei * @date 2023/11/13 18:16 */ @Service public class DataCenterService extends MybatisBaseService { + @Autowired + ReportInventoryDayGatherService reportInventoryDayGatherService; + @Autowired + ReportInventoryDayStoreService reportInventoryDayStoreService; + public Map getInventoryByOrderDate(String orderDate) { + Map map=new HashMap<>(); + ReportInventoryDayGatherVo reportInventoryDayGatherVo=reportInventoryDayGatherService.getReportInventoryDayGather(orderDate); + ReportInventoryDayStoreVo reportInventoryDayStoreVo=reportInventoryDayStoreService.getReportInventoryDayStore(orderDate); + if(null!=reportInventoryDayGatherVo){ + map.put("changwencang",reportInventoryDayGatherVo.getCountAmount()); + }else{ + map.put("changwencang",0); + } + if (null!=reportInventoryDayStoreVo){ + map.put("mendian",reportInventoryDayStoreVo.getCountAmount()); + }else{ + map.put("mendian",0); + } + + + return map; + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 5f9d320e..227ba306 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -259,29 +259,6 @@ public class ProjectDailyService extends ServiceImpl qw = new QueryWrapper<>(); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); -// -// params.setDataDateStart(sdf.format(DateUtil.yesterday())); -// qw.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getDataDateStart()); -// params.setDataDateEnd(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-14))); ; -// qw.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getDataDateEnd()); -// -// List projectDaily=baseMapper.getProjectDailys(qw); -// ProjectInfo projectInfo= crmMapper.getProjectBySid(params.getProjectSid()); -// if(null!=projectDaily){ -// if(null!=projectInfo) { -// projectDaily.setCreditLimit(projectInfo.getCreditLimit()); -// projectDaily.setUseLimit(projectInfo.getUseLimit()); -// projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate()); -// if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) { -// projectDaily.setState("1"); -// } -// } -// } -// return projectDaily; -// } public ResultBean> getAccountByProjectSid(String projectSid) { ResultBean rb=new ResultBean(); List projectStateBySid=crmMapper.getAccountByProjectSid(projectSid); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java index c1793cc8..8450bbec 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java @@ -52,10 +52,10 @@ public class ProjectDailyVos { private String state="2";//质押状态 @TableField(exist = false) private double creditLimit;//授信额度 - private double creditLimitW;//授信额度 + private double creditLimitW;//授信额度万元 private double useLimit;//用信额度 - private double useLimitW;//用信额度 + private double useLimitW;//用信额度 万元 //1: 已上报报表 2 ：未上报报表 private String isReport; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java index 5b9fb8de..bc00f650 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; +import com.yxt.supervise.report.biz.projectdaily.ProjectDaily; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -93,4 +95,6 @@ public interface ReportInventoryDayGatherMapper extends BaseMapper getReportInventoryDayGathers(@Param("orderDate") String orderDate); @Select("select * from report_inventory_day_gather where orderDate=#{orderDate} limit 1") ReportInventoryDayGatherVo getReportInventoryDayGather(@Param("orderDate") String orderDate); + @Select("select * from report_inventory_day_gather where ${ew.sqlSegment}") + List getReportInventoryByOrderDate(@Param(Constants.WRAPPER) Wrapper ew); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java index d02a221d..e59aad41 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java @@ -1,15 +1,14 @@ package com.yxt.supervise.report.biz.reportinventory; +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.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class ReportInventoryDayGatherService extends ServiceImpl { @@ -87,4 +86,48 @@ public class ReportInventoryDayGatherService extends ServiceImpl getReportInventoryByOrderDate() { + Map m=new HashMap<>(); + QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw2 = new QueryWrapper<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startDate=sdf.format(DateUtil.yesterday()); + String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-14)); + qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate); + qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate); + qw.eq("storeType","[101]365常温仓"); + List changwencang=baseMapper.getReportInventoryByOrderDate(qw); + + qw2.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate); + qw2.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate); + qw2.eq("storeType","[112]供应链仓"); + List gongyinglian=baseMapper.getReportInventoryByOrderDate(qw2); + + + List a=new ArrayList<>(); + List b=new ArrayList<>(); + List c=new ArrayList<>(); + //14 + long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY); + for(int k=0;k