查询优化

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.impp.framework.base.service.ICacheCrudService;
 import io.swagger.annotations.ApiOperation;
 
@@ -124,8 +125,8 @@ public interface ISysRoleService extends ICacheCrudService<SysRole> {
 //     * @param user  账号信息
 //     * @return 角色集合
 //     */
-//    @ApiOperation(value = "查信用户的所有角色信息",notes = "查信用户的所有角色信息")
+    @ApiOperation(value = "查信用户的所有角色信息",notes = "查信用户的所有角色信息")
-//    List<SysRole> findSysRoleByUser(SysUser user);
+    List<SysRole> findSysRoleByUser(SysUser user);
 //
 //    /**
 //     * 根据id 数据

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/CoreReportController.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -65,47 +66,46 @@ public class CoreReportController extends CoreBaseController {
         }
     }
 
-// TODO 待实现
+
-//
+    /**
-//    /**
+     * 查询所有角色
-//     * 查询所有角色
+     *
-//     *
+     * @param ids 角色id数组
-//     * @param ids 角色id数组
+     * @return 处理结果
-//     * @return 处理结果
+     */
-//     */
+    @PostMapping(value = "/role/list/ids")
-//    @PostMapping(value = "/role/list/ids")
+    @ApiOperation(value = "查询所有角色", notes = "查询所有系统角色")
-//    @ApiOperation(value = "查询所有角色", notes = "查询所有系统角色")
+    public ResultBean findRoleByIdList(@RequestBody String[] ids) {
-//    public ResultBean findRoleByIdList(@RequestBody String[] ids) {
+        try {
-//        try {
+            List<SysRole> list = roleService.findByIdList(Arrays.asList(StringTool.getArrayLong(ids)));
-//            List<SysRole> list = roleService.findByIdList(StringTool.getArrayLong(ids));
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
-//            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
+        } catch (ImppBusiException busExcep) {
-//        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
-//            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
-//        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-//            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
-//        }
+    }
-//    }
+
-//
+    /**
-//    /**
+     * 查询登录用户所有角色
-//     * 查询登录用户所有角色
+     * @return 处理结果
-//     * @return 处理结果
+     */
-//     */
+    @GetMapping(value = "/role/user/list")
-//    @GetMapping(value = "/role/user/list")
+    @ApiOperation(value = "查询登录用户所有角色")
-//    @ApiOperation(value = "查询登录用户所有角色")
+    public ResultBean findSysRoleByUser() {
-//    public ResultBean findSysRoleByUser() {
+        try {
-//        try {
+            SessionUser sessionUser = getSessionUser();
-//            SysUser user = getSessionUser().getUser();
+            if (sessionUser != null && sessionUser.getUser() != null) {
-//            if (sessionUser != null && sessionUser.getUser() != null) {
+                List<SysRole> list = roleService.findSysRoleByUser(getSessionUser().getUser());
-//                List<SysRole> list = roleService.findSysRoleByUser(getSessionUser().getUser());
+                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
-//                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
+            }
-//            }
+            return ResultBean.fail("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("获取用户信息失败");
-//            return ResultBean.fail("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("获取用户信息失败");
+        } catch (ImppBusiException busExcep) {
-//        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
-//            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
-//        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-//            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
-//        }
+    }
-//    }
 
     /**
      * 根据核心包路径列出所有类

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

@@ -76,7 +76,7 @@ public class ScheduleQueueReceiver {
 
                     // 添加定时任务日志
                     logTaskTime.setTaskPlanId(taskPlan.getId());
-                    logTaskTime.setTaskSoftTypeRdd(taskPlan.getTaskSoftTypeRdd());
+                    logTaskTime.setSoftType(taskPlan.getTaskSoftTypeRdd());
                     logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
                     logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
                     ConvertBean.serviceModelInitialize(logTaskTime, "system");
@@ -87,7 +87,7 @@ public class ScheduleQueueReceiver {
                             && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == taskPlan.getIsNotice()) {
                         // 设置通知邮件内容
                         SysMessage sysMessage = new SysMessage();
-                        sysMessage.setMessageSoftType(logTaskTime.getTaskSoftTypeRdd());
+                        sysMessage.setMessageSoftType(logTaskTime.getSoftType());
                         sysMessage.setMessageType(taskPlan.getNoticeMethod());
                         sysMessage.setMessageSenderNameRdd("系统管理员");
                         sysMessage.setMessageTitle("任务计划失败通知");

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionDetailService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
@@ -11,6 +12,8 @@ import cn.estsh.impp.framework.base.service.CrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @Description :
  * @Reference :
@@ -24,6 +27,9 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
     @Autowired
     private SysPojoVersionRepository pojoVersionRDao;
 
+    @Autowired
+    private ISysPojoVersionDetailService pojoVersionDetailService;
+
     @Override
     public BaseRepository<SysPojoVersion, Long> getRepository() {
         return pojoVersionRDao;
@@ -36,6 +42,14 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
     }
 
     @Override
+    public SysPojoVersion packGetBean(SysPojoVersion bean) {
+        if(Objects.nonNull(bean)){
+            bean.setVersionDetail(pojoVersionDetailService.get(bean.getPojoDetailId()));
+        }
+        return bean;
+    }
+
+    @Override
     public DdlPackBean packFindAllBean(SysPojoVersion bean) {
         return CoreHqlPack.packHqlSysPojoVersion(bean);
     }

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

@@ -76,6 +76,11 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
         return roleRDao;
     }
 
+    @Override
+    public DdlPackBean getFindPagerPackBean(SysRole bean) {
+        return CoreHqlPack.packDdlBeanSysRole(bean);
+    }
+
     //    @Override
 //    @ApiOperation(value = "更新角色信息",notes = "更新角色信息")
 //    public void updateSysRole(SysRole sysRole) {
@@ -238,14 +243,14 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
         HqlPack.getNumEqualPack(status,"roleStatus",findWhere);
         return roleRDao.findByHqlWhere(findWhere.toString());
     }
-//
+
-//    @Override
+    @Override
-//    @ApiOperation(value = "查信用户的所有角色信息",notes = "查信用户的所有角色信息")
+    @ApiOperation(value = "查信用户的所有角色信息",notes = "查信用户的所有角色信息")
-//    public List<SysRole> findSysRoleByUser(SysUser user) {
+    public List<SysRole> findSysRoleByUser(SysUser user) {
-//        LOGGER.info("系统角色 查询用户所有角色");
+        LOGGER.info("系统角色 查询用户所有角色");
-//        return userPermissionDao.findSysRoleByUser(user);
+        return userPermissionDao.findSysRoleByUser(user);
-//    }
+    }
-//
+
     @Override
     public ListPager<SysRole> querySysRole(SysRole role, List<Long> idList, Pager pager) {
         DdlPackBean packBean = CoreHqlPack.packDdlBeanSysRole(role,idList);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java

@@ -52,7 +52,7 @@ public class NoSqlPack {
     public static Bson packMongoBySysLogException(SysLogException sysLogException) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
+        bson = BsonPackTool.getNumEqualPack(sysLogException.getSoftType(), "softType", bson);
         bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
         bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogException.getCreateDateTimeStart(),sysLogException.getCreateDateTimeEnd());
 
@@ -62,7 +62,7 @@ public class NoSqlPack {
     public static ElasticSearchPack packEsSysLogException(SysLogException bean) {
         ElasticSearchPack result = packElasticSearchPack(bean);
 
-        result.andTextEquals("excModule",bean.getExcModule());
+        result.andNumberEquals("softType",bean.getSoftType());
         result.andKeywordLike("excMessage",bean.getExcMessage());
         result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
 
@@ -80,7 +80,7 @@ public class NoSqlPack {
 
         bson = BsonPackTool.getNumEqualPack(logOperate.getId(), "id", bson);
         bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
+        bson = BsonPackTool.getNumEqualPack(logOperate.getSoftType(), "softType", bson);
         bson = BsonPackTool.timeBuilder("createDatetime", bson, logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd());
         bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
         bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
@@ -94,7 +94,7 @@ public class NoSqlPack {
 
         result.andKeywordEquals("id",bean.getId());
         result.andKeywordEquals("operateType",bean.getOperateType());
-        result.andKeywordEquals("operateModule",bean.getOperateModule());
+        result.andNumberEquals("softType",bean.getSoftType());
         result.andStringEquals("remoteIp",bean.getRemoteIp());
         result.andStringEquals("createUser",bean.getCreateUser());
         result.andStringLike("operateMessage",bean.getOperateMessage());
@@ -114,7 +114,7 @@ public class NoSqlPack {
 
         bson = BsonPackTool.getNumEqualPack(logSystem.getId(), "id", bson);
         bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
+        bson = BsonPackTool.getNumEqualPack(logSystem.getSoftType(), "softType", bson);
         bson = BsonPackTool.timeBuilder("createDatetime", bson, logSystem.getCreateDateTimeStart(),logSystem.getCreateDateTimeEnd());
         bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
         bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
@@ -128,7 +128,7 @@ public class NoSqlPack {
 
         result.andTextEquals("id",bean.getId());
         result.andTextEquals("logLevel",bean.getLogLevel());
-        result.andTextEquals("logModuleId",bean.getLogModuleId());
+        result.andNumberEquals("softType",bean.getSoftType());
         result.andStringEquals("remoteIp",bean.getRemoteIp());
         result.andTextLike("requestUrl",bean.getRequestUrl());
         result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
@@ -168,7 +168,7 @@ public class NoSqlPack {
     public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) {
         ElasticSearchPack result = packElasticSearchPack(bean);
 
-        result.andStringEquals("softType",bean.getSoftType());
+        result.andNumberEquals("softType",bean.getSoftType());
         result.andStringLeftLike("logHost",bean.getLogHost());
         result.andStringLike("userLoginName",bean.getUserLoginName());
         result.andStringEquals("logLevel",bean.getLogLevel());