From d8c3f185bcecc96c919e415a22869b31cef9f568 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Wed, 19 Jun 2024 18:00:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8es2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/order/OrderServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 2c68afde6..6bf2d33b4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -349,16 +349,17 @@ public class OrderServiceImpl implements OrderService { List plateDO = (List) listMap.get("platesDO"); List plateDetail = (List) listMap.get("plateDetail"); List itemDO = (List) listMap.get("itemDO"); + List partsRemark = (List) listMap.get("partsRemark"); Map> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在 goodsDO = (List) map.get("goodsDO"); List plateGoodDOS = (List) map.get("plateGoodDOLists"); validateCustomOrderNoExists(order.get(0).getCustomOrderNo()); -// orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS); -// List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); -// orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); -// orderInputProcessor.batchSaveModel(orderModelDOs); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS); + List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); + orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); + orderInputProcessor.batchSaveModel(orderModelDOs); return order.get(0).getId(); } @@ -528,9 +529,9 @@ public class OrderServiceImpl implements OrderService { goodsDO = (List) map.get("goodsDO"); List plateGoodDOS = (List) map.get("plateGoodDOLists"); -// validateCustomOrderNoExists(orderDO.getCustomOrderNo()); -// orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); -// orderInputProcessor.batchSaveModel(orderModelDOS); + validateCustomOrderNoExists(orderDO.getCustomOrderNo()); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); + orderInputProcessor.batchSaveModel(orderModelDOS); } From a361c8e9ca14233c5eeace4a4d0113d8e333c4a0 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 19 Jun 2024 18:59:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E8=A7=92=E8=89=B2=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=94=A8=E6=88=B7=E9=87=8D=E5=86=99=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9B=202=E3=80=81=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0organid?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/permission/PermissionController.java | 2 +- .../system/controller/admin/permission/vo/role/RoleRespVO.java | 2 ++ .../module/system/service/permission/PermissionServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java index 82f59af63..1cfe3e339 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java @@ -109,7 +109,7 @@ public class PermissionController { @PostMapping("/bath-assign-user-role") @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')") public CommonResult bathAssignUserRole(@Validated @RequestBody PermissionAssignRoleUserReqVO reqVO) { -// permissionService.batchAssignRoleUsers(reqVO); + permissionService.batchAssignRoleUsers(reqVO); return success(true); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java index 663917b27..be9d8f9a4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java @@ -54,4 +54,6 @@ public class RoleRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式") private LocalDateTime createTime; + @Schema(description = "组织id", example = "1") + private Long organId; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java index 63b8706e7..403edf63e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java @@ -271,7 +271,7 @@ public class PermissionServiceImpl implements PermissionService { @Override @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换 - @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId") + @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, allEntries = true) public void batchAssignRoleUsers(PermissionAssignRoleUserReqVO reqVO) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); assert loginUser != null; From 1fbd89c029ca1a5631e68678fb02d726d8c9b3f4 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 20 Jun 2024 14:40:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?infra=E3=80=81plan=E3=80=81report=E5=BE=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0nacos?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E8=B4=A6=E5=8F=B7=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf-module-infra-biz/src/main/resources/bootstrap-test.yaml | 2 ++ .../src/main/resources/bootstrap-test.yaml | 2 ++ .../cf-module-report-biz/src/main/resources/bootstrap-test.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml b/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml index 90fc424cd..805e8c69c 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml +++ b/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml @@ -4,6 +4,8 @@ spring: cloud: nacos: server-addr: 192.168.1.204:8848 + username: nacos + password: nacos discovery: namespace: imes-test # 命名空间。这里使用 dev 开发环境 metadata: diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml index 90fc424cd..805e8c69c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml @@ -4,6 +4,8 @@ spring: cloud: nacos: server-addr: 192.168.1.204:8848 + username: nacos + password: nacos discovery: namespace: imes-test # 命名空间。这里使用 dev 开发环境 metadata: diff --git a/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml b/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml index 90fc424cd..805e8c69c 100644 --- a/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml +++ b/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml @@ -4,6 +4,8 @@ spring: cloud: nacos: server-addr: 192.168.1.204:8848 + username: nacos + password: nacos discovery: namespace: imes-test # 命名空间。这里使用 dev 开发环境 metadata: