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

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -184,7 +184,7 @@ public class FileApiController {
         }
     }
 
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(name = "通过key获取地址",value = "/getImage",method = RequestMethod.POST)
     public HttpResult getImage(@RequestBody @Valid FileImageParam fileImageParam){
         try {

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -30,7 +30,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addPurchaseOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addPurchaseOrderDraft(@RequestBody @Validated PurchaseOrderDraftParam param) {
         kwoTradeOrderService.addPurchaseOrderDraft(param);
@@ -45,7 +45,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addPurchaseOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addPurchaseOrderSubmit(@RequestBody @Validated PurchaseOrderParam purchaseOrderParam) {
         kwoTradeOrderService.addPurchaseOrderSubmit(purchaseOrderParam);
@@ -60,7 +60,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addValetOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addValetOrderDraft(@RequestBody @Validated ValetOrderDraftParam param) {
         kwoTradeOrderService.addValetOrderDraft(param);
@@ -76,7 +76,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addValetOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addValetOrderSubmit(@RequestBody @Validated ValetOrderParam valetOrderParam) {
         kwoTradeOrderService.addValetOrderSubmit(valetOrderParam);
@@ -103,7 +103,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult update(@RequestBody @Validated UpdateOrderParam updateOrderParam) {
         kwoTradeOrderService.update(updateOrderParam);
@@ -118,7 +118,7 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/acceptanceOrder", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult acceptanceOrder(@RequestBody @Validated AcceptanceOrderParam acceptanceOrderParam) {
         kwoTradeOrderService.acceptanceOrder(acceptanceOrderParam);

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTransportDemandController.java

@@ -37,7 +37,7 @@ public class KwoTransportDemandController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addDraft(@RequestBody @Validated AddTransportDemandDraftParam param) {
         kwoTransportDemandService.addDraft(param);
@@ -52,7 +52,7 @@ public class KwoTransportDemandController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addShelves(@RequestBody @Validated AddTransportDemandParam param) {
         kwoTransportDemandService.addShelves(param);
@@ -79,7 +79,7 @@ public class KwoTransportDemandController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult update(@RequestBody @Validated UpdateTransportDemandParam param) {
         kwoTransportDemandService.update(param);

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwpWantBuyController.java

@@ -69,7 +69,7 @@ public class KwpWantBuyController {
      * @Param addWantBuyParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addDraft(@RequestBody @Validated AddDraftWantBuyParam addDraftWantBuyParam) {
         kwpWantBuyService.addDraft(addDraftWantBuyParam);
@@ -83,7 +83,7 @@ public class KwpWantBuyController {
      * @Param addWantBuyParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addShelves(@RequestBody @Validated AddWantBuyParam addWantBuyParam) {
         kwpWantBuyService.addShelves(addWantBuyParam);
@@ -141,7 +141,7 @@ public class KwpWantBuyController {
      * @author lt
      * @Date 15:22 2023/7/26 0026
      **/
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult update(@RequestBody @Validated UpdateWantBuyParam updateWantBuyParam) {
         kwpWantBuyService.update(updateWantBuyParam);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerLogisticsController.java

@@ -41,7 +41,7 @@ public class KwpLedgerLogisticsController {
      * @param logisticsReq 保存物流对账单参数
      * @return
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid LogisticsSendReq logisticsReq) {
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedgerDraft(logisticsReq));
@@ -54,7 +54,7 @@ public class KwpLedgerLogisticsController {
      * @return
      */
     @PostMapping("send")
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult send(@RequestBody @Valid LogisticsSendReq logisticsReq) {
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedger(logisticsReq));
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -42,7 +42,7 @@ public class KwpLedgerTradeController {
      * @param tradeSendReq
      * @return
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid TradeSendReq tradeSendReq) {
         return HttpResult.ok(kwpLedgerTradeService.sendLedgerDraft(tradeSendReq));
@@ -54,7 +54,7 @@ public class KwpLedgerTradeController {
      * @param tradeSendReq
      * @return
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping("send")
     public HttpResult send(@RequestBody @Valid TradeSendReq tradeSendReq) {
         return HttpResult.ok(kwpLedgerTradeService.sendLedger(tradeSendReq));

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -37,7 +37,7 @@ public class KwpGoodsController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addDraft(@RequestBody @Validated AddGoodsDraftParam param) {
         kwpGoodsService.addDraft(param);
@@ -51,7 +51,7 @@ public class KwpGoodsController {
      * @Param addGoodsParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addShelves(@RequestBody @Validated AddGoodsParam addGoodsParam) {
         kwpGoodsService.addShelves(addGoodsParam);
@@ -78,7 +78,7 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
-    @RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult update(@RequestBody @Validated UpdateGoodsParam updateGoodsParam) {
         kwpGoodsService.update(updateGoodsParam);
         return HttpResult.ok("修改商品成功");

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -14,7 +14,6 @@ import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
-import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.req.ResetPasswordReqVo;
 import com.sckw.system.model.vo.req.UserAddReqVo;
@@ -86,7 +85,7 @@ public class KwsUserController {
      * @date: 2023/6/14
      */
     @PostMapping("/add")
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult add(@Valid @RequestBody UserAddReqVo reqVo,
                           @RequestHeader(name = "System-Type", required = true) int systemType) {
         reqVo.setSystemType(systemType);
@@ -236,7 +235,7 @@ public class KwsUserController {
         return HttpResult.ok(kwsUserService.test(Arrays.stream(type.split(",")).map(Integer::parseInt).toList()));
     }
 
-    @RepeatSubmit
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @PostMapping("testApprove")
     public HttpResult testApprove(@RequestBody ForgetPasswordReqVo reqVo) {
         kwsUserService.test(Collections.singletonList(1));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -87,7 +87,7 @@ public class AcceptCarriageOrderController {
      * 承运订单导出
      * @param query 查询参数
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/acceptCarriageOrderExport", method = RequestMethod.POST)
     public void exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
@@ -104,7 +104,7 @@ public class AcceptCarriageOrderController {
      * @param dto   获取订单数据请求参数
      * @return  响应结果
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.POST)
     public HttpResult getOrderDetail(@Validated @RequestBody DocumentParamDTO dto) {
         log.info("获取订单详情参数:{}", JSONObject.toJSONString(dto));
@@ -123,7 +123,7 @@ public class AcceptCarriageOrderController {
      * @param contractParam 请求参数
      * @return  响应结果
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
     public HttpResult getLogisticsOrderContract(@Valid @RequestBody ContractParam contractParam) {
         try {
@@ -140,7 +140,7 @@ public class AcceptCarriageOrderController {
      * @param orderDto  订单请求数据
      * @return  响应结果
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/cancelConsign", method = RequestMethod.POST)
     public HttpResult cancelConsign(@Validated @RequestBody CancelOrderDTO orderDto) {
         try {
@@ -175,7 +175,7 @@ public class AcceptCarriageOrderController {
      * @param orderDTO  物流订单接单请求数据
      * @return  接单响应结果
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/orderTaking", method = RequestMethod.POST)
     public HttpResult orderTaking(@Validated @RequestBody OrderTakingDTO orderDTO) {
         return acceptCarriageOrderService.orderTaking(orderDTO);
@@ -187,7 +187,7 @@ public class AcceptCarriageOrderController {
      * @param query 请求参数
      * @return 操作响应数据
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
     public HttpResult subcontractConsignment(@RequestBody SubcontractConsignmentDTO query) {
         try {
@@ -292,7 +292,7 @@ public class AcceptCarriageOrderController {
      * @return  响应结果
      */
     @RequestMapping(value = "/acceptStopDocumentCommit", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 3000,message = "两次请求时间间隔不能小于3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult stopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
         log.info("承运订单/托运订单-设置停止接单-提交 请求参数:{}", JSONObject.toJSONString(stopOrderTakingDTO));
         try {
@@ -345,7 +345,7 @@ public class AcceptCarriageOrderController {
      * @return  响应结果
      */
     @RequestMapping(value = "/commitAcceptCarriageOrderFinish", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 3000,message = "两次请求间隔时间不能小于三秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult commitAcceptCarriageOrderFinish(@Valid @RequestBody OrderFinishDTO orderFinishDTO) {
         try {
             return acceptCarriageOrderService.commitAcceptCarriageOrderFinish(orderFinishDTO);
@@ -378,7 +378,7 @@ public class AcceptCarriageOrderController {
      * @param addOrderDTO 页面传递参数
      * @return  响应结果
      */
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔时间不能小于3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
     public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
         log.info("承运订单-页面新建订单 add {}", JSONObject.toJSONString(addOrderDTO));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -156,7 +156,7 @@ public class ConsignOrderController {
      * @param stopOrderTakingDTO 请求参数
      * @return  响应结果
      */
-    @RepeatSubmit(interval = 3000,message = "两次请求间隔不能小于3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/consignStopDocumentCommit", method = RequestMethod.POST)
     public HttpResult consignStopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
         log.info("托运订单-设置停止接单-提交 commit {}", JSONObject.toJSONString(stopOrderTakingDTO));
@@ -291,7 +291,7 @@ public class ConsignOrderController {
      * @return  响应结果
      */
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 3000,message = "提交间隔时间不能小于3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
         try {
             return consignOrderService.addOrder(addOrderDTO);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -53,7 +53,7 @@ public class LogisticsConsignmentController {
      * @return  响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
     public HttpResult purchaseLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("采购订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
@@ -108,7 +108,7 @@ public class LogisticsConsignmentController {
      * @return  操作结果
      */
     @Validated
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/purchaseCancelConsign", method = RequestMethod.POST)
     @GlobalTransactional(name = "default_tx_group")
     public HttpResult purchaseCancelConsign(@Valid @RequestBody BaseList baseList) {
@@ -183,7 +183,7 @@ public class LogisticsConsignmentController {
      * @return  响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/purchaseOrderFinish", method = RequestMethod.POST)
     public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderFinishDTO orderFinishDTO) {
         log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
@@ -203,7 +203,7 @@ public class LogisticsConsignmentController {
      * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("销售订单-物流托运生成托运订单 传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
@@ -275,7 +275,7 @@ public class LogisticsConsignmentController {
      */
     @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.POST)
     @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult sellCancelConsign(@Valid @RequestBody BaseList baseList) {
         log.info("销售订单-托运订单列表-撤销托运:{}", JSONObject.toJSONString(baseList));
         try {
@@ -313,7 +313,7 @@ public class LogisticsConsignmentController {
      */
     @Validated
     @RequestMapping(value = "/sellOrderFinish", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult sellOrderFinish(@RequestBody @Validated OrderFinishDTO orderFinishDTO) {
         log.info("销售订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
         try {