From 995e83decaadaf7a0e178fe6198a7920c09ebf37 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Fri, 10 May 2024 17:43:10 +0800 Subject: [PATCH] no message --- .../java/com/youchain/service/LogService.java | 2 +- .../youchain/service/impl/LogServiceImpl.java | 4 +- .../com/youchain/service/LogService.class | Bin 1426 -> 1458 bytes .../service/impl/LogServiceImpl.class | Bin 14563 -> 14605 bytes .../service/mapstruct/LogErrorMapperImpl.java | 2 +- .../service/mapstruct/LogSmallMapperImpl.java | 2 +- .../basicdata/rest/PointController.java | 2 +- .../businessdata/rest/KMReSController.java | 16 ++--- .../businessdata/rest/MlsController.java | 43 +++++------- .../service/impl/MlsServiceImpl.java | 63 ++++++++++-------- .../youchain/modules/quartz/task/moTask.java | 2 +- .../modules/quartz/task/orderTask.java | 2 +- .../youchain/utils/BatchCreateOrUpdate.java | 5 +- 13 files changed, 68 insertions(+), 75 deletions(-) diff --git a/youchain-logging/src/main/java/com/youchain/service/LogService.java b/youchain-logging/src/main/java/com/youchain/service/LogService.java index f92915d..afa87a6 100644 --- a/youchain-logging/src/main/java/com/youchain/service/LogService.java +++ b/youchain-logging/src/main/java/com/youchain/service/LogService.java @@ -72,7 +72,7 @@ public interface LogService { void saveLog(Log log); - void saveLogInfo(Object object, String url, String resultJson, String description, long time); + void saveLogInfo(Object object, String url, String resultJson, String description, long time,String logType); /** * 查询异常详情 diff --git a/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java b/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java index 14f09d9..9d127ac 100644 --- a/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java +++ b/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java @@ -130,11 +130,11 @@ public class LogServiceImpl implements LogService { @Override @Transactional(rollbackFor = Exception.class) @Async - public void saveLogInfo(Object object,String url, String resultJson, String description, long time) { + public void saveLogInfo(Object object,String url, String resultJson, String description, long time, String logtype) { // 设置日志信息 Log log_data = new Log(); log_data.setDescription(description); - log_data.setLogType("INFO"); + log_data.setLogType(logtype); log_data.setMethod(url); log_data.setParams(JSON.toJSONString(object)); log_data.setReturnData(resultJson); diff --git a/youchain-logging/target/classes/com/youchain/service/LogService.class b/youchain-logging/target/classes/com/youchain/service/LogService.class index 695f3bf0d681f044db99701003d36a71d32705f7..6844f69153946add01a49c16edda343b67efaac6 100644 GIT binary patch delta 186 zcmbQly@^}k)W2Q(7#J8#7!24MblDm7HVWi2F~&`v-f6u?4?3`z{l49Y+u7NC?0Sdx>8K@}*V2E?2|%*3D$)T_au3D%$mqJc`a H!7@4kW62vD delta 155 zcmdnQJ&9Z3)W2Q(7#J8#81&g0bl4emHwxr3G5SodWAd7Oi%Ea7F!K~fz0E6_XEEl8 zvNA{lRq_F`6c9@Tu?zzP3nPOpgB$}R11pfv%E%xO7E)kPWMF1c0t&GJrIf*voJ$q=>#5(3E(0wG{nj4TOYNFdR~AOZm*f*}bI5Vww? zw$^IFzJ4FY1^8Mu*5yMR9TL(iZIvpv7R6eZx)ljg!4+4K^xR3lxP1Mm{bt_1_jk^@ z=bq*F-kUkP?$-5@LudCtPDBNKLmd4QV**6T_hCFHSSYaRHcYgs9)(6X$)+8c93Wtt z57Tk3jbfY^AnvuF86X$(jos`3xlyVx$HH8j24bEM=c7zvzK@bou25lP0TwD$+7v>h z%4jdJaUrS=uCZ{Dv8%RFYw#i;rQl+lred)fE-}Lr8%wdwtm-T*H}eWJtTdkLZHeGg z16NtN%*?Be^%@(OqrsvB7S`HmM3aqXtP}MJtT)RIM&Dx0H=1FSslXKqn+>RPMk0Gw zDXMHL#f>(V;KxS%6NQ^>Dig7!^HYVJZTt)ieYgd;D*Rkwn@v^NZiLl7s+1hC)Y*>I z)bZF6AP?@aaVPFFj&@ntZBdVN04c-j(Q4{_pK^GrYh0CA)v|tdyriiMpD28)aSES_$>+w;7qa+L({9@1$5+PkYfy$s(Wx6)7$3xG zDTl@xd;`jMcB^bl<1BhWY0hbtCW*YPS?(85iZg6TN<<@wB+bk&#cs_WiHyCHG+``= zvqx*Tj3~|wHco5ynL*>Y;sKiDIYF}@r=>UHa9Hy|qYRiKk&`sNL&r2H8?{G@y}D6z z(D+H=RK+39gE*}KM2ZJ%9>PPV(wc|yaLwt)DuYL89?6-Svy8)0GSGgUG=V?wP07-n zEvd2uIEFJparxsXjU6YSe1+FE=Wwp(FpqWO66Xxa<8hKE=W8C%6PzW9sonyf2%6yR z@h3Uk6Vr8}!Yi65;ayNcpD@iik(gE$z0n$3fn%ZQHt^cv$mA2E}zfwynGMreizr(_Cu=iQRkmbv?4R z`??)nJED1AdmlL7`U}l@=4^fJ_gjy(w|DQox9j>F4ZP`&W1aiEcHGl-=Wfl5_+rJ2 zHD3ayd5LL~dv1A2h2o`}mzf6CC73jqn_-1HDL+=4=Hy|6RvPGQXy2o4wv!$l>;x0GTAD94l5D5Wo$O3^C)%1<8K;+Vv9l#u5x-jV8opd{gXXo|*!D(n zDs&S!%afDWftF=E%iK9_3sbAXP3-I%Ho_@RR~{d4;1;JjZAx3>pai%#f@V9r{6Xh% z>QHA5@ca%oRq@pxEWaUO_bjZqSr*oqe4q4$S z6@{!oag;`ete~fz&Wq9v5zLIz7@1~8X_QQ}qjXNl>ZFp|PAV0@bD}hNAI*!>`C}d> zgscvl!c_AJIXrfbtCB2d{@7{bBnmo8dr3(|4fGTpB#R!C*g{@rQ+ z7PZmG^a;5ro*tr4>68@aVbKRgS51?si#`*ZUaQZ=>UTsDnoibP8mQR&o6n(5waV)WrL?PXvZ|H1qW8|^ukqC%N zP49C$Xfe}%x`Zf7OAgS~`9iRzqXWwVb;7ab0#=l_)5O5aPO7gBx6`FNNrhX<3QUO7 zs(o~sGc12nL>}*QLXh&Mq6g)aQ8XL?_vS(~iF;@YxlOomDU!FVTM#@Fr$xE)?U8uC zul9UbZR`#4JfI$v3%pRW!;tKh@QLVOQ7q++}hlpwN*2u;iA zwCRwco<+CH*Rea zlF~v@r)Po(*EpVn;=#%P)c}EOJLnpxuAtZzM2d5F!BwtQgxb<4?tyC%(wrv?(_Q9~ zdw5co6F(`na43ewoGT1Rx*Q}w0FZ$ZQVT<|fo{6b@5fL-VYplwe)8Mqu^rpK_5a&0 z?*Z99{eM20EMy_cnKe0g!zc-jkxehk?3G%L7I?L+Z317(TlgyZn~)=T9(j=~_eofO kK82BoaX3f*k`!SIruNBa^vQdzX8pjbBxe6B?8NQ=0rNG#TL1t6 delta 3217 zcmbVPd32Q36~Dhb^UeF_ncDZeuPmWB8&;32xD!Gb7(ilJG34XjIY?CJ5drM zU{U~+QSM+0riO_7@Y6%&!5D*^86q!cE6lM`;ZQ2(1~3ov6)FQ1MwP+>2Me)C;c|x} zh*cYJjf2HlV)UgpmKod<8&?>;Hb8@Lr9+dj+=vxMtaPvnSDD#r8+B$}W5ik$X`Le{ zs5k0*8x3Z>+MpX9Y``@(9kJ2mU?Z9xv|y9CbFkS=TaCZXz}t=3Vk)pz;aa0q+t}s~ zL+;E9R6A6GTOFE%?;6kd6mD~rX2`yW@q|H3UYRzA+ZbU?Pa5$X8^1N62}b#yji=0b)W*|h{Jo81W_-rRU^70e z@CO@zbZ{KcDdTz`FPL7wsBl8zC6K47r2!PGY-w#MY>V&b6O5Dbo2{R7@R-8OQYq=L z!Yk5Ux7a?5O83F+>F$1?!aO(TuZX|kKaSw5iq1=slBIb~(fjU0fi>!N1t|O}o}m>o z-ca~6$eFcmZT+V9#+K$bg};E7=DPcIUVP0(_jqD|4dUq(AO7YM&RRy0##8va!ap=l z;Z2Y=tGaq&wZ>_5X}pCqn(n3hG~UKLvh3X;&ZhYBUJ&Or-p2Zfl*pJ+(LxMz`dw@g=@;52r>wU!%u8mzouOMWdGq zG{_(eo9dby3TxV18=D)ZZ)t2=SKq1;Mw(_YEB0vi$_d$G9|#2?&K;#$8Ix^miES`!fCCob=Ork zwzX>>$K&0dX{G)N3a@G|#u@jyw5pmgmuN1PQ{y$wmvNa1uP}IwRJYAVu!(w1Mu>h~=)#%#ePpHO4@D%c9o$ zb&YH5+Uqs1lh{v&f99(4+qwpXbn6CG)iov++*p(2VAYWkvAy5MspKy zjCZF`g5At5a{2M5czMRH@HF#gw{vK=yK{iD0^G`N?j4yE9WP419_3Qq+ox3OSy z&`(YD6dff+kIIR{mV2Zi9D7No@@b-z@;bh}oUoQ&p;yJm@}9gY@~85dJ4Ie{#MaqK zRkGQF1$hZtSmyNZs0&XHturYOBd50Rg8sh-Zz+vKA;G@IU` zccmVwbPJuO_uQ&6nXz;9zNBqaoIaor$wLEZKYc{!r34R43DU*4luGC{eJq$h)F*;^ zM119B_fV>$PZfQJuP8^+=RGu8(HDxk6&>i6#Xd#H6}_nF%YGP9H(7!78RAcN#lME> zn8Z3K59llUx~~P&3QJBvG{^KeuY*=HJw~gD5_HuOnp7nuS{-YxQo5tE$ws79VWGXX=dubwh z&2hnso>%aQ1~DA4DPMkj5H&8Y1c)GbEc z+OID2g|0RFwhQj-Otp+@U9w_<( za!Dl_B-(&Jo9T^kNLpbyX44M&HN6pBgHY{1fYvvG(xuO7I8tPHuk?Hkn)N zpgfFJafOi9&%`nrO;Xx0F(iH3?iP-pI(XoJ0hAlS?c=9XTaKih8}w9RhFToA^5U>wL86 r^T>xhc_Z=>m8SrOD3$*NE<+h6_S>iR+xt*6{tY!NiT^S7;I4lHoEevh diff --git a/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogErrorMapperImpl.java b/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogErrorMapperImpl.java index ae43b55..b1dcd8d 100644 --- a/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogErrorMapperImpl.java +++ b/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogErrorMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-05-09T16:31:31+0800", + date = "2024-05-10T13:19:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_202 (Oracle Corporation)" ) @Component diff --git a/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogSmallMapperImpl.java b/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogSmallMapperImpl.java index 1b120f1..62245cd 100644 --- a/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogSmallMapperImpl.java +++ b/youchain-logging/target/generated-sources/annotations/com/youchain/service/mapstruct/LogSmallMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-05-09T16:31:31+0800", + date = "2024-05-10T13:19:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_202 (Oracle Corporation)" ) @Component diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java index abcfb17..becfd1a 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java @@ -293,7 +293,7 @@ public class PointController { @AnonymousAccess public ResponseEntity queryPointInfo(@RequestBody CurrentPage currentPage) { List pointList= pointService.getPoint(BaseStatus.STORAGE,"存储区",currentPage.getCurrentPage(),currentPage.getPageSize()); - int total=pointService.getPoint(BaseStatus.STORAGE,"1F存储区").size(); + int total=pointService.getPoint(BaseStatus.STORAGE,"存储区").size(); JSONObject object=new JSONObject(); object.put("total",total); object.put("data",pointList); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java index a79416e..db3fda0 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java @@ -31,6 +31,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,6 +42,8 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.OK; @@ -135,14 +138,12 @@ public class KMReSController { * * @param billCode */ - @Async public void returnMo(String billCode) { - OrderDto orderDto = orderService.findByBarcodeNumber(billCode); + OrderDto orderDto = orderService.findByBarcodeNumber(billCode); if (orderDto == null) { throw new RuntimeException("系统无此送货单号: " + billCode); } - double receivedQty = agvTaskService.queryBillCodeSum(billCode); if (receivedQty == orderDto.getDeliveryQty()) { List tasks = taskService.findByBillCode(billCode); @@ -153,10 +154,10 @@ public class KMReSController { long endTime = System.currentTimeMillis(); long time = endTime - startTime; // 保存日志 - logService.saveLogInfo(returnMoInfo, UrlApi.publicApi, resultJson, "按MO票入库", time); - - + logService.saveLogInfo(returnMoInfo, UrlApi.publicApi, resultJson, "按MO票入库", time, "INFO"); } + + } /** @@ -164,7 +165,6 @@ public class KMReSController { * * @param task */ - @Async public void returnIssue(@RequestBody Task task) { ReturnIssueInfo returnIssueInfo = getReturnIssueInfo(task); @@ -173,7 +173,7 @@ public class KMReSController { long endTime = System.currentTimeMillis(); long time = endTime - startTime; // 保存日志 - logService.saveLogInfo(returnIssueInfo, UrlApi.publicApi, resultJson, "叫料结果回传", time); + logService.saveLogInfo(returnIssueInfo, UrlApi.publicApi, resultJson, "叫料结果回传", time, "INFO"); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/MlsController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/MlsController.java index e946b3b..72674ab 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/MlsController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/MlsController.java @@ -36,22 +36,16 @@ public class MlsController { @AnonymousAccess public ResponseEntity getOrderInfo(@RequestBody OrderInfo orderInfo) { - String resultJson = ""; try { - resultJson = mlsService.getOrderJson(orderInfo);//获取送货单JSON - } catch (Exception e) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); - } - - if (resultJson == null || resultJson.length() == 0) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), "接口异常!", ""), HttpStatus.BAD_REQUEST); - } else { - try { + String resultJson = mlsService.getOrderJson(orderInfo);//获取送货单JSON + if (resultJson == null || resultJson.isEmpty()) { + return ResponseEntity.badRequest().body(ApiResult.success(BAD_REQUEST.value(), "获取送货单接口异常!", "")); + } else { mlsService.getOrderInfo(resultJson);//获取送货单 - return new ResponseEntity<>(ApiResult.success(OK.value(), "", resultJson), HttpStatus.OK); - } catch (Exception e) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); + return ResponseEntity.ok().body(ApiResult.success(OK.value(), "", resultJson)); } + } catch (Exception e) { + return ResponseEntity.badRequest().body(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), "")); } } @@ -61,22 +55,17 @@ public class MlsController { @Log("获取MO票信息") @ApiOperation("获取MO票信息") public ResponseEntity getMoInfo(@RequestBody MoInfo moInfo) { - String resultJson = ""; - try { - resultJson = mlsService.getMoJson(moInfo);//获取Mo票JSON - } catch (Exception e) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); - } - if (resultJson == null || resultJson.length() == 0) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), "接口异常!", ""), HttpStatus.BAD_REQUEST); - } else { - try { + try { + String resultJson = mlsService.getMoJson(moInfo);//获取Mo票JSON + if (resultJson == null || resultJson.isEmpty()) { + return ResponseEntity.badRequest().body(ApiResult.success(BAD_REQUEST.value(), "获取MO票接口异常!", "")); + } else { mlsService.getMoInfo(resultJson);//获取Mo票 - return new ResponseEntity<>(ApiResult.success(OK.value(), "", resultJson), HttpStatus.OK); - } catch (Exception e) { - return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); + return ResponseEntity.ok().body(ApiResult.success(OK.value(), "", resultJson)); } + } catch (Exception e) { + return ResponseEntity.badRequest().body(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), "")); } } @@ -86,7 +75,7 @@ public class MlsController { @AnonymousAccess public ResponseEntity returnMo(@RequestBody ReturnMoInfo returnMoInfo) { try { - String resultJson = mlsService.returnMo(returnMoInfo);//回传MO票J + String resultJson = mlsService.returnMo(returnMoInfo);//回传MO票 return new ResponseEntity<>(ApiResult.success(OK.value(), "", resultJson), HttpStatus.OK); } catch (Exception e) { return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java index 50a732c..3dd433c 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MlsServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @Service @@ -145,15 +146,20 @@ public class MlsServiceImpl implements MlsService { ordersToCreate.add(createOrder(detail)); } } - //批量新增订单 - if (!ordersToCreate.isEmpty()) { - batchCreateOrUpdate.batchCreate(ordersToCreate); - } - //批量更新订单 - if (!ordersToUpdate.isEmpty()) { - batchCreateOrUpdate.batchUpdate(ordersToUpdate); - } + CompletableFuture orderFutureCreate = CompletableFuture.runAsync(() -> { + //批量新增订单 + if (!ordersToCreate.isEmpty()) { + batchCreateOrUpdate.batchCreate(ordersToCreate); + } + }); + + CompletableFuture orderFutureUpdate = CompletableFuture.runAsync(() -> { + //批量更新订单 + if (!ordersToUpdate.isEmpty()) { + batchCreateOrUpdate.batchUpdate(ordersToUpdate); + } + }); } /** @@ -311,15 +317,21 @@ public class MlsServiceImpl implements MlsService { } } + CompletableFuture moFutureCreate = CompletableFuture.runAsync(() -> { + //批量新增Mo票 + if (!mosToCreate.isEmpty()) { + batchCreateOrUpdate.batchCreate(mosToCreate); + } + }); + + CompletableFuture moFutureUpdate = CompletableFuture.runAsync(() -> { + //批量更新Mo票 + if (!mosToUpdate.isEmpty()) { + batchCreateOrUpdate.batchUpdate(mosToUpdate); + } + }); + - //批量新增Mo票 - if (!mosToCreate.isEmpty()) { - batchCreateOrUpdate.batchCreate(mosToCreate); - } - //批量更新Mo票 - if (!mosToUpdate.isEmpty()) { - batchCreateOrUpdate.batchUpdate(mosToUpdate); - } } /** @@ -391,7 +403,6 @@ public class MlsServiceImpl implements MlsService { } @Override - @Transactional(rollbackFor = Exception.class) public void getIssueInfo(IssueInfo issueInfo) { String taskNumber = issueInfo.getTaskNumber();//任务号 // 指定Set的类型 @@ -412,8 +423,8 @@ public class MlsServiceImpl implements MlsService { List inventoryToUpdate = new ArrayList<>(); List pickDetailToCreate = new ArrayList<>(); - List taskToCreate = new ArrayList<>(); List agvTaskToCreate = new ArrayList<>(); + List taskToCreate = new ArrayList<>(); for (Inventory inv : inventoryList) { //根据库存信息生成叫料任务 @@ -471,31 +482,27 @@ public class MlsServiceImpl implements MlsService { }); - CompletableFuture pickDetailFuture = CompletableFuture.runAsync(() -> { + CompletableFuture pickDetailFuture = inventoryFuture.runAsync(() -> { //批量生成叫料明细 if (!pickDetailToCreate.isEmpty()) { batchCreateOrUpdate.batchCreate(pickDetailToCreate); } }); - CompletableFuture agvTaskFuture = CompletableFuture.runAsync(() -> { - //批量生成agv任务 + CompletableFuture agvTaskFuture = pickDetailFuture.thenRun(() -> { + // 批量生成agv任务 if (!agvTaskToCreate.isEmpty()) { batchCreateOrUpdate.batchCreate(agvTaskToCreate); } }); - - CompletableFuture taskFuture = CompletableFuture.runAsync(() -> { - //批量生成任务 + CompletableFuture taskFuture = agvTaskFuture.thenRun(() -> { + // 批量生成任务 if (!taskToCreate.isEmpty()) { batchCreateOrUpdate.batchCreate(taskToCreate); } }); - inventoryFuture.join(); - pickDetailFuture.join(); - agvTaskFuture.join(); - taskFuture.join(); + } diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/moTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/moTask.java index c8396df..3ca44d0 100644 --- a/youchain-system/src/main/java/com/youchain/modules/quartz/task/moTask.java +++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/moTask.java @@ -32,7 +32,7 @@ public class moTask { mlsService.getMoInfo(resultJson); long time = System.currentTimeMillis() - startTime; // 保存日志 - logService.saveLogInfo(moInfo, UrlApi.publicApi, resultJson, "获取MO票信息", time); + logService.saveLogInfo(moInfo, UrlApi.publicApi, resultJson, "获取MO票信息", time,"INFO"); } public MoInfo getMoInfo() { diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/orderTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/orderTask.java index 80f03c0..61d6f57 100644 --- a/youchain-system/src/main/java/com/youchain/modules/quartz/task/orderTask.java +++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/orderTask.java @@ -47,7 +47,7 @@ public class orderTask { mlsService.getOrderInfo(resultJson); long time = System.currentTimeMillis() - startTime; // 保存日志 - logService.saveLogInfo(orderInfo, UrlApi.publicApi, resultJson, "获取送货单信息", time); + logService.saveLogInfo(orderInfo, UrlApi.publicApi, resultJson, "获取送货单信息", time,"INFO"); } diff --git a/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java b/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java index a64efe1..eefc6a0 100644 --- a/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java +++ b/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java @@ -1,9 +1,7 @@ package com.youchain.utils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import java.util.List; @@ -21,7 +19,6 @@ public class BatchCreateOrUpdate { * @param 实体类型 */ @Transactional - @Async public void batchCreate(List entities) { int batchSize = 100; if (entities == null || entities.isEmpty()) { @@ -46,6 +43,7 @@ public class BatchCreateOrUpdate { } } + /** * 批量更新实体。 * @@ -53,7 +51,6 @@ public class BatchCreateOrUpdate { * @param 实体类型 */ @Transactional - @Async public void batchUpdate(List entities) { int batchSize = 100; if (entities == null || entities.isEmpty()) {