From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index d3609e3..50bb40f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -2,32 +2,23 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListPagerRequest;
-import com.doumee.core.tms.model.request.TmsOrderListParamRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBasePageResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
-import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.response.TmsBasePageResponse;
+import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
+import com.doumee.service.business.third.model.response.TmsOrderNoFinishListResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.TmsService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
@@ -47,13 +38,23 @@
@Autowired
private BoardService boardService;
@LoginNoRequired
- @ApiOperation("涓績鏁版嵁")
+ @ApiOperation("涓績鏁版嵁锛堝簾寮冿級")
@GetMapping("/centerData")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam String factoryCode) {
+ public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam(required = false) String factoryCode) {
WholeProvinceBoardVO data = boardService.centerProvinceData( factoryCode);
+ return ApiResponse.success(data);
+ }
+ @LoginNoRequired
+ @ApiOperation("涓績鏁版嵁锛堟洿鏂扮増鏈級")
+ @GetMapping("/centerDataNew")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<WholeProvinceBoardVO> centerDataNew(@RequestParam(required = false) String factoryCode) {
+ WholeProvinceBoardVO data = boardService.centerProvinceDataNew( factoryCode);
return ApiResponse.success(data);
}
@@ -64,7 +65,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<LastSevenDaysOrderVo>> arriveGoodsList(@RequestParam String factoryCode) {
+ public ApiResponse<List<LastSevenDaysOrderVo>> arriveGoodsList(@RequestParam(required = false) String factoryCode) {
List<LastSevenDaysOrderVo> list = boardService.arriveGoodsList(factoryCode);
return ApiResponse.success(list);
}
@@ -77,7 +78,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷 0鏈湀 1鏈懆 2鏈勾", required = false),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum(@RequestParam Integer type,@RequestParam String factoryCode) {
+ public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum(@RequestParam Integer type,@RequestParam(required = false) String factoryCode) {
TotalOutQtyNumVO result = boardService.totalOutQtyNum(type,factoryCode);
return ApiResponse.success(result);
@@ -100,6 +101,7 @@
WholeProvinceZXTVO list = boardService.inventoryUseRate();
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("杩愬姏璧勬簮鍒╃敤鐜�")
@GetMapping("/tranportAbilityUseRate")
@@ -120,7 +122,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam String factoryCode) {
+ public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam(required = false) String factoryCode) {
List<WholeProvinceMapVO> list = boardService.mapYearAndMonthOutList(factoryCode);
return ApiResponse.success(list);
}
@@ -128,12 +130,12 @@
@ApiOperation("璁㈠崟浠诲姟鍚堝悓鍒楄〃鎺ュ彛")
@LoginNoRequired
- @GetMapping("/orderList")
+ @PostMapping("/orderList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestParam String factoryCode) {
- List<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(factoryCode);
+ public ApiResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestBody TmsOrderNoFinishListRequest param ) {
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(param);
return ApiResponse.success(list);
}
@ApiOperation("鍚堝悓璇︽儏鎺ュ彛")
--
Gitblit v1.9.3