Skip to content

W
wangxiaolu-link-module-bi
提交 653a94cf authored 作者: 吕本才's avatar 吕本才 提交者： Coding
浏览文件
操作

Accept Merge Request #77: (qa -> main)

Merge Request: 优化代码 Created By: @吕本才 Accepted By: @吕本才 URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-module-bi/git/merge/77?initial=true
上级 9bdf5c5c 83396308
显示空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 529 行删除
src/main/java/com/link/bi/controller/query/EcBaStoreDailyDataQueryController.java
浏览文件 @ 653a94cf
package com.link.bi.controller.query;
import com.link.bi.service.IEcBaStoreDailyDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/ba/store/query")
public class EcBaStoreDailyDataQueryController {
@Autowired
IEcBaStoreDailyDataService ecBaStoreDailyDataService;
}
src/main/java/com/link/bi/controller/query/EcGoodsSupplyDemandQueryController.java
浏览文件 @ 653a94cf
package com.link.bi.controller.query;
import com.link.bi.pojo.request.EcStoreVo;
import com.link.bi.service.IEcGoodsSupplyDemandService;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.security.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -20,17 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/demand/core")
public class EcGoodsSupplyDemandQueryController extends BaseController
{
@Autowired
private IEcGoodsSupplyDemandService ecGoodsSupplyDemandService;
/**
* 导出电商-货物供需列表
*/
@RequiresPermissions("bi:demand:list")
@GetMapping("/list")
public PageInfo list(EcStoreVo ecStoreVo)
{
return ecGoodsSupplyDemandService.selectPage(ecStoreVo);
}
}
src/main/java/com/link/bi/controller/query/OppoCmmQueryController.java
浏览文件 @ 653a94cf
package com.link.bi.controller.query;
import com.link.bi.pojo.request.OppoCmmDto;
import com.link.bi.pojo.response.OppoCmmVO;
import com.link.bi.pojo.request.OppoCmmVo;
import com.link.bi.pojo.response.OppoCmmDto;
import com.link.bi.service.IOppoCmmService;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.security.annotation.RequiresPermissions;
......@@ -28,9 +28,9 @@ public class OppoCmmQueryController extends BaseController {
* 查询电商竞品-蝉妈妈数据（抖音后台）列表
* zbj 直播间数据
*/
@RequiresPermissions("bi:cmm:list")
@RequiresPermissions("bi:competitor:list")
@GetMapping("/zbj")
public List<List<OppoCmmVO>> selectOppoCmmZbjBiList(OppoCmmDto oppoCmmDto) {
public List<List<OppoCmmDto>> selectOppoCmmZbjBiList(OppoCmmVo oppoCmmDto) {
return oppoCmmService.selectOppoCmmZbjBiList(oppoCmmDto);
}
......
src/main/java/com/link/bi/controller/query/OppoSycmQueryController.java
浏览文件 @ 653a94cf
package com.link.bi.controller.query;
import com.link.bi.pojo.request.OppoSycmDto;
import com.link.bi.pojo.response.OppoSycmVO;
import com.link.bi.pojo.request.OppoSycmVo;
import com.link.bi.pojo.response.OppoSycmDto;
import com.link.bi.service.IOppoSycmService;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.security.annotation.RequiresPermissions;
......@@ -28,11 +28,11 @@ public class OppoSycmQueryController extends BaseController
/**
* 查询电商竞品-生意参谋数据（天猫）列表
*/
@RequiresPermissions("sycm:sycm:list")
@RequiresPermissions("bi:competitor:list")
@GetMapping("/list")
public List<List<OppoSycmVO>> list(OppoSycmDto oppoSycmDto)
public List<List<OppoSycmDto>> list(OppoSycmVo oppoSycmVo)
{
return oppoSycmService.selectOppoSycmStoreBi(oppoSycmDto);
return oppoSycmService.selectOppoSycmStoreBi(oppoSycmVo);
}
}
src/main/java/com/link/bi/domain/dao/impl/EcGoodsSupplyDemandDaoImpl.java
浏览文件 @ 653a94cf
......@@ -7,6 +7,7 @@ import com.link.bi.domain.dao.IEcGoodsSupplyDemandDao;
import com.link.bi.domain.entity.EcGoodsSupplyDemand;
import com.link.bi.domain.mapper.EcGoodsSupplyDemandMapper;
import com.link.bi.domain.wq.MarketDetailWq;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -20,6 +21,7 @@ import java.util.stream.Collectors;
* @date : 2024-11-21 16
* @describe :
*/
@Slf4j
@Service
public class EcGoodsSupplyDemandDaoImpl implements IEcGoodsSupplyDemandDao {
......@@ -37,17 +39,16 @@ public class EcGoodsSupplyDemandDaoImpl implements IEcGoodsSupplyDemandDao {
Integer delete = mapper.delete(new LambdaQueryWrapper<EcGoodsSupplyDemand>()
.eq(EcGoodsSupplyDemand::getYear, year));
System.out.println("删除" + delete + "条数据");
log.info("删除" + delete + "条数据");
return delete;
}
@Override
public Map<String, Map<String, String>> getSupplyDemandYearAndMonth(MarketDetailWq mqw) {
QueryWrapper<EcGoodsSupplyDemand> yearWrapper = new QueryWrapper<EcGoodsSupplyDemand>();
// 年度
yearWrapper.lambda().eq(EcGoodsSupplyDemand::getYear, mqw.getYear())
.eq(EcGoodsSupplyDemand::getReportDateType, 1L)
// 年度
.isNotNull(EcGoodsSupplyDemand::getPlatformId)
.groupBy(EcGoodsSupplyDemand::getPlatformId, EcGoodsSupplyDemand::getYear);
yearWrapper.lambda().select(EcGoodsSupplyDemand::getPlatformId);
......@@ -55,14 +56,17 @@ public class EcGoodsSupplyDemandDaoImpl implements IEcGoodsSupplyDemandDao {
yearWrapper.select(columns);
List<Map<String, Object>> yearMaps = mapper.selectMaps(yearWrapper);
// List转Map<String,Map<String,Object>>
// List转Map<String,Map<String,Object>>
Map<String, String> yearMap = yearMaps.stream().collect(Collectors.toMap(k -> k.get("platform_id").toString(), v -> ObjectUtil.isNotEmpty(v.get("supplyDemandCount")) ? v.get("supplyDemandCount").toString() : "0"));
// 月度
QueryWrapper<EcGoodsSupplyDemand> wrapper = new QueryWrapper<EcGoodsSupplyDemand>();
wrapper.lambda().eq(EcGoodsSupplyDemand::getYear, mqw.getYear())
.eq(EcGoodsSupplyDemand::getMonth, mqw.getMonth())
.eq(EcGoodsSupplyDemand::getReportDateType, 2L)
// 年度
.eq(ObjectUtil.isNotEmpty(mqw.getPrdCode()), EcGoodsSupplyDemand::getPrdCode, mqw.getPrdCode())
.in(ObjectUtil.isNotEmpty(mqw.getPrdCodes()), EcGoodsSupplyDemand::getPrdCode, mqw.getPrdCodes())
.eq(ObjectUtil.isNotEmpty(mqw.getSeriesId()), EcGoodsSupplyDemand::getSeriesId, mqw.getSeriesId())
.isNotNull(EcGoodsSupplyDemand::getPlatformId)
.groupBy(EcGoodsSupplyDemand::getPlatformId, EcGoodsSupplyDemand::getYear, EcGoodsSupplyDemand::getMonth);
wrapper.lambda().select(EcGoodsSupplyDemand::getPlatformId);
......
src/main/java/com/link/bi/domain/dao/impl/OppoSycmDaoImpl.java
浏览文件 @ 653a94cf
......@@ -27,11 +27,10 @@ public class OppoSycmDaoImpl implements IOppoSycmDao {
QueryWrapper<OppoSycm> wrapper = new QueryWrapper<>();
wrapper.select("`date`,platform_store,SUM(zfmj_under) AS zfmj_under_total, SUM(zfmj_peak) AS zfmj_peak_total , SUM(jyzs_under) AS jyzs_under_total , SUM(jyzs_peak) AS jyzs_peak_total , SUM(uv_under) AS uv_under_total , SUM(uv_peak) AS uv_peak_total, SUM(llzs_under) AS llzs_under_total, SUM(llzs_peak) AS llzs_peak_total ");
String storeStr = "三只松鼠旗舰店,良品铺子旗舰店,比比赞旗舰店,百草味官方旗舰店,沃隆旗舰店,每果时光旗舰店,老街口旗舰店,洽洽食品官方旗舰店,好利来官方旗舰店,盐津铺子食品旗舰店,德芙官方旗舰店,蒙都旗舰店,脱骨侠旗舰店,炭食光食品旗舰店,藤桥官方旗舰店,蒙时代旗舰店,周黑鸭食品旗舰店";
wrapper.in("platform_store",storeStr.split(","));
wrapper.in("platform_store", storeStr.split(","));
wrapper.between(ObjectUtil.isNotEmpty(wq.getStartDate()), "date", wq.getStartDate(), wq.getEndDate());
wrapper.groupBy("platform_store,`date`");
wrapper.orderByDesc("`date`");
//
return oppoSycmMapper.selectList(wrapper);
}
}
src/main/java/com/link/bi/domain/entity/EcBaStoreDailyData.java
浏览文件 @ 653a94cf
......@@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.sfa.common.core.annotation.Excel;
import com.sfa.common.core.web.domain.BaseDo;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
......@@ -127,275 +125,4 @@ public class EcBaStoreDailyData extends BaseDo
/** 修改人UserID */
@Excel(name = "修改人UserID")
private Long updateUserId;
public void setEbtId(Long ebtId)
{
this.ebtId = ebtId;
}
public Long getEbtId()
{
return ebtId;
}
public void setYear(Long year)
{
this.year = year;
}
public Long getYear()
{
return year;
}
public void setMonth(Long month)
{
this.month = month;
}
public Long getMonth()
{
return month;
}
public void setDate(Date date)
{
this.date = date;
}
public Date getDate()
{
return date;
}
public void setPlatformId(Long platformId)
{
this.platformId = platformId;
}
public Long getPlatformId()
{
return platformId;
}
public void setPlatform(String platform)
{
this.platform = platform;
}
public String getPlatform()
{
return platform;
}
public void setDataPlatform(String dataPlatform)
{
this.dataPlatform = dataPlatform;
}
public String getDataPlatform()
{
return dataPlatform;
}
public void setStoreCode(String storeCode)
{
this.storeCode = storeCode;
}
public String getStoreCode()
{
return storeCode;
}
public void setStoreName(String storeName)
{
this.storeName = storeName;
}
public String getStoreName()
{
return storeName;
}
public void setGmv(BigDecimal gmv)
{
this.gmv = gmv;
}
public BigDecimal getGmv()
{
return gmv;
}
public void setNetGmv(BigDecimal netGmv)
{
this.netGmv = netGmv;
}
public BigDecimal getNetGmv()
{
return netGmv;
}
public void setRoi(BigDecimal roi)
{
this.roi = roi;
}
public BigDecimal getRoi()
{
return roi;
}
public void setPromotionCost(BigDecimal promotionCost)
{
this.promotionCost = promotionCost;
}
public BigDecimal getPromotionCost()
{
return promotionCost;
}
public void setPromotionCostExtra(BigDecimal promotionCostExtra)
{
this.promotionCostExtra = promotionCostExtra;
}
public BigDecimal getPromotionCostExtra()
{
return promotionCostExtra;
}
public void setPromotionOutput(BigDecimal promotionOutput)
{
this.promotionOutput = promotionOutput;
}
public BigDecimal getPromotionOutput()
{
return promotionOutput;
}
public void setPv(Long pv)
{
this.pv = pv;
}
public Long getPv()
{
return pv;
}
public void setUv(Long uv)
{
this.uv = uv;
}
public Long getUv()
{
return uv;
}
public void setTransactionsNum(Long transactionsNum)
{
this.transactionsNum = transactionsNum;
}
public Long getTransactionsNum()
{
return transactionsNum;
}
public void setCvr(BigDecimal cvr)
{
this.cvr = cvr;
}
public BigDecimal getCvr()
{
return cvr;
}
public void setRefundAmount(BigDecimal refundAmount)
{
this.refundAmount = refundAmount;
}
public BigDecimal getRefundAmount()
{
return refundAmount;
}
public void setRefundRate(BigDecimal refundRate)
{
this.refundRate = refundRate;
}
public BigDecimal getRefundRate()
{
return refundRate;
}
public void setAtv(BigDecimal atv)
{
this.atv = atv;
}
public BigDecimal getAtv()
{
return atv;
}
public void setBatchNo(String batchNo)
{
this.batchNo = batchNo;
}
public String getBatchNo()
{
return batchNo;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
public void setCreateUserId(Long createUserId)
{
this.createUserId = createUserId;
}
public Long getCreateUserId()
{
return createUserId;
}
public void setUpdateUserId(Long updateUserId)
{
this.updateUserId = updateUserId;
}
public Long getUpdateUserId()
{
return updateUserId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("ebtId", getEbtId())
.append("year", getYear())
.append("month", getMonth())
.append("date", getDate())
.append("platformId", getPlatformId())
.append("platform", getPlatform())
.append("dataPlatform", getDataPlatform())
.append("storeCode", getStoreCode())
.append("storeName", getStoreName())
.append("gmv", getGmv())
.append("netGmv", getNetGmv())
.append("roi", getRoi())
.append("promotionCost", getPromotionCost())
.append("promotionCostExtra", getPromotionCostExtra())
.append("promotionOutput", getPromotionOutput())
.append("pv", getPv())
.append("uv", getUv())
.append("transactionsNum", getTransactionsNum())
.append("cvr", getCvr())
.append("refundAmount", getRefundAmount())
.append("refundRate", getRefundRate())
.append("atv", getAtv())
.append("batchNo", getBatchNo())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createUserId", getCreateUserId())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateUserId", getUpdateUserId())
.append("updateTime", getUpdateTime())
.toString();
}
}
src/main/java/com/link/bi/domain/entity/OppoSycm.java
浏览文件 @ 653a94cf
......@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sfa.common.core.annotation.Excel;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import java.util.Date;
......@@ -175,163 +173,4 @@ public class OppoSycm implements Serializable {
*/
@TableField(exist = false)
private Long llzsPeakTotal;
public void setSycmId(Long sycmId) {
this.sycmId = sycmId;
}
public Long getSycmId() {
return sycmId;
}
public void setYear(Long year) {
this.year = year;
}
public Long getYear() {
return year;
}
public void setMonth(Long month) {
this.month = month;
}
public Long getMonth() {
return month;
}
public void setDate(Date date) {
this.date = date;
}
public Date getDate() {
return date;
}
public void setPlatformId(Long platformId) {
this.platformId = platformId;
}
public Long getPlatformId() {
return platformId;
}
public void setPlatform(String platform) {
this.platform = platform;
}
public String getPlatform() {
return platform;
}
public void setDataPlatform(String dataPlatform) {
this.dataPlatform = dataPlatform;
}
public String getDataPlatform() {
return dataPlatform;
}
public void setPlatformStore(String platformStore) {
this.platformStore = platformStore;
}
public String getPlatformStore() {
return platformStore;
}
public void setPrdName(String prdName) {
this.prdName = prdName;
}
public String getPrdName() {
return prdName;
}
public void setZfmjUnder(Long zfmjUnder) {
this.zfmjUnder = zfmjUnder;
}
public Long getZfmjUnder() {
return zfmjUnder;
}
public void setZfmjPeak(Long zfmjPeak) {
this.zfmjPeak = zfmjPeak;
}
public Long getZfmjPeak() {
return zfmjPeak;
}
public void setJyzsUnder(Long jyzsUnder) {
this.jyzsUnder = jyzsUnder;
}
public Long getJyzsUnder() {
return jyzsUnder;
}
public void setJyzsPeak(Long jyzsPeak) {
this.jyzsPeak = jyzsPeak;
}
public Long getJyzsPeak() {
return jyzsPeak;
}
public void setUvUnder(Long uvUnder) {
this.uvUnder = uvUnder;
}
public Long getUvUnder() {
return uvUnder;
}
public void setUvPeak(Long uvPeak) {
this.uvPeak = uvPeak;
}
public Long getUvPeak() {
return uvPeak;
}
public void setLlzsUnder(Long llzsUnder) {
this.llzsUnder = llzsUnder;
}
public Long getLlzsUnder() {
return llzsUnder;
}
public void setLlzsPeak(Long llzsPeak) {
this.llzsPeak = llzsPeak;
}
public Long getLlzsPeak() {
return llzsPeak;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("sycmId", getSycmId())
.append("year", getYear())
.append("month", getMonth())
.append("date", getDate())
.append("platformId", getPlatformId())
.append("platform", getPlatform())
.append("dataPlatform", getDataPlatform())
.append("platformStore", getPlatformStore())
.append("prdName", getPrdName())
.append("zfmjUnder", getZfmjUnder())
.append("zfmjPeak", getZfmjPeak())
.append("jyzsUnder", getJyzsUnder())
.append("jyzsPeak", getJyzsPeak())
.append("uvUnder", getUvUnder())
.append("uvPeak", getUvPeak())
.append("llzsUnder", getLlzsUnder())
.append("llzsPeak", getLlzsPeak())
.toString();
}
}
src/main/java/com/link/bi/pojo/request/OppoCmmDto.java → src/main/java/com/link/bi/pojo/request/OppoCmmVo.java
浏览文件 @ 653a94cf
......@@ -5,12 +5,9 @@ import lombok.Data;
import java.util.Date;
@Data
public class OppoCmmDto {
public class OppoCmmVo {
// 入参 时间开始时间
private Date startDate;
// 入参 时间结束时间
private Date endDate;
}
src/main/java/com/link/bi/pojo/request/OppoSycmDto.java → src/main/java/com/link/bi/pojo/request/OppoSycmVo.java
浏览文件 @ 653a94cf
......@@ -5,12 +5,9 @@ import lombok.Data;
import java.util.Date;
@Data
public class OppoSycmDto {
public class OppoSycmVo {
// 入参 时间开始时间
private Date startDate;
// 入参 时间结束时间
private Date endDate;
}
src/main/java/com/link/bi/pojo/response/OppoCmmVO.java → src/main/java/com/link/bi/pojo/response/OppoCmmDto.java
浏览文件 @ 653a94cf
......@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2022/12/20 10:18
*/
@Data
public class OppoCmmVO {
public class OppoCmmDto {
// 日期
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
......@@ -19,8 +19,6 @@ public class OppoCmmVO {
// 店铺名
private String name;
// 直播场次
// private String zbcc;
// 销售额
private BigDecimal saleSumTotal;
// 观看人次
......
src/main/java/com/link/bi/pojo/response/OppoSycmVO.java → src/main/java/com/link/bi/pojo/response/OppoSycmDto.java
浏览文件 @ 653a94cf
......@@ -10,12 +10,11 @@ import java.util.Date;
* @date 2022/12/20 10:18
*/
@Data
public class OppoSycmVO {
public class OppoSycmDto {
// 日期
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
* 平台店铺
*/
......
src/main/java/com/link/bi/service/IEcGoodsSupplyDemandService.java
浏览文件 @ 653a94cf
......@@ -4,8 +4,6 @@ package com.link.bi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.link.bi.domain.entity.EcGoodsSupplyDemand;
import com.link.bi.domain.wq.MarketDetailWq;
import com.link.bi.pojo.request.EcStoreVo;
import com.sfa.common.core.web.domain.PageInfo;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
......@@ -27,6 +25,4 @@ public interface IEcGoodsSupplyDemandService extends IService<EcGoodsSupplyDeman
void deleteByYear(Integer year);
Map<String, Map<String, String>> getSupplyDemandYearAndMonth(MarketDetailWq mqw);
PageInfo selectPage(EcStoreVo ecStoreVo);
}
src/main/java/com/link/bi/service/IOppoCmmService.java
浏览文件 @ 653a94cf
package com.link.bi.service;
import com.link.bi.pojo.request.OppoCmmDto;
import com.link.bi.pojo.response.OppoCmmVO;
import com.link.bi.pojo.request.OppoCmmVo;
import com.link.bi.pojo.response.OppoCmmDto;
import java.util.List;
......@@ -13,5 +13,5 @@ import java.util.List;
*/
public interface IOppoCmmService {
List<List<OppoCmmVO>> selectOppoCmmZbjBiList(OppoCmmDto oppoCmmDto);
List<List<OppoCmmDto>> selectOppoCmmZbjBiList(OppoCmmVo oppoCmmDto);
}
src/main/java/com/link/bi/service/IOppoSycmService.java
浏览文件 @ 653a94cf
package com.link.bi.service;
import com.link.bi.pojo.request.OppoSycmDto;
import com.link.bi.pojo.response.OppoSycmVO;
import com.link.bi.pojo.request.OppoSycmVo;
import com.link.bi.pojo.response.OppoSycmDto;
import java.util.List;
......@@ -12,5 +12,5 @@ import java.util.List;
* @date 2024-12-20
*/
public interface IOppoSycmService {
List<List<OppoSycmVO>> selectOppoSycmStoreBi(OppoSycmDto oppoSycmDto);
List<List<OppoSycmDto>> selectOppoSycmStoreBi(OppoSycmVo oppoSycmVo);
}
src/main/java/com/link/bi/service/impl/EcGoodsSupplyDemandServiceImpl.java
浏览文件 @ 653a94cf
......@@ -9,11 +9,9 @@ import com.link.bi.domain.dao.IEcGoodsSupplyDemandDao;
import com.link.bi.domain.entity.EcGoodsSupplyDemand;
import com.link.bi.domain.mapper.EcGoodsSupplyDemandMapper;
import com.link.bi.domain.wq.MarketDetailWq;
import com.link.bi.pojo.request.EcStoreVo;
import com.link.bi.pojo.response.PrdInfoDto;
import com.link.bi.service.IEcGoodsSupplyDemandService;
import com.link.bi.service.IProductService;
import com.sfa.common.core.web.domain.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -112,11 +110,4 @@ public class EcGoodsSupplyDemandServiceImpl extends ServiceImpl<EcGoodsSupplyDem
return demandDao.getSupplyDemandYearAndMonth(mqw);
}
@Override
public PageInfo selectPage(EcStoreVo ecStoreVo) {
return null;
}
}
src/main/java/com/link/bi/service/impl/OppoCmmServiceImpl.java
浏览文件 @ 653a94cf
......@@ -3,8 +3,8 @@ package com.link.bi.service.impl;
import com.link.bi.domain.dao.IOppoCmmDao;
import com.link.bi.domain.entity.OppoCmm;
import com.link.bi.domain.wq.OppoCmmWq;
import com.link.bi.pojo.request.OppoCmmDto;
import com.link.bi.pojo.response.OppoCmmVO;
import com.link.bi.pojo.request.OppoCmmVo;
import com.link.bi.pojo.response.OppoCmmDto;
import com.link.bi.service.IOppoCmmService;
import com.sfa.common.core.utils.DateUtils;
import org.springframework.beans.BeanUtils;
......@@ -26,7 +26,7 @@ public class OppoCmmServiceImpl implements IOppoCmmService {
IOppoCmmDao oppoCmmDao;
@Override
public List<List<OppoCmmVO>> selectOppoCmmZbjBiList(OppoCmmDto oppoCmmDto) {
public List<List<OppoCmmDto>> selectOppoCmmZbjBiList(OppoCmmVo oppoCmmDto) {
// 设置默认入参时间，倒数30天
// Optional判断入参为空设置默认值
Date startDate = Optional.ofNullable(oppoCmmDto.getStartDate())
......@@ -40,16 +40,15 @@ public class OppoCmmServiceImpl implements IOppoCmmService {
BeanUtils.copyProperties(oppoCmmDto, wq);
List<OppoCmm> oppoCmms = oppoCmmDao.selectList(wq);
List<List<OppoCmmVO>> vos = new ArrayList<>();
List<List<OppoCmmDto>> vos = new ArrayList<>();
// 按照name分成不同的list
Map<String, List<OppoCmm>> map = oppoCmms.stream()
.collect(Collectors.groupingBy(OppoCmm::getName));
map.forEach((name, objects) -> {
System.out.println("Name: " + name);
List<OppoCmmVO> oppoCmmVOS = new ArrayList<>();
List<OppoCmmDto> oppoCmmVOS = new ArrayList<>();
objects.forEach(obj -> {
OppoCmmVO vo = new OppoCmmVO();
OppoCmmDto vo = new OppoCmmDto();
BeanUtils.copyProperties(obj, vo);
vo.setSaleSumTotal(vo.getSaleSumTotal().setScale(2));
oppoCmmVOS.add(vo);
......
src/main/java/com/link/bi/service/impl/OppoSycmServiceImpl.java
浏览文件 @ 653a94cf
......@@ -3,8 +3,8 @@ package com.link.bi.service.impl;
import com.link.bi.domain.dao.IOppoSycmDao;
import com.link.bi.domain.entity.OppoSycm;
import com.link.bi.domain.wq.OppoSycmWq;
import com.link.bi.pojo.request.OppoSycmDto;
import com.link.bi.pojo.response.OppoSycmVO;
import com.link.bi.pojo.request.OppoSycmVo;
import com.link.bi.pojo.response.OppoSycmDto;
import com.link.bi.service.IOppoSycmService;
import com.sfa.common.core.utils.DateUtils;
import org.springframework.beans.BeanUtils;
......@@ -27,31 +27,30 @@ public class OppoSycmServiceImpl implements IOppoSycmService
@Autowired
IOppoSycmDao sycmDao;
@Override
public List<List<OppoSycmVO>> selectOppoSycmStoreBi(OppoSycmDto oppoSycmDto) {
public List<List<OppoSycmDto>> selectOppoSycmStoreBi(OppoSycmVo sycmVo) {
// 设置默认入参时间，倒数30天
// Optional判断入参为空设置默认值
Date startDate = Optional.ofNullable(oppoSycmDto.getStartDate())
Date startDate = Optional.ofNullable(sycmVo.getStartDate())
.orElse(DateUtils.addDays(DateUtils.dateStart(new Date()), -31));
Date endDate = Optional.ofNullable(oppoSycmDto.getEndDate()).orElse(
Date endDate = Optional.ofNullable(sycmVo.getEndDate()).orElse(
DateUtils.addDays(DateUtils.dateStart(new Date()), -1));
oppoSycmDto.setStartDate(startDate);
oppoSycmDto.setEndDate(endDate);
sycmVo.setStartDate(startDate);
sycmVo.setEndDate(endDate);
OppoSycmWq wq = new OppoSycmWq();
BeanUtils.copyProperties(oppoSycmDto, wq);
BeanUtils.copyProperties(sycmVo, wq);
List<OppoSycm> oppoSycms = sycmDao.selectList(wq);
List<List<OppoSycmVO>> lists = new ArrayList<>();
List<List<OppoSycmDto>> lists = new ArrayList<>();
// 按照name分成不同的list
Map<String, List<OppoSycm>> map = oppoSycms.stream()
.collect(Collectors.groupingBy(OppoSycm::getPlatformStore));
map.forEach((name, objects) -> {
// System.out.println("Name: " + name);
List<OppoSycmVO> oppoCmmVOS = new ArrayList<>();
List<OppoSycmDto> oppoCmmVOS = new ArrayList<>();
objects.forEach(obj -> {
OppoSycmVO vo = new OppoSycmVO();
OppoSycmDto vo = new OppoSycmDto();
BeanUtils.copyProperties(obj, vo);
oppoCmmVOS.add(vo);
});
......
src/main/java/com/link/bi/service/impl/SummaryMarketDailyDetailImpl.java
浏览文件 @ 653a94cf
package com.link.bi.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.link.bi.domain.dao.IEcMarketDailyDetailDao;
import com.link.bi.domain.wq.MarketDetailWq;
import com.link.bi.pojo.request.MarketSummaryVo;
......@@ -31,6 +32,7 @@ public class SummaryMarketDailyDetailImpl implements ISummaryMarketDailyDetailSe
RedisService redisService;
@Autowired
IEcGoodsSupplyDemandService supplyDemandService;
@Override
public Map marketSummary(MarketSummaryVo summaryVo) {
MarketDetailWq mqw = new MarketDetailWq();
......@@ -38,7 +40,7 @@ public class SummaryMarketDailyDetailImpl implements ISummaryMarketDailyDetailSe
Date date = mqw.getDate();
mqw.setYear(DateUtil.year(date));
mqw.setMonth(DateUtil.month(date) + 1);
mqw.setFirstDay7(DateUtil.offsetDay(date,-7));
mqw.setFirstDay7(DateUtil.offsetDay(date, -7));
List<MarketSummaryDto> marketSummaryDtos = ecMarketDailyDetailDao.summaryByPlatform(mqw);
List<MarketSummaryDto> chartDtos = ecMarketDailyDetailDao.chartByPlatform(mqw);
......@@ -53,8 +55,8 @@ public class SummaryMarketDailyDetailImpl implements ISummaryMarketDailyDetailSe
// 获取平台-年度和月度的货需数据：
Map<String, Map<String, String>> supplyDemandYearAndMonthMap = supplyDemandService.getSupplyDemandYearAndMonth(mqw);
for (MarketSummaryDto mDto : marketSummaryDtos) {
mDto.setGoodsSupplyDemandCountY(onlyPlatform ? new BigDecimal(supplyDemandYearAndMonthMap.get("year").get(String.valueOf(mDto.getPlatformId()))) : BigDecimal.ZERO);
mDto.setGoodsSupplyDemandCountM(onlyPlatform ? new BigDecimal(supplyDemandYearAndMonthMap.get("month").get(String.valueOf(mDto.getPlatformId()))) : BigDecimal.ZERO);
mDto.setGoodsSupplyDemandCountY(ObjectUtil.isEmpty(supplyDemandYearAndMonthMap.get("year").get(String.valueOf(mDto.getPlatformId()))) ? BigDecimal.ZERO : new BigDecimal(supplyDemandYearAndMonthMap.get("year").get(String.valueOf(mDto.getPlatformId()))));
mDto.setGoodsSupplyDemandCountM(ObjectUtil.isEmpty(supplyDemandYearAndMonthMap.get("month").get(String.valueOf(mDto.getPlatformId()))) ? BigDecimal.ZERO : new BigDecimal(supplyDemandYearAndMonthMap.get("month").get(String.valueOf(mDto.getPlatformId()))));
}
for (Map.Entry<String, String> entry : tMap.entrySet()) {
......@@ -68,8 +70,8 @@ public class SummaryMarketDailyDetailImpl implements ISummaryMarketDailyDetailSe
Map<Integer, List<MarketSummaryDto>> chart = chartDtos.stream().collect(Collectors.groupingBy(MarketSummaryDto::getPlatformId));
HashMap<String, Object> result = new HashMap<>();
result.put("table",table);
result.put("chart",chart);
result.put("table", table);
result.put("chart", chart);
return result;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论