diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 43a6f9d..a489f69 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -26,13 +26,14 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, String[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, String[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -40,42 +41,45 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, Long[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, Long[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params,","),columnName,result); + HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); return result.toString(); } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlInStr(String columnName, String[] params){ + public static DdlPackBean packHqlInStr(String columnName, String[] params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlIn(String columnName, List params){ + public static DdlPackBean packHqlIn(String columnName, List params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } @@ -83,24 +87,25 @@ public class CoreHqlPack { /** * 资源查询 + * * @param resource * @return */ - public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - if(resource != null){ - DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + if (resource != null) { + DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 - if(StringUtils.isNotBlank(resource.getResourceTypes())){ + if (StringUtils.isNotBlank(resource.getResourceTypes())) { DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } - DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); - DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); - DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(), "languageCode", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(), "resourceKey", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(), "resourceValue", result); } return result; @@ -108,6 +113,7 @@ public class CoreHqlPack { /** * 语言 + * * @param localeLanguage * @return */ @@ -118,9 +124,9 @@ public class CoreHqlPack { // HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), // "createDateTime", result, false); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(), "languageCode", result); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageName(), "languageName", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -130,37 +136,39 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPosition(SysPosition position){ - return packHqlSysPosition(position,null); + public static DdlPackBean packHqlSysPosition(SysPosition position) { + return packHqlSysPosition(position, null); } - public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + public static DdlPackBean packHqlSysPosition(SysPosition position, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(), "parentId", result); // String Like - DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + DdlPreparedPack.getStringLikerPack(position.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(), "positionCode", result); // In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPositionList(SysPosition position){ + public static DdlPackBean packHqlSysPositionList(SysPosition position) { DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(), "organizeCode", result); return result; } @@ -168,14 +176,15 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param bean * @return */ - public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean) { DdlPackBean result = DdlPackBean.getDdlPackBean(bean); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(bean.getUserId(), "userId", result); return result; } @@ -183,19 +192,20 @@ public class CoreHqlPack { /** * 组织复杂查询 + * * @param organize * @return */ - public static String packHqlSysOrganize(SysOrganize organize){ + public static String packHqlSysOrganize(SysOrganize organize) { StringBuffer result = new StringBuffer(); // 查询参数封装 - if(organize.getChildIdList() != null){ - HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + HqlPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } - HqlPack.getStringLikerPack(organize.getName(),"name",result); - HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringLikerPack(organize.getName(), "name", result); + HqlPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); // 添加默认排序 HqlPack.getOrderDefault(organize); @@ -203,53 +213,54 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + public static DdlPackBean packHqlSysOrganize(SysOrganize organize, List idList) { HqlPack.getOrderDefault(organize); DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result); + DdlPreparedPack.getStringLikerPack(organize.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(), "parentId", result); // 查询参数封装 - if(organize.getChildIdList() != null){ - DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } // Number In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } - public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + public static String packHqlSysOrganize(Long[] ids, Integer typeId) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(typeId,"organizeType",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(typeId, "organizeType", result); return result.toString(); } /** * 部门复杂查询 + * * @param department * @return */ @Deprecated - public static String packHqlSysDepartment(SysDepartment department){ + public static String packHqlSysDepartment(SysDepartment department) { StringBuffer result = new StringBuffer(); // if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ // department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); // } - HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(department.getParentId(), "parentId", result); // HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - HqlPack.getStringLikerPack(department.getName(),"name",result); - HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + HqlPack.getStringLikerPack(department.getName(), "name", result); + HqlPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); // 添加默认排序 HqlPack.getOrderDefault(department); @@ -257,36 +268,36 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(department); - DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getStringLikerPack(department.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(department.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(), "organizeId", result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(department.orderBy()); return result; } - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getInPackList(idList,"id",result); - if(menu != null){ - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + DdlPreparedPack.getInPackList(idList, "id", result); + if (menu != null) { + DdlPreparedPack.getNumEqualPack(menu.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(), "menuType", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(), "menuStatus", result); + DdlPreparedPack.getStringLikerPack(menu.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(), "menuCode", result); result.setOrderByStr(menu.orderBy()); - }else { + } else { menu = new SysMenu(); } - if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + if (!StringUtils.isNotBlank(menu.getOrderByParam())) { menu.setOrderByParam("menuSort"); menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); result.setOrderByStr(menu.orderBy()); @@ -297,16 +308,17 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * * @param role * @return */ @Deprecated - public static String packHqlSysRole(SysRole role){ + public static String packHqlSysRole(SysRole role) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - HqlPack.getStringLikerPack(role.getName(),"name",result); + HqlPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + HqlPack.getStringLikerPack(role.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(role); @@ -316,37 +328,53 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role) { + return packDdlBeanSysRole(role, null); + } + + /** + * 唯一校验 + * * @param role * @return */ - public static DdlPackBean packDdlBeanSysRole(SysRole role){ - return packDdlBeanSysRole(role,null); + public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); + return result; } - public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + public static DdlPackBean packDdlBeanSysRole(SysRole role, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(role); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + DdlPreparedPack.getStringLikerPack(role.getName(), "name", result); + DdlPreparedPack.getInPackList(idList, "id", result); - return result; + return result; } /** * 系统参数复杂查询 + * * @param config * @return */ - public static DdlPackBean packHqlSysConfig(SysConfig config) { + public static DdlPackBean packHqlSysConfig(SysConfig config) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(), "configType", result); DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 @@ -357,6 +385,7 @@ public class CoreHqlPack { /** * 字典信息复杂查询 + * * @param dictionary * @return */ @@ -368,7 +397,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 - if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ + if (dictionary.getParentId() == null || dictionary.getParentId() < 1) { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); @@ -385,6 +414,7 @@ public class CoreHqlPack { /** * 硬件类型复杂查询 + * * @param toolType * @return */ @@ -392,7 +422,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name", result); + HqlPack.getStringLikerPack(toolType.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); @@ -402,6 +432,7 @@ public class CoreHqlPack { /** * 硬件复杂查询 + * * @param tool * @return */ @@ -409,13 +440,13 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(tool.getName(),"name",result); - HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result); - HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result); - HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result); - HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result); - HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); - HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); + HqlPack.getStringLikerPack(tool.getName(), "name", result); + HqlPack.getNumEqualPack(tool.getToolTypeId(), "toolTypeId", result); + HqlPack.getNumEqualPack(tool.getToolStatus(), "toolStatus", result); + HqlPack.getNumEqualPack(tool.getToolDataType(), "toolDataType", result); + HqlPack.getNumEqualPack(tool.getToolConnType(), "toolConnType", result); + HqlPack.getStringLikerPack(tool.getToolIp(), "toolIp", result); + HqlPack.getNumLikerPack(tool.getToolPort(), "toolPort", result); // 添加默认排序 HqlPack.getOrderDefault(tool); @@ -425,10 +456,11 @@ public class CoreHqlPack { /** * 消息复杂查询 + * * @param message * @return */ - public static DdlPackBean packHqlSysMessage(SysMessage message){ + public static DdlPackBean packHqlSysMessage(SysMessage message) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 @@ -447,11 +479,12 @@ public class CoreHqlPack { DdlPreparedPack.getOrderDefault(message); - return ddlPackBean; + return ddlPackBean; } /** * 文件资源复杂查询 + * * @param file * @return */ @@ -466,11 +499,12 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - return result; + return result; } /** * 任务周期复杂查询 + * * @param sysTaskCycle * @return */ @@ -484,22 +518,23 @@ public class CoreHqlPack { // 添加默认排序 HqlPack.getOrderDefault(sysTaskCycle); - return result.toString(); + return result.toString(); } /** * 定时任务复杂查询 + * * @param sysTaskPlan * @return */ - public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(), "groupName", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(), "taskPlanStatus", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(), "taskCycleId", result); DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); @@ -507,57 +542,58 @@ public class CoreHqlPack { // 添加默认排序 DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result; + return result; } /** * 账号复杂查询 + * * @param user * @return */ - public static String packHqlSysUser(SysUser user){ + public static String packHqlSysUser(SysUser user) { StringBuffer result = new StringBuffer(); // And X = X - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - - if(user.getRoleIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(user.getDepartmentId(), "departmentId", result); + HqlPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); + HqlPack.getStringEqualPack(user.getOrganizeCode(), "organizeCode", result); + + if (user.getRoleIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getRoleIdList(), ","), "id", result); } - if(user.getDepartmentIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result); + if (user.getDepartmentIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(), ","), "id", result); } // And Like % % - HqlPack.getStringLikerPack(user.getUserName(),"userName",result); - HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + HqlPack.getStringLikerPack(user.getUserName(), "userName", result); + HqlPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + HqlPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + HqlPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // 添加默认排序 HqlPack.getOrderDefault(user); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + public static DdlPackBean packDdlBeanSysUser(SysUser user, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(user); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(user.orderBy()); return result; @@ -565,52 +601,54 @@ public class CoreHqlPack { /** * 账号复杂查询 + * * @param user * @return */ - public static DdlPackBean packDdlSysUser(SysUser user){ + public static DdlPackBean packDdlSysUser(SysUser user) { DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(), "departmentId", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", ddlPack); - if(user.getRoleIdList() != null){ - DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack); + if (user.getRoleIdList() != null) { + DdlPreparedPack.getInPack(user.getRoleIdList(), "id", ddlPack); } - if(user.getDepartmentIdList() != null){ - DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack); + if (user.getDepartmentIdList() != null) { + DdlPreparedPack.getInPack(user.getDepartmentIdList(), "id", ddlPack); } // And Like % % - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", ddlPack); // 添加默认排序 DdlPreparedPack.getOrderDefault(user); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack); - return ddlPack; + return ddlPack; } /** * 查询字典代码是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -620,18 +658,19 @@ public class CoreHqlPack { /** * 查询字典值是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -641,92 +680,95 @@ public class CoreHqlPack { /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo){ + public static String packHqlSysUserInfo(SysUserInfo userInfo) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + HqlPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And - DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ - DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(), "departmentId", result); } // Like - DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(userInfo.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 result.setOrderByStr(userInfo.orderBy()); - return result; + return result; } /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + public static String packHqlSysUserInfo(SysUserInfo userInfo, List idList) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && !idList.isEmpty()){ + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + if (idList != null && !idList.isEmpty()) { HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } /** * 查询语言代码是否重复 + * * @param localeLanguage * @return */ - public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){ + public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result); - HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result); + HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(), "languageCode", result); + HqlPack.getNumNOEqualPack(localeLanguage.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -736,16 +778,17 @@ public class CoreHqlPack { /** * 检查系统资源是否重复 + * * @param localeResource * @return */ - public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){ + public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); - HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); - HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); + HqlPack.getStringEqualPack(localeResource.getLanguageCode(), "languageCode", result); + HqlPack.getStringEqualPack(localeResource.getResourceKey(), "resourceKey", result); + HqlPack.getNumEqualPack(localeResource.getSoftType(), "softType", result); + HqlPack.getNumNOEqualPack(localeResource.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeResource); @@ -755,16 +798,17 @@ public class CoreHqlPack { /** * 查询规则代码是否重复 + * * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule) { StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); // not - HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(orderNoRule.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -773,19 +817,20 @@ public class CoreHqlPack { } /** - * 单号规则复杂查询，分页，排序 + * 单号规则复杂查询，分页，排序 + * * @param orderNoRule * @return */ - public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(), "orderNoRuleStatus", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(), "orderNo", result); if (orderNoRule.getSerialNo() != null) { DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } @@ -798,19 +843,20 @@ public class CoreHqlPack { /** * 用户消息关系表负责查询 + * * @param sysRefUserMessage * @return */ - public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(), "messageSenderNameRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(), "messageStatus", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result); // 添加默认排序 HqlPack.getOrderDefault(sysRefUserMessage); @@ -820,44 +866,46 @@ public class CoreHqlPack { /** * 任务复杂查询 + * * @param sysTask * @return */ - public static DdlPackBean packHqlSysTask(SysTask sysTask){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + public static DdlPackBean packHqlSysTask(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(), "taskSoftType", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(), "taskPackage", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(), "taskClass", result); DdlPreparedPack.getOrderDefault(sysTask); return result; } - public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) { + StringBuffer result = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result.toString(); } /** * 大小区间比较 + * * @param columnName * @param min * @param max * @return */ - public static String packHqlByInterval(String columnName,Object min,Object max){ - StringBuffer result = new StringBuffer(); + public static String packHqlByInterval(String columnName, Object min, Object max) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumSmallerPack(max,columnName,result); - HqlPack.getNumBiggerPack(min,columnName,result); + HqlPack.getNumSmallerPack(max, columnName, result); + HqlPack.getNumBiggerPack(min, columnName, result); return result.toString(); } @@ -865,6 +913,7 @@ public class CoreHqlPack { /** * 字典信息查询id集合中是否存在默认数据 + * * @param ids * @return */ @@ -872,44 +921,47 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + DdlPreparedPack.getInPack(StringUtils.join(ids, ","), "id", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result; } /** * 条码规则代码是否存在 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); // not - HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(), "id", result); return result.toString(); } /** * 条码规则复杂查询 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result); - HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringLikerPack(sysBarcodeRule.getName(), "name", result); + HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); return result.toString(); } /** * 打印模板复杂查询 + * * @param sysLabelTemplate * @return */ @@ -932,9 +984,9 @@ public class CoreHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(), "organizeCode", ddlPackBean); DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true); @@ -946,6 +998,7 @@ public class CoreHqlPack { /** * 打印模板参数复杂查询 + * * @param sysLabelTemplateParam * @return */ @@ -965,99 +1018,102 @@ public class CoreHqlPack { } - /** * 文件代码是否存在 + * * @param sysFile 查询条件 * @return DdlPackBean */ - public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile) { DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(), "fileCode", result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(), "id", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref) { DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(), "userId", result); // String Eq - DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(), "organizeCode", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId, Long roleId, String organizeCode) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(userId,"userId",result); - DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + DdlPreparedPack.getNumEqualPack(userId, "userId", result); + DdlPreparedPack.getNumEqualPack(roleId, "roleId", result); // String Eq - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } /** * 查询当前用户所有组织数据 + * * @param sysRefUserDepartments * @return */ - public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()), "id", packBean); return packBean; } /** * 按条件查询字典 + * * @param sysDictionary * @return */ - public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(), "parentId", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(), "dictionaryGroup", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(), "dictionaryValue", packBean); return packBean; } /** * 按条件查询字典 + * * @param bean * @return */ - public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); - DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean); - DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean); - DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true); + DdlPreparedPack.getNumEqualPack(bean.getRefId(), "refId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(), "planId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(), "refClass", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(), "versionMethodName", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(), "pojoCompare", packBean); + DdlPreparedPack.timeBuilder(bean.getModifyDatetime(), "modifyDatetime", packBean, false, true); return packBean; } - public static DdlPackBean packSysDataSource(SysDataSource bean){ + public static DdlPackBean packSysDataSource(SysDataSource bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean);