From b8e554b2db1933319eedc2a1b9e6a013dce6e299 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 18:05:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 110 +++++++++++++++----------------------------------------
1 files changed, 30 insertions(+), 80 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 082627d..e307abf 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
@@ -3,13 +3,11 @@
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.request.*;
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.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.TmsFactoryParam;
@@ -48,26 +46,11 @@
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
- public ApiResponse<WholeProvinceBoardVO> centerData() {
- WholeProvinceBoardVO data = new WholeProvinceBoardVO();
- Random random = new Random();
-
- data.setYearOutTotal(BigDecimal.valueOf(random.nextInt(200)));
- data.setYearOutTotalOnYear(BigDecimal.valueOf(random.nextInt(10)));
- data.setYearOutTimes(random.nextInt(200));
- data.setYearProvinceRata(BigDecimal.valueOf(random.nextInt(100)).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP));
-
- data.setYearInPlanTotal(BigDecimal.valueOf(random.nextInt(200)));
- data.setYearInTotal(BigDecimal.valueOf(random.nextInt(data.getYearInPlanTotal().intValue())));
- data.setYearInTotalOnYear(BigDecimal.valueOf(random.nextInt(10)));
- data.setYearInTimes(random.nextInt(200));
-
- data.setOutPlanTotal(BigDecimal.valueOf(random.nextInt(200)));
- data.setOutPlanTimes(random.nextInt(200));
- data.setOutTotal(BigDecimal.valueOf(random.nextInt(data.getOutPlanTotal().intValue())));
- data.setOutTimes(random.nextInt(data.getOutPlanTimes()));
- data.setOutRata(BigDecimal.valueOf(random.nextInt(100)));
-
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam(required = false) String factoryCode) {
+ WholeProvinceBoardVO data = boardService.centerProvinceData( factoryCode);
return ApiResponse.success(data);
}
@@ -75,43 +58,24 @@
@LoginNoRequired
@ApiOperation("杩戜竷鏃ュ埌璐ф儏鍐�")
@GetMapping("/arriveGoodsList")
- public ApiResponse<List<ArriveGoodsVO>> arriveGoodsList() {
- List<ArriveGoodsVO> list = new ArrayList<>();
- Random random = new Random();
- List<String> dayList = DateUtil.getBeforDays(new Date(),7);
- for (String str:dayList) {
- ArriveGoodsVO data = new ArriveGoodsVO();
- data.setDateStr(str);
- data.setArriveNum(new BigDecimal(random.nextInt(1000)));
- data.setInTransitNum(new BigDecimal(random.nextInt(1000)));
- list.add(data);
-
- }
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<List<LastSevenDaysOrderVo>> arriveGoodsList(@RequestParam(required = false) String factoryCode) {
+ List<LastSevenDaysOrderVo> list = boardService.arriveGoodsList(factoryCode);
return ApiResponse.success(list);
}
- @LoginNoRequired
- @ApiOperation("褰撳墠杩愯緭浠诲姟")
- @GetMapping("/transportTaskList")
- public ApiResponse<List<TransportTaskVO>> transportTaskList() {
- List<TransportTaskVO> list = new ArrayList<>();
- Random random = new Random();
- for (int i = 1; i < 11; i++) {
- TransportTaskVO data = new TransportTaskVO();
- data.setCarNo("鐨朅8" + random.nextInt(9) + random.nextInt(9) + random.nextInt(9) + random.nextInt(9));
- data.setStatusStr("鍒拌揪鍗歌揣鍦�");
- data.setAddress("瀹夊窘鍚堣偉");
- data.setTaskDate(new Date());
- list.add(data);
- }
- return ApiResponse.success(list);
- }
@LoginNoRequired
@ApiOperation("璁㈠崟鍦ㄩ�旇窡韪�-绱鍑哄簱閲�")
@GetMapping("/totalOutQtyNum")
- public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum() {
- TotalOutQtyNumVO result = boardService.totalOutQtyNum();
+ @ApiImplicitParams({
+ @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(required = false) String factoryCode) {
+ TotalOutQtyNumVO result = boardService.totalOutQtyNum(type,factoryCode);
return ApiResponse.success(result);
}
@@ -133,6 +97,7 @@
WholeProvinceZXTVO list = boardService.inventoryUseRate();
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("杩愬姏璧勬簮鍒╃敤鐜�")
@GetMapping("/tranportAbilityUseRate")
@@ -150,8 +115,11 @@
@LoginNoRequired
@ApiOperation("鍦板浘鏈湀鏈勾鎬诲嚭搴撻噺缁熻闆嗗悎锛堟寜鐪佷唤锛�")
@GetMapping("/mapYearAndMonthOutList")
- public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( ) {
- List<WholeProvinceMapVO> list = boardService.mapYearAndMonthOutList();
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam(required = false) String factoryCode) {
+ List<WholeProvinceMapVO> list = boardService.mapYearAndMonthOutList(factoryCode);
return ApiResponse.success(list);
}
@@ -159,35 +127,17 @@
@ApiOperation("璁㈠崟浠诲姟鍚堝悓鍒楄〃鎺ュ彛")
@LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param ) {
- if(param == null){
- param = new TmsOrderListRequest();
- }
- if(param.getParameters() == null){
- param.setParameters( new TmsOrderListParamRequest());
- }
- if(param.getPager() == null){
- param.setPager( new TmsOrderListPagerRequest());
- }
- if(param.getPager().getPage() == null){
- param.getPager().setPage(1);
- }
- if(param.getPager().getRows() == null){
- param.getPager().setRows(10);
- }
- if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
- param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
- }
- if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
- param.getParameters().setContractNumbers(null);
- }
- return ApiResponse.success(tmsService.orderList(param));
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestBody TmsOrderNoFinishListRequest param ) {
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(param);
+ return ApiResponse.success(list);
}
@ApiOperation("鍚堝悓璇︽儏鎺ュ彛")
@LoginNoRequired
@PostMapping("/orderInfo")
public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
-
return ApiResponse.success(tmsService.orderInfo(request));
}
--
Gitblit v1.9.3