From d0a4f5b89b2e7965fc755d80b09f940df996ccba Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 14 Jun 2024 18:44:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=80=E6=96=99=E6=8E=92=E5=8D=95Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/plate/PlateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 9d4a96aba..27e9ac76d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -166,7 +166,7 @@ left join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id join order_body ob on oi.body_id = ob.id and oi.organ_id = ob.organ_id - left join order_group og on oi.group_id = og.id = oi.organ_id = og.organ_id + left join order_group og on oi.group_id = og.id and oi.organ_id = og.organ_id where op.organ_id = #{organId} and op.order_id in From 2c5e3e76285ab7467851e1399b2991f69b87ee8b Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 17 Jun 2024 10:03:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81premission=20->=20permission?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B?= =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E9=80=9A=E7=9F=A5=E5=88=B7=E6=96=B0=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=BC=93=E5=AD=98=EF=BC=9B=203=E3=80=81=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=B6=85=E7=AE=A1=E6=9F=A5=E8=AF=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=AE=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=9C=A8=E8=B6=85=E7=AE=A1=E4=B8=8D=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=9C=BA=E6=9E=84=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E7=9C=8B=E8=B6=85=E7=AE=A1=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/permission/RoleMapper.java | 8 +++---- .../RedisRefreshChannelTopicConstants.java | 2 +- ...SystemPermissionRefreshRedisListener.java} | 13 ++++++------ .../permission/PermissionServiceImpl.java | 21 +++++++++++++++++-- 4 files changed, 30 insertions(+), 14 deletions(-) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/{SystemPremissionRefreshRedisListener.java => SystemPermissionRefreshRedisListener.java} (66%) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java index 486b92c2c..89b9d48bf 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java @@ -27,11 +27,11 @@ public interface RoleMapper extends BaseMapperX { lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId()); }*/ if(isSupAdmin && ObjectUtil.isNotNull(reqVO.getOrganId())) { - //如果是超级管理员并且传入organId,就查看传入的组织 - lambdaQueryWrapperX.eqIfPresent(RoleDO::getOrganId, reqVO.getOrganId()); + //如果是超级管理员并且传入organId,就查看组织id为0（内置角色）和传入的组织 + lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId, 0L, reqVO.getOrganId()); } else { - //如果不是，就查看组织id为0和自身的组织 - lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId()); + //如果不是，就查看组织id为0（内置角色）和自身的组织 + lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId, 0L, loginUser.getOrganId()); } lambdaQueryWrapperX.likeIfPresent(RoleDO::getName, reqVO.getName()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java index 89b2dd743..4b83c1160 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java @@ -11,5 +11,5 @@ public interface RedisRefreshChannelTopicConstants { /** * 刷新权限 */ - String PREMISSION_REFRESH = "PREMISSION_REFRESH"; + String PERMISSION_REFRESH = "PERMISSION_REFRESH"; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java similarity index 66% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java index a16cb6023..b546ebc45 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java @@ -3,25 +3,24 @@ package com.cf.imes.module.system.dal.redis.listener; import com.cf.imes.framework.mq.redis.core.pubsub.AbstractRedisSimpleMessageListener; import com.cf.imes.framework.security.core.service.SecurityFrameworkService; import com.cf.imes.module.system.dal.redis.RedisRefreshChannelTopicConstants; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.stereotype.Component; /** - * system PREMISSION_REFRESH redis监听器 + * system PERMISSION_REFRESH redis监听器 * * @author Gqr * @since 2024/6/13 10:32 */ @Component -public class SystemPremissionRefreshRedisListener extends AbstractRedisSimpleMessageListener { +public class SystemPermissionRefreshRedisListener extends AbstractRedisSimpleMessageListener { - @Autowired - private SecurityFrameworkService securityFrameworkService; + private final SecurityFrameworkService securityFrameworkService; - public SystemPremissionRefreshRedisListener() { - super.setTopic(new ChannelTopic(RedisRefreshChannelTopicConstants.PREMISSION_REFRESH)); + public SystemPermissionRefreshRedisListener(SecurityFrameworkService securityFrameworkService) { + super.setTopic(new ChannelTopic(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH)); + this.securityFrameworkService = securityFrameworkService; } @Override 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 f58486c80..9d09cf68e 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 @@ -10,6 +10,7 @@ import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.organ.core.context.OrganContextHolder; +import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.api.permission.dto.DeptDataPermissionRespDTO; import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO; @@ -188,9 +189,9 @@ public class PermissionServiceImpl implements PermissionService { // 角色菜单权限发生修改，通知刷新本地缓存 if (CollectionUtil.isNotEmpty(createMenuIds) || CollectionUtil.isNotEmpty(deleteMenuIds)) { CompletableFuture.runAsync(() -> { - redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PREMISSION_REFRESH, ""); + redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, ""); }).exceptionally(e -> { - log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PREMISSION_REFRESH, e.getMessage()); + log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, e.getMessage()); return null; }); } @@ -266,6 +267,12 @@ public class PermissionServiceImpl implements PermissionService { @Override public Set getListRoleUsers(Long roleId, Long organId) { + // 超管查看时没有选择机构则查看本机构 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + assert loginUser != null; + if (loginUser.getIsSupAdmin() && organId == null) { + organId = loginUser.getOrganId(); + } List userRoleDOS = userRoleMapper.selectList(new LambdaQueryWrapperX() .eqIfPresent(UserRoleDO::getOrganId, organId) .eq(UserRoleDO::getRoleId, roleId) @@ -326,6 +333,16 @@ public class PermissionServiceImpl implements PermissionService { if (!CollectionUtil.isEmpty(deleteMenuIds)) { userRoleMapper.deleteListByUserIdAndRoleIdIds(userId, deleteMenuIds); } + + // 角色菜单权限发生修改，通知刷新本地缓存 + if (CollectionUtil.isNotEmpty(createRoleIds) || CollectionUtil.isNotEmpty(deleteMenuIds)) { + CompletableFuture.runAsync(() -> { + redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, ""); + }).exceptionally(e -> { + log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, e.getMessage()); + return null; + }); + } } @Override From b4b55cc5d220e8f0d191749f571248df48cc8f76 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 17 Jun 2024 14:12:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=8A=A0=E5=B7=A5Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imes/module/executor/service/plan/PlanServiceImpl.java | 7 ++++--- .../controller/admin/process/vo/ProcessStepStatus.java | 2 +- .../service/process/ProductionProcessServiceImpl.java | 2 +- .../module/manage/dal/mysql/process/ProcessStepMapper.xml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index bbccc9fe3..f301f5723 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -27,6 +27,7 @@ import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper; import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; +import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.system.api.machine.MachineApi; import com.cf.imes.module.system.api.machine.dto.CuttingRespDTO; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -109,7 +110,7 @@ public class PlanServiceImpl implements PlanService { // 修改对应的生产单的状态为 生产中 List orderIds = JSON.parseArray(orderNos).toJavaList(Long.class); - List orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(3)).collect(Collectors.toList()); + List orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus())).collect(Collectors.toList()); orderMapper.updateBatch(orderDOS); Long planId = plan.getId(); @@ -200,7 +201,7 @@ public class PlanServiceImpl implements PlanService { // 修改生产单的状态为待排单 List orderIds = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class); - List orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(2)).collect(Collectors.toList()); + List orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(OrderStatusEnum.NO_SORT.getStatus())).collect(Collectors.toList()); orderMapper.updateBatch(orderDOS); return Boolean.TRUE; @@ -309,7 +310,7 @@ public class PlanServiceImpl implements PlanService { QueryWrapperX queryWrapperX = new QueryWrapperX<>(); queryWrapperX .eq("a.organ_id",getUserOrganId()) - .eq("a.status",2) + .eq("a.status",OrderStatusEnum.NO_SORT.getStatus()) .eqIfPresent("a.id", pageReqVO.getOrderId()) .isNull("opi.item_id") .eqIfPresent("a.customer", pageReqVO.getConsignee()) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java index ec2bcb90e..a621118bc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java @@ -15,7 +15,7 @@ public class ProcessStepStatus { private Boolean processStepItemStatus; // 工序步骤表的类型 - private Long type; + private Integer type; // 柜体id private List bodyId; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java index fc261853f..c8f93d4bc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java @@ -71,7 +71,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { @Override public PageResult getProcessPage(ProcessPageReqVO pageReqVO) { - + // 模糊搜索添加条件 pageReqVO.setCustomer(insertSeparator(pageReqVO.getCustomer())); pageReqVO.setCustomOrderNo(insertSeparator(pageReqVO.getCustomOrderNo())); pageReqVO.setAddress(insertSeparator(pageReqVO.getAddress())); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml index 7b4cd8322..dc16d934d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml @@ -38,7 +38,7 @@ o.custom_order_no as customOrderNo, o.customer as customer, o.address as address, - ops.status as processStatus, + opsi.status as processStatus, opsi.name as name, ops.Name as processName, ops.manager as manager, From 6a9d3133746567fc424fa9ac196b6a7efe35df12 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 17 Jun 2024 15:18:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?gateway=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cf-gateway/Dockerfile | 2 +- cf-gateway/pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/cf-gateway/Dockerfile b/cf-gateway/Dockerfile index c41411741..a673afd93 100644 --- a/cf-gateway/Dockerfile +++ b/cf-gateway/Dockerfile @@ -16,4 +16,4 @@ ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" EXPOSE 48080 ## 启动后端项目 -CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar +CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Dspring.config.location=/config/bootstrap.yml -jar app.jar \ No newline at end of file diff --git a/cf-gateway/pom.xml b/cf-gateway/pom.xml index a987024da..7d6db3fc0 100644 --- a/cf-gateway/pom.xml +++ b/cf-gateway/pom.xml @@ -108,6 +108,52 @@ + + ZIP + + + non-exists + non-exists + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + prepare-package + + copy-dependencies + + + + target/lib + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + + src/main/build/assembly.xml + + + + + bundle + package + + single + + + From c9c1b9f4e742b1811d6892d3f9201d16e72e5211 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 17 Jun 2024 15:20:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Revert=20"gateway=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9test"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6a9d3133746567fc424fa9ac196b6a7efe35df12. --- cf-gateway/Dockerfile | 2 +- cf-gateway/pom.xml | 46 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/cf-gateway/Dockerfile b/cf-gateway/Dockerfile index a673afd93..c41411741 100644 --- a/cf-gateway/Dockerfile +++ b/cf-gateway/Dockerfile @@ -16,4 +16,4 @@ ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" EXPOSE 48080 ## 启动后端项目 -CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Dspring.config.location=/config/bootstrap.yml -jar app.jar \ No newline at end of file +CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar diff --git a/cf-gateway/pom.xml b/cf-gateway/pom.xml index 7d6db3fc0..a987024da 100644 --- a/cf-gateway/pom.xml +++ b/cf-gateway/pom.xml @@ -108,52 +108,6 @@ - - ZIP - - - non-exists - non-exists - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - prepare-package - - copy-dependencies - - - - target/lib - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - - src/main/build/assembly.xml - - - - - bundle - package - - single - - -