diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 19f713f..d42762b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -26,7 +26,8 @@ public class BlockSoftSwitchEnumUtil { WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), WEB_SOCKET(60,"WebSocket套件"), - FTP(70,"FTP套件"); + FTP(70,"FTP套件"), + SAP(80,"SAP套件"); private int value; private String description; @@ -145,7 +146,10 @@ public class BlockSoftSwitchEnumUtil { /* FTP */ CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), - SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"), + + /* SAP */ + CLIENT_SAP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.SAP,170001,"Client FTP客户端适配器"); private int value; private String description; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java index 76a4cd5..1e31ec2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -71,11 +71,11 @@ public class MdmBusiModelRepositoryImpl, M value = propValue[i]; if (value != null) { if ((value instanceof Object[])) { - query.setParameter(name.replace(".", ""), (Object[]) value); + query.setParameter(name.replace("_", ""), (Object[]) value); } else if ((value instanceof Collection)) { - query.setParameter(name.replace(".", ""), (Collection) value); + query.setParameter(name.replace("_", ""), (Collection) value); } else { - query.setParameter(name.replace(".", ""), value); + query.setParameter(name.replace("_", ""), value); } } } @@ -90,12 +90,12 @@ public class MdmBusiModelRepositoryImpl, M if (((value instanceof Object[])) || ((value instanceof Collection))) { Object[] arraySerializable = (Object[]) value; if ((arraySerializable != null) && (arraySerializable.length > 0)) { - sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); + sb.append(" and model." + name + " in (:" + name.replace("_", "") + ")"); } } else if (value == null) { sb.append(" and model." + name + " is null "); } else { - sb.append(" and model." + name + "=:" + name.replace(".", "")); + sb.append(" and model." + name + "=:" + name.replace("_", "")); } } } @@ -148,7 +148,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -272,7 +272,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { String queryString = - selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; try { List list = entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -345,7 +345,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { try { - String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + String queryString = selectCount + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -400,7 +400,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) { if (pager.getTotalRows() > 0) { - String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; + String queryString = selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) .getResultList(); @@ -592,7 +592,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -613,7 +613,7 @@ public class MdmBusiModelRepositoryImpl, M Query query = entityManager.createQuery(queryString.toString(), Long.class); for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -657,7 +657,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -695,7 +695,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -714,7 +714,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -731,7 +731,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java new file mode 100644 index 0000000..0d83dd8 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmBusiPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.BUSI; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java new file mode 100644 index 0000000..eea8a90 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmMasterPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.MASTER; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 4c5ea4f..df0bd83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; @@ -46,6 +45,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "FTP 适配器") private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "Sap 适配器") + private BsSuitCaseSap bsSuitCaseSap; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java new file mode 100644 index 0000000..8da9d02 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-15 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SAP_CONN") +@Api(value = "SAP连接信息", description = "SAP连接信息") +public class BsSapConn extends BaseBean { + + private static final long serialVersionUID = -8590500564480743293L; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接名称") + private String sapConnName; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_HOST") + @ApiParam(value = "SAP 应用服务器") + private String sapHost; + + @Column(name = "SAP_ROUTER") + @ApiParam(value = "SAP 路由") + private String sapRouter; + + @Column(name = "SAP_SYS_NO") + @ApiParam(value = "sap系统编号") + private String sapSysNo; + + @Column(name = "SAP_CLIENT") + @ApiParam(value = "sap集团") + private String sapClient; + + @Column(name = "SAP_USER") + @ApiParam(value = "sap用户名") + private String sapUser; + + @Column(name = "SAP_PWD") + @ApiParam(value = "sap密码") + private String sapPwd; + + @Column(name = "SAP_LANG") + @ApiParam(value = "sap登录语言") + private String sapLang; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java new file mode 100644 index 0000000..37c9b4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-18 17:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_SAP") +@Api(value = "SAP适配器", description = "SAP适配器") +public class BsSuitCaseSap extends BaseBean { + + private static final long serialVersionUID = -2019771592688281243L; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SAP_CONN_ID") + @ApiParam(value = "sap连接id") + @JsonSerialize(using = ToStringSerializer.class) + private Long sapConnId; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接代码") + private String sapConnName; + + @Column(name = "BUSI_FUNC_NAME") + @ApiParam(value = "业务方法") + private String busiFuncName; + + @Column(name = "COMMIT_FUNC_NAME") + @ApiParam(value = "提交方法名") + private String commitFuncName; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java new file mode 100644 index 0000000..a241382 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSapConn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSapConnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java new file mode 100644 index 0000000..8397e45 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseSap; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSuitCaseSapRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 2506bb2..021e734 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -442,4 +442,36 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); return ddlPackBean; } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlBsSapConn(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnName(), "sapConnName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlCheckBsSapConnOnly(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSapConn.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } }