Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liuzhaotian
2024-06-20 16:38:06 +08:00
parent ab1384ccd1 1fbd89c029
commit 3d0c824303
7 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml
+2
View File
@@ -4,6 +4,8 @@ spring:
cloud:
nacos:
server-addr: 192.168.1.204:8848
username: nacos
password: nacos
discovery:
namespace: imes-test # 命名空间。这里使用 dev 开发环境
metadata:
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+8 -7
View File
@@ -349,16 +349,17 @@ public class OrderServiceImpl implements OrderService {
List<PlateDO> plateDO = (List<PlateDO>) listMap.get("platesDO");
List<PlateDetail> plateDetail = (List<PlateDetail>) listMap.get("plateDetail");
List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("itemDO");
List<OrderPartsRemark> partsRemark = (List<OrderPartsRemark>) listMap.get("partsRemark");
Map<String, List<?>> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在
goodsDO = (List<GoodsDO>) map.get("goodsDO");
List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
validateCustomOrderNoExists(order.get(0).getCustomOrderNo());
// orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
// List<OrderModelDO> 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<OrderModelDO> 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<GoodsDO>) map.get("goodsDO");
List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) 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);
}
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml
+2
View File
@@ -4,6 +4,8 @@ spring:
cloud:
nacos:
server-addr: 192.168.1.204:8848
username: nacos
password: nacos
discovery:
namespace: imes-test # 命名空间。这里使用 dev 开发环境
metadata:
cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml
+2
View File
@@ -4,6 +4,8 @@ spring:
cloud:
nacos:
server-addr: 192.168.1.204:8848
username: nacos
password: nacos
discovery:
namespace: imes-test # 命名空间。这里使用 dev 开发环境
metadata:
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class PermissionController {
@PostMapping("/bath-assign-user-role")
@PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')")
public CommonResult<Boolean> bathAssignUserRole(@Validated @RequestBody PermissionAssignRoleUserReqVO reqVO) {
// permissionService.batchAssignRoleUsers(reqVO);
permissionService.batchAssignRoleUsers(reqVO);
return success(true);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
+2
View File
@@ -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;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+1 -1
View File
@@ -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;