合并代码

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java

@@ -61,6 +61,7 @@ public class ScheduleQueueReceiver {
             SysLogTaskTime logTaskTime = JsonUtilTool.decode(data, SysLogTaskTime.class);
             LOGGER.info("【MQ-QUEUE_IMPP_SCHEDULE】数据接收成功：{}", logTaskTime);
             // 跟新最后执行时间 及 任务状态
+            if(logTaskTime != null){
                 SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(), logTaskTime.getGroupName());
                 if (taskPlan != null) {
                     taskPlan.setLastRunDateTime(logTaskTime.getCreateDatetime());
@@ -121,6 +122,7 @@ public class ScheduleQueueReceiver {
 
                 //信息已处理
                 channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+            }
         } catch (IOException e) {
             LOGGER.error("【MQ-QUEUE_IMPP_MESSAGE_MAIL】处理出错：{}", e.getMessage(), e);
             //丢弃这条消息

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -15,8 +16,10 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefUserRoleRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -24,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -137,19 +141,11 @@ public class SysRoleService implements ISysRoleService {
             List<String> featuresListRdd = new ArrayList<>();           // 冗余
             List<SysRefRoleMenu> refs = new ArrayList<>();                 // 角色权限关系
 
-            // 封装需要删除的IDS
-            Long[] rids = new Long[roleList.size()];
-            for (int i = 0; i < roleList.size(); i++) {
-                rids[i] = roleList.get(i).getId();
-            }
             // 删除角色权限关系
-            String deleteWhere = CoreHqlPack.packHqlIds("roleId", roleIds);
+            refRoleMenuRDao.deleteByPropertyIn("roleId",roleIds);
-            List<SysRefRoleMenu> refRoleMenuList = refRoleMenuRDao.findByHqlWhere(deleteWhere);
-            refRoleMenuRDao.deleteAll(refRoleMenuList);
 
             if(ids != null && ids.length > 0){
-                String menuWhere = CoreHqlPack.packHqlIds("id", ids);
+                List<SysMenu> list = sysMenuRDao.findAllById(Arrays.asList(ids));
-                List<SysMenu> list = sysMenuRDao.findByHqlWhere(menuWhere);
                 SysRefRoleMenu ref = null;
 
                 // 插入角色权限关系
@@ -161,11 +157,10 @@ public class SysRoleService implements ISysRoleService {
                             ref.setRoleNameRdd(role.getName());
                             ref.setMenuNameRdd(menu.getName());
                             ref.setMenuId(menu.getId());
-                            ref.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
-                            ref.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
                             ref.setMenuTypeRdd(menu.getMenuType());
+                            ConvertBean.serviceModelInitialize(ref, AuthUtil.getSessionUser());
 
-                            refs.add(ref);
+                            refRoleMenuRDao.insert(ref);
                         }
 
                         // 冗余信息封装
@@ -185,7 +180,6 @@ public class SysRoleService implements ISysRoleService {
                 role.setMenuNumber(featuresListRdd.size());
             }
 
-            refRoleMenuRDao.saveAll(refs);
             roleRDao.saveAll(roleList);
         }else {
             throw ImppExceptionBuilder.newInstance()