Merge remote-tracking branch 'origin/dev' into dev

blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java

@@ -33,7 +33,9 @@ import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
 import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
@@ -61,6 +63,10 @@ public class AuthFilter implements GlobalFilter, Ordered {
 	public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 		//校验 Token 放行
 		String originalRequestUrl = RequestProvider.getOriginalRequestUrl(exchange);
+//		ServerHttpRequest request = exchange.getRequest();
+
+//		HttpHeaders headers = request.getHeaders();
+//		headers.add("hwy_req","1");
 		String path = exchange.getRequest().getURI().getPath();
 		if (isSkip(path) || isSkip(originalRequestUrl)) {
 			return chain.filter(exchange);
@@ -88,6 +94,8 @@ public class AuthFilter implements GlobalFilter, Ordered {
 				return unAuth(resp, "令牌已失效");
 			}
 		}
+
+
 		return chain.filter(exchange);
 	}
 

blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java

@@ -40,6 +40,7 @@ public class RequestFilter implements GlobalFilter, Ordered {
 		// 1. 清洗请求头中from 参数
 		ServerHttpRequest request = exchange.getRequest().mutate()
 			.headers(httpHeaders -> httpHeaders.remove("X"))
+			.headers(httpHeaders -> httpHeaders.add("hwy-req","1"))
 			.build();
 
 		// 2. 重写StripPrefix

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java

@@ -2,19 +2,20 @@ package com.logpm.distribution.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.logpm.distribution.dto.splitOrder.DistributionSplitAllTaskSearchDTO;
+import com.logpm.distribution.dto.splitOrder.*;
-import com.logpm.distribution.dto.splitOrder.DistributionSplitTaskSearchDTO;
 import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity;
 import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity;
 import com.logpm.distribution.service.IDistributionSplitOrderTaskService;
 import com.logpm.distribution.vo.SplitPackageOrderVO;
 import lombok.AllArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @AllArgsConstructor
@@ -24,13 +25,8 @@ public class DistributionSplitOrderTaskController {
 
 
 	@PostMapping("/add-package-code")
-	public R<String> addPackageCode(@RequestBody Map mao) {
+	public R<String> addPackageCode(@RequestBody AddPackageCodeDTO addPackageCodeDTO) {
-
+		return distributionSplitOrderTaskService.addPackageCode(addPackageCodeDTO.getTaskId(), addPackageCodeDTO.getPackageCodes());
-		String taskId = (String) mao.get("taskId");
-		List<String> packageCodes = (List<String>) mao.get("packageCodes");
-
-
-		return distributionSplitOrderTaskService.addPackageCode(Long.parseLong(taskId), packageCodes);
 	}
 
 	@GetMapping("/all-task-list")
@@ -39,81 +35,92 @@ public class DistributionSplitOrderTaskController {
 	}
 
 	@PostMapping("/batch-create-task")
-	public R<String> batchCreateTask(@RequestBody List<DistributionSplitOrderTaskEntity> distributionSplitOrderTaskList) {
+	public R<String> batchCreateTask(@RequestBody ArrayList<DistributionSplitOrderTaskEntity> distributionSplitOrderTaskList) {
 		return distributionSplitOrderTaskService.batchCreateTask(distributionSplitOrderTaskList);
 	}
 
 	@PostMapping("/add-task")
-	public R<String> addTask(Long allTaskId, List<DistributionSplitOrderTaskEntity> task) {
+	public R<String> addTask(@RequestBody AddTaskDTO addTaskDTO) {
-		return distributionSplitOrderTaskService.addTask(allTaskId, task);
+		return distributionSplitOrderTaskService.addTask(addTaskDTO.getAllTaskId(), addTaskDTO.getTask());
 	}
 
 	@PostMapping("/cancel-all-task")
-	public R<String> cancelAllTask(Long allTaskId) {
+	public R<String> cancelAllTask(@RequestBody TaskId allTaskId) {
-		return distributionSplitOrderTaskService.cancelAllTask(allTaskId);
+		return distributionSplitOrderTaskService.cancelAllTask(allTaskId.getAllTaskId());
 	}
 
-	@RequestMapping("/cancel-package-code")
+	@PostMapping("/cancel-package-code")
-	public R<String> cancelPackageCode(Long taskId, List<String> packageCodes) {
+	public R<String> cancelPackageCode(@RequestBody CancelPackageCodeDTO cancelPackageCodeDTO) {
-		return distributionSplitOrderTaskService.cancelPackageCode(taskId, packageCodes);
+		return distributionSplitOrderTaskService.cancelPackageCode(cancelPackageCodeDTO.getTaskId(), cancelPackageCodeDTO.getPackageCodes());
 	}
 
-	@RequestMapping("/cancel-task")
+	@PostMapping("/cancel-task")
-	public R<String> cancelTask(Long taskId) {
+	public R<String> cancelTask(@RequestBody TaskId taskId) {
-		return distributionSplitOrderTaskService.cancelTask(taskId);
+		return distributionSplitOrderTaskService.cancelTask(taskId.getTaskId());
 	}
 
+	/**
+	 * 用不着
+	 * @param distributionSplitOrderTaskEntity
+	 * @param packageCodeList
+	 * @return
+	 */
 	@RequestMapping("/create-task")
-	public R<String> createTask(DistributionSplitOrderTaskEntity distributionSplitOrderTaskEntity, List<String> packageCodeList) {
+	public R<String> createTask(DistributionSplitOrderTaskEntity distributionSplitOrderTaskEntity, ArrayList<String> packageCodeList) {
 		return distributionSplitOrderTaskService.createTask(distributionSplitOrderTaskEntity, packageCodeList);
 	}
 
-	@RequestMapping("/delete-all-task")
+	@PostMapping("/delete-all-task")
-	public R<String> deleteAllTask(Long allTaskId) {
+	public R<String> deleteAllTask(@RequestBody TaskId allTaskId) {
-		return distributionSplitOrderTaskService.deleteAllTask(allTaskId);
+		return distributionSplitOrderTaskService.deleteAllTask(allTaskId.getAllTaskId());
 	}
 
-	@RequestMapping("/delete-task")
+	@PostMapping("/delete-task")
-	public R<String> deleteTask(Long taskId) {
+	public R<String> deleteTask(@RequestBody TaskId taskId) {
-		return distributionSplitOrderTaskService.deleteTask(taskId);
+		return distributionSplitOrderTaskService.deleteTask(taskId.getTaskId());
 	}
 
-	@RequestMapping("/finish-all-task")
+	@PostMapping("/finish-all-task")
-	public R<String> finishAllTask(Long allTaskId) {
+	public R<String> finishAllTask(@RequestBody TaskId  allTaskId) {
-		return distributionSplitOrderTaskService.finishAllTask(allTaskId);
+		return distributionSplitOrderTaskService.finishAllTask(allTaskId.getAllTaskId());
 	}
 
-	@RequestMapping("/finish-task")
+	@PostMapping("/finish-task")
-	public R<String> finishTask(Long taskId) {
+	public R<String> finishTask(@RequestBody TaskId taskId) {
-		return distributionSplitOrderTaskService.finishTask(taskId);
+		return distributionSplitOrderTaskService.finishTask(taskId.getTaskId());
 	}
 
-	@RequestMapping("/get-task-detail")
+	@GetMapping("/get-task-detail")
 	public R<Object> getTaskDetail(Long taskId) {
 		return distributionSplitOrderTaskService.getTaskDetail(taskId);
 	}
 
-	@RequestMapping("/task-list")
+	@GetMapping("/task-list")
 	public R<IPage<DistributionSplitOrderTaskEntity>> taskList(Query query, DistributionSplitTaskSearchDTO distributionSplitTaskSearchDTO) {
 		return distributionSplitOrderTaskService.taskList(query, distributionSplitTaskSearchDTO);
 	}
 
-	@RequestMapping("/update-task")
+	@PostMapping("/update-task")
-	public R<String> updateTask(DistributionSplitOrderTaskEntity distributionSplitOrderTaskEntity) {
+	public R<String> updateTask(@RequestBody DistributionSplitOrderTaskEntity distributionSplitOrderTaskEntity) {
 		return distributionSplitOrderTaskService.updateTask(distributionSplitOrderTaskEntity);
 	}
 
-	@RequestMapping("/check-order-code")
+	/**
+	 * 检查是否已经被拆单
+	 * @param orderCode
+	 * @return
+	 */
+	@GetMapping("/check-order-code")
 	public R<String> checkOrderCode(String orderCode) {
 		return distributionSplitOrderTaskService.checkOrderCode(orderCode);
 	}
 
-	@RequestMapping("/get-package-code-by-order-code")
+	@GetMapping("/get-package-code-by-order-code")
 	public R<IPage<SplitPackageOrderVO>> getPackageCodeByOrderCode(Query query, String orderCode) {
 		return distributionSplitOrderTaskService.getPackageCodeByOrderCode(query, orderCode);
 	}
 
-	@RequestMapping("/get-package-code-by-task-id")
+	@GetMapping("/get-package-code-by-task-id")
 	public R<List<SplitPackageOrderVO>> getPackageCodeByTaskId(Long taskId) {
 		return distributionSplitOrderTaskService.getPackageCodeByTaskId( taskId);
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/splitOrder/AddPackageCodeDTO.java

@@ -0,0 +1,14 @@
+package com.logpm.distribution.dto.splitOrder;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddPackageCodeDTO {
+
+	private Long taskId;
+
+	private List<String> packageCodes;
+}
+

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/splitOrder/AddTaskDTO.java

@@ -0,0 +1,12 @@
+package com.logpm.distribution.dto.splitOrder;
+
+import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddTaskDTO {
+	private Long allTaskId;
+	private List<DistributionSplitOrderTaskEntity> task;
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/splitOrder/CancelPackageCodeDTO.java

@@ -0,0 +1,7 @@
+package com.logpm.distribution.dto.splitOrder;
+
+
+public class CancelPackageCodeDTO extends AddPackageCodeDTO{
+
+}
+

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/splitOrder/TaskId.java

@@ -0,0 +1,10 @@
+package com.logpm.distribution.dto.splitOrder;
+
+import lombok.Data;
+
+@Data
+public class TaskId {
+	private Long taskId;
+
+	private Long allTaskId;
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java

@@ -86,11 +86,12 @@ public class QualityDeliverListener {
 		exchange = @Exchange(name = ReportConstants.REPORT_QUALITY_DELIVER_EXCHANGE, type = ExchangeTypes.TOPIC),
 		key = ReportConstants.REPORT_QUALITY_DELIVER_ROUTINGKEY
 	))
-	public void data(String msg) {
+	public void data(String msg) throws InterruptedException {
 		log.info("配送明细基础表处理: {}", msg);
 		if (StrUtil.isEmpty(msg)) {
 			return;
 		}
+		Thread.sleep(1000*10);
 		ReportQualityDeliverDTO bean = JSONUtil.toBean(msg, ReportQualityDeliverDTO.class);
 		String data = bean.getData();
 		QualityDeliverEntity qualityDeliverEntity = JSONUtil.toBean(data, QualityDeliverEntity.class);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java

@@ -55,6 +55,8 @@ public class ReservationPlanReportListener {
 	))
 	@Transactional(rollbackFor = Exception.class)
 	public void buildReport(String msg) {
+
+
 		log.info("预约计划生成明细报表: {}", msg);
 		if (StrUtil.isEmpty(msg)) {
 			return;