qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 数据结构

Browse Source
This commit is contained in:
huahua
2024-07-24 14:15:44 +08:00
parent 4f16e3ff24
commit 4ee0ca0d1b
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantBusinessAnalysisController.java
View File

@@ -2,6 +2,7 @@ package com.zbkj.admin.controller.merchant;
import com.zbkj.admin.service.HomeService;
import com.zbkj.common.model.admin.SystemAdmin;
import com.zbkj.common.model.business.BusinessAnalysis;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.response.BusinessAnalysisResponse;
import com.zbkj.common.result.CommonResult;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.LinkedHashMap;
@Slf4j
@RestController
@RequestMapping("api/admin/merchant/business/analysis")
@@ -36,10 +39,9 @@ public class MerchantBusinessAnalysisController {
@PreAuthorize("hasAuthority('merchant:business:analysis:line:chart')")
@ApiOperation(value = "按月统计")
@RequestMapping(value = "/line/chart", method = RequestMethod.POST)
public CommonResult<BusinessAnalysisResponse> lineChart(@RequestBody() BusinessAnalysisRequest request) {
public CommonResult<LinkedHashMap<String, BusinessAnalysis>> lineChart(@RequestBody() BusinessAnalysisRequest request) {
SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
request.setMerId(systemAdmin.getMerId());
BusinessAnalysisResponse lineChart = homeService.getLineChart(request);
return CommonResult.success(lineChart);
return CommonResult.success(homeService.getLineChart(request));
}
}

10
lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformBusinessAnalysisController.java
View File

@@ -1,11 +1,10 @@
package com.zbkj.admin.controller.platform;
import com.zbkj.admin.service.HomeService;
import com.zbkj.common.model.admin.SystemAdmin;
import com.zbkj.common.model.business.BusinessAnalysis;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.response.BusinessAnalysisResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.SecurityUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.LinkedHashMap;
@Slf4j
@RestController
@RequestMapping("api/admin/platform/business/analysis")
@@ -37,11 +38,10 @@ public class PlatformBusinessAnalysisController {
@PreAuthorize("hasAuthority('platform:business:analysis:line:chart')")
@ApiOperation(value = "按月统计")
@RequestMapping(value = "/line/chart", method = RequestMethod.POST)
public CommonResult<BusinessAnalysisResponse> lineChart(@RequestBody() BusinessAnalysisRequest request) {
public CommonResult<LinkedHashMap<String, BusinessAnalysis>> lineChart(@RequestBody() BusinessAnalysisRequest request) {
if (request.getMerId() == null) {
request.setMerId(0);
}
BusinessAnalysisResponse lineChart = homeService.getLineChart(request);
return CommonResult.success(lineChart);
return CommonResult.success(homeService.getLineChart(request));
}
}

4
lxk-admin/src/main/java/com/zbkj/admin/service/HomeService.java
View File

@@ -3,8 +3,8 @@ package com.zbkj.admin.service;
import com.zbkj.common.model.business.BusinessAnalysis;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.response.*;
import com.zbkj.common.vo.MyRecord;
import java.util.LinkedHashMap;
import java.util.List;
/**
@@ -68,5 +68,5 @@ public interface HomeService {
BusinessAnalysisResponse getBusiness(BusinessAnalysisRequest request);
BusinessAnalysisResponse getLineChart(BusinessAnalysisRequest request);
LinkedHashMap<String, BusinessAnalysis> getLineChart(BusinessAnalysisRequest request);
}

10
lxk-admin/src/main/java/com/zbkj/admin/service/impl/HomeServiceImpl.java
View File

@@ -20,7 +20,6 @@ import com.zbkj.common.model.user.User;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.request.ProductRankingRequest;
import com.zbkj.common.response.*;
import com.zbkj.common.utils.LxkDateUtil;
import com.zbkj.common.utils.SecurityUtil;
import com.zbkj.common.vo.BusinessAnalysisVo;
import com.zbkj.service.service.*;
@@ -32,7 +31,6 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.TreeMap;
import java.util.stream.Collectors;
/**
@@ -207,9 +205,9 @@ public class HomeServiceImpl implements HomeService {
}
@Override
public BusinessAnalysisResponse getLineChart(BusinessAnalysisRequest request) {
public LinkedHashMap<String, BusinessAnalysis> getLineChart(BusinessAnalysisRequest request) {
QueryWrapper<BusinessAnalysis> qw = new QueryWrapper<>();
qw.select("DATE_FORMAT(date_sn, '%m') AS date_key,IFNULL(SUM(total_turnover),0) as total_turnover,IFNULL(SUM(costs),0) as costs,IFNULL(SUM(profit),0) as profit");
qw.select("date_sn,DATE_FORMAT(date_sn, '%m') AS date_key,IFNULL(SUM(total_turnover),0) as total_turnover,IFNULL(SUM(costs),0) as costs,IFNULL(SUM(profit),0) as profit,mer_id");
qw.between("date_sn", DateUtil.beginOfYear(new Date()), DateUtil.endOfYear(new Date()));
if (request.getMerId() != null) {
qw.eq("mer_id", request.getMerId());
@@ -240,9 +238,7 @@ public class HomeServiceImpl implements HomeService {
map.put(i + "", analysis);
}
}
BusinessAnalysisResponse response = new BusinessAnalysisResponse();
response.setAnalysisMap(map);
return response;
return map;
}
public BrokenLineResponse boardInfo(String dateLat, Integer merId) {