From 0bc9f2e9bcb5602d99ee0eee2ba95e8ea11572c4 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 23 Aug 2019 10:48:01 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF=20?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 df4aba7..7e544a4 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 @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -859,6 +861,22 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + 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.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true); + + // 添加默认排序 + HqlPack.getOrderDefault(sysLabelTemplate); + + return ddlPackBean; + } + /** * 打印模板参数复杂查询 * @param sysLabelTemplateParam From 34e2c13b38d69b1bb3f699d0810fb003becd4f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 23 Aug 2019 13:27:04 +0800 Subject: [PATCH 02/15] =?UTF-8?q?getByProperty=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 562 +++++++++++---------- 1 file changed, 283 insertions(+), 279 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 43cbeab..763c4f8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -25,7 +25,7 @@ import java.util.*; * @Modify: **/ public class BaseRepositoryImpl extends SimpleJpaRepository - implements BaseRepository { + implements BaseRepository { public static final Logger LOGGER = LoggerFactory.getLogger(BaseRepositoryImpl.class); /** @@ -36,7 +36,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; - public BaseRepositoryImpl(Class clz, EntityManager em,SnowflakeIdMaker snowflakeIdMaker) { + public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); this.entityManager = em; this.persistentClass = clz; @@ -82,7 +82,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T insert(T item) { - return insert(item,true); + return insert(item, true); } @Override @@ -93,7 +93,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public S save(S entity) { //复写save方法，若id为0或空则新增，不然则修改 - return (S) innerSave(entity,true); + return (S) innerSave(entity, true); } @Override @@ -135,100 +135,101 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteById(ID id){ + public void deleteById(ID id) { deleteByProperty("id", id); } @Override public int deleteByProperty(String propName, Object propValue) { - return deleteByProperties(new String[] { propName }, new Object[] { propValue }); + return deleteByProperties(new String[]{propName}, new Object[]{propValue}); } @Override public int deleteByProperties(String[] propName, Object[] propValue) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb,propName,propValue); + appendQL(sb, propName, propValue); Query query = entityManager.createQuery(sb.toString()); - setParameter(query,propName,propValue); + setParameter(query, propName, propValue); return query.executeUpdate(); - }else{ + } else { throw new IllegalArgumentException("删除错误!propName:" + propName + ",propValue:" + propValue); } } @Override public int deleteByIds(ID[] ids) { - return deleteByPropertyIn("id", ids); + return deleteByPropertyIn("id", ids); } @Override public int deleteByPropertyIn(String propName, Object[] propValues) { if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) { - String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:"+propName+") "; + String hql = "delete from " + persistentClass.getName() + " model where model." + propName + " in(:" + propName + ") "; Query query = entityManager.createQuery(hql); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("删除出错："+propName+":" + propValues); + } else { + throw new IllegalArgumentException("删除出错：" + propName + ":" + propValues); } } @Override public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue) { - return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue }); + return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue}); } @Override public int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue); + return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue); } @Override public int updateByProperties(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) { - return updateByProperties(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue }); + return updateByProperties(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue}); } @Override public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,true); + return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, true); } @Override public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String propertyName, Object propertyValue) { - return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue }); + return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue}); } @Override public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue); + return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue); } @Override public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) { - return updateByPropertiesWithVal(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue }); + return updateByPropertiesWithVal(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue}); } @Override public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,false); + return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, false); } /** * 更新参数汇总方法 - * @param conditionName 条件属性名 + * + * @param conditionName 条件属性名 * @param conditionValue 条件属性值 - * @param propertyName 更新属性名 - * @param propertyValue 更新属性值 - * @param valWithSimple 是否简单赋值 - * true为正常eg： price = :price - * false为自身添加eg： price = price + :price + * @param propertyName 更新属性名 + * @param propertyValue 更新属性值 + * @param valWithSimple 是否简单赋值 + * true为正常eg： price = :price + * false为自身添加eg： price = price + :price * @return */ private int updateByPropertiesMain(String[] conditionName, Object[] conditionValue, - String[] propertyName, Object[] propertyValue,boolean valWithSimple) { + String[] propertyName, Object[] propertyValue, boolean valWithSimple) { if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null) && (propertyValue.length > 0) && (propertyName.length == propertyValue.length) && (conditionValue != null) && (conditionValue.length > 0)) { @@ -236,9 +237,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { - if(valWithSimple) { + if (valWithSimple) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); - }else{ + } else { sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ","); } } @@ -260,36 +261,36 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean) { - return updateByProperties(new String[] { propertyName }, new Object[] { propertyValue },packBean); + public int updateByProperties(String propertyName, Object propertyValue, DdlPackBean packBean) { + return updateByProperties(new String[]{propertyName}, new Object[]{propertyValue}, packBean); } @Override - public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) { - return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,true); + public int updateByProperties(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) { + return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, true); } @Override - public int updateByPropertiesWithVal(String propertyName, Object propertyValue,DdlPackBean packBean) { - return updateByPropertiesWithVal(new String[] { propertyName }, new Object[] { propertyValue },packBean); + public int updateByPropertiesWithVal(String propertyName, Object propertyValue, DdlPackBean packBean) { + return updateByPropertiesWithVal(new String[]{propertyName}, new Object[]{propertyValue}, packBean); } @Override - public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) { - return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,false); + public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) { + return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, false); } private int updateByPropertiesDdlPack(String[] propertyName, Object[] propertyValue, - DdlPackBean packBean,boolean valWithSimple) { + DdlPackBean packBean, boolean valWithSimple) { if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null) && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) { StringBuffer sb = new StringBuffer(); sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { - if(valWithSimple) { + if (valWithSimple) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); - }else{ + } else { sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ","); } } @@ -303,7 +304,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } //查询条件 for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.executeUpdate(); @@ -344,9 +345,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getById(long id) { - try{ - return entityManager.find(persistentClass,id); - }catch (Exception e){ + try { + return entityManager.find(persistentClass, id); + } catch (Exception e) { return null; } } @@ -360,12 +361,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { return entityManager.createQuery("from " + persistentClass.getName()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -378,21 +379,21 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPage(DdlPackBean packBean, int offset, int pageSize) { Query query = null; - String ddl = "from " + persistentClass.getName() + " where 1=1 " +packBean.getPackedHql(); + String ddl = "from " + persistentClass.getName() + " where 1=1 " + packBean.getPackedHql(); - if(packBean.isHql()){ + if (packBean.isHql()) { query = entityManager.createQuery(ddl); - }else{ + } else { query = entityManager.createNativeQuery(ddl); } for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(offset) - .setMaxResults(pageSize) - .getResultList(); + .setMaxResults(pageSize) + .getResultList(); } @Override @@ -412,7 +413,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByProperty(String[] propertyNames, Object[] values) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -424,14 +425,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -447,7 +448,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByProperty(String[] propertyNames, Object[] values, String orderByStuff) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -459,7 +460,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -468,7 +469,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -478,16 +479,15 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - - try { - List list = findByHqlWhere(packBean); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，DdlPackBean：{}",packBean); + List list = findByHqlWhere(packBean); + if (list.size() == 0) { + LOGGER.error("数据不存在，DdlPackBean：{}", packBean); return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean); - throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } else if (list.size() > 1) { + LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean); + throw new RuntimeException("存在多条记录"); + } else { + return list.get(0); } } @@ -495,20 +495,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep public T getByProperty(String propertyName, Object value) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; try { - List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); + return (T) entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult(); + } catch (NoResultException ne) { + LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne); return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}", propertyName, value, ex); throw new RuntimeException("存在多条记录：" + ex.getMessage()); } } @Override public T getByProperty(String[] propertyNames, Object[] values) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -520,57 +519,56 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try{ - List list = queryObject.getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在",ne); + try { + return (T) queryObject.getSingleResult(); + } catch (NoResultException ne) { + LOGGER.error("数据不存在", ne); return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。",ex); + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。", ex); throw new RuntimeException("存在多条记录：" + ex.getMessage()); } } @Override public int listCount() { - try{ - Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class) + try { + Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public int findByPropertyCount(String propertyName, Object value) { - try{ + try { String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(propertyName, value) .getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public int findByPropertyCount(String[] propertyNames, Object[] values) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -582,42 +580,42 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } - Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); + Query queryObject = entityManager.createQuery(queryString.toString(), Long.class); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try{ + try { Long count = (Long) queryObject.getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if (pager.getTotalRows() > 0) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) - .setParameter(propertyName, value) - .getResultList(); - }else{ + .setParameter(propertyName, value) + .getResultList(); + } else { return new ArrayList(); } } @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ - if(propertyNames.length != values.length){ + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -629,12 +627,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } - if(orderByStuff != null && orderByStuff.length() > 0){ + if (orderByStuff != null && orderByStuff.length() > 0) { queryString.append(orderByStuff); } @@ -644,7 +642,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -671,10 +669,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhere(DdlPackBean packBean) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql()); + + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.getResultList(); @@ -682,7 +680,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values, String orderByStuff) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -695,7 +693,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -704,7 +702,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -713,7 +711,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(String hqlWhere, String[] propertyNames, Object[] values) { - if(propertyNames.length != values.length){ + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -725,30 +723,30 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try{ - Long count = entityManager.createQuery(queryString.toString(),Long.class).getSingleResult(); + try { + Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if(pager.getTotalRows() > 0){ - if(propertyNames.length != values.length){ + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -760,7 +758,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -768,13 +766,13 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); for (int i = 0; i < size; i++) { - if(values[i] != null) { + if (values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } return queryObject.getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -782,7 +780,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -794,25 +792,25 @@ public class BaseRepositoryImpl extends SimpleJpaRep .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @Override public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -826,10 +824,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); } - try{ + try { Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @@ -842,44 +840,44 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } - try{ + try { Long count = (Long) query.getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public int findByHqlCount(String hql) { - try{ - Long count = entityManager.createQuery(hql,Long.class).getSingleResult(); + try { + Long count = entityManager.createQuery(hql, Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public int findByHqlCount(String hql, String[] paramName, Object[] paramValue) { - Query queryObject = entityManager.createQuery(hql,Integer.class); - for(int i=0;i findByHqlPage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0){ + if (pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -891,32 +889,32 @@ public class BaseRepositoryImpl extends SimpleJpaRep .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @Override public List findByHqlPage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0){ + if (pager.getTotalRows() > 0) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -927,7 +925,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep return queryObject.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -939,29 +937,29 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySql(String sql, Class entity) { - return entityManager.createNativeQuery(sql,entity).getResultList(); + return entityManager.createNativeQuery(sql, entity).getResultList(); } @Override public List findBySqlPage(String sql, Pager pager) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - }else{ + } else { return new ArrayList(); } } @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - if(pager.getTotalRows() > 0){ - return entityManager.createNativeQuery(sql,entity) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); - }else{ + if (pager.getTotalRows() > 0) { + return entityManager.createNativeQuery(sql, entity) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { return new ArrayList(); } } @@ -973,74 +971,74 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findBySqlCount(String sql) { - try{ + try { Long count = (Long) entityManager - .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class) - .getSingleResult(); + .createNativeQuery("select count(*) from ( " + sql + " ) as usertable", Long.class) + .getSingleResult(); return count == null ? 0 : count.intValue(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public double findBySqlSumDouble(String sql, String columnName) { - try{ + try { return (double) entityManager - .createNativeQuery("select sum(" + columnName + ") from ( " + sql + " ) as usertable",Double.class) + .createNativeQuery("select sum(" + columnName + ") from ( " + sql + " ) as usertable", Double.class) .getSingleResult(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public double findByHqlDouble(String hql) { - try{ - Double result = entityManager.createQuery(hql,Double.class).getSingleResult(); + try { + Double result = entityManager.createQuery(hql, Double.class).getSingleResult(); return result == null ? 0 : result; - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public double findByHqlDouble(DdlPackBean packBean) { - try{ - Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class); + try { + Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } Double result = (Double) query.getSingleResult(); return result == null ? 0 : result; - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @Override public long findByHqlLong(String hql) { - try{ - return entityManager.createQuery(hql,Long.class).getSingleResult(); - }catch(NoResultException e){ + try { + return entityManager.createQuery(hql, Long.class).getSingleResult(); + } catch (NoResultException e) { return 0; } } @Override public long findByHqlLong(DdlPackBean packBean) { - try{ + try { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql(),Long.class); + + " as model where 1=1 " + packBean.getPackedHql(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return (long) query.getSingleResult(); - }catch(NoResultException e){ + } catch (NoResultException e) { return 0; } } @@ -1062,14 +1060,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(0).setMaxResults(topNum).getResultList(); } @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); queryString.append(hql + " as model where 1=1 "); @@ -1081,10 +1079,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep queryString.append(" " + orderByStuff); return entityManager.createQuery(queryString.toString()) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); - }else{ + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { return new ArrayList(); } } @@ -1097,8 +1095,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlObjects(String hql, String[] paramName, Object[] paramValue) { Query queryObject = entityManager.createQuery(hql); - for(int i=0;i extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - if(pager.getTotalRows() > 0){ + if (pager.getTotalRows() > 0) { return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - }else{ + } else { return new ArrayList(); } } @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if (pager.getTotalRows() > 0) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -1126,7 +1124,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - }else{ + } else { return new ArrayList(); } } @@ -1138,60 +1136,61 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - if(pager.getTotalRows() > 0){ + if (pager.getTotalRows() > 0) { return entityManager.createNativeQuery(sql) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); - }else{ + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { return new ArrayList(); } } /** * 保存对象 + * * @param item 保存对象 * @return */ private T innerSave(T item, boolean initParam) { try { - if(item == null) { + if (item == null) { return null; } Class clazz = item.getClass(); //获取主键 Field idField = clazz.getField("id"); - if(idField == null){ + if (idField == null) { idField = clazz.getField("primaryKey"); } - if(idField == null){ + if (idField == null) { // 遍历所有属性，以@Id声明确认主键 Field[] fields = clazz.getFields(); - for(Field f : fields){ - if(f.getAnnotation(Id.class) != null){ + for (Field f : fields) { + if (f.getAnnotation(Id.class) != null) { idField = f; break; } } } - if(idField != null){ + if (idField != null) { Class type = idField.getType(); Object val = idField.get(item); - if(type == Long.class && (val == null || Long.parseLong(val.toString()) == 0)){ + if (type == Long.class && (val == null || Long.parseLong(val.toString()) == 0)) { // long类型主键，以snowflake为主键 idField.set(item, snowflakeIdMaker.nextId()); - } else if(type == String.class && (val==null || "".equals(val))){ + } else if (type == String.class && (val == null || "".equals(val))) { // String类型主键，以UUID为主键 idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); } } //属性值过滤，避免null值 - if(initParam){ - for(Field checkField : clazz.getFields()){ - if(checkField.get(item) == null){ + if (initParam) { + for (Field checkField : clazz.getFields()) { + if (checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } @@ -1200,9 +1199,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep entityManager.merge(item); entityManager.flush(); - if(idField!=null){ + if (idField != null) { return item; - }else { + } else { return null; } } catch (Exception e) { @@ -1213,21 +1212,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep /** * 对为赋值的属性进行赋值 + * * @param field */ - private void fieldSetInitParam(T item,Field field) { + private void fieldSetInitParam(T item, Field field) { try { if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { field.set(item, 0); - } else if(field.getType() == Long.class){ + } else if (field.getType() == Long.class) { field.set(item, 0L); - } else if(field.getType() == Float.class){ + } else if (field.getType() == Float.class) { field.set(item, 0.0f); - } else if(field.getType() == Double.class){ + } else if (field.getType() == Double.class) { field.set(item, 0.0d); - } else if(field.getType() == Boolean.class){ + } else if (field.getType() == Boolean.class) { field.set(item, false); } } catch (IllegalAccessException e) { @@ -1252,129 +1252,133 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public int deleteWeaklyById(ID id,String username) { - return deleteWeaklyByProperty("id", id,username); + public int deleteWeaklyById(ID id, String username) { + return deleteWeaklyByProperty("id", id, username); } @Override - public int deleteWeaklyByIds(Long[] ids,String username) { - return deleteWeaklyByPropertyIn("id", ids,username); + public int deleteWeaklyByIds(Long[] ids, String username) { + return deleteWeaklyByPropertyIn("id", ids, username); } @Override - public int deleteWeaklyByProperty(String propName, Object propValue,String username) { - return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue },username); + public int deleteWeaklyByProperty(String propName, Object propValue, String username) { + return deleteWeaklyByProperties(new String[]{propName}, new Object[]{propValue}, username); } /** * 批量弱删除 + * * @return */ @Override - public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { - if(propValues != null && propValues.length > 0){ + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues, String username) { + if (propValues != null && propValues.length > 0) { String hql = "update " + persistentClass.getName() + " model set model.isDeleted =:modelIsDeleted,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." - + propName + " in(:"+propName+") "; + + propName + " in(:" + propName + ") "; Query query = entityManager.createQuery(hql); - query.setParameter("modelIsDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - query.setParameter("modelModifyUser",username); - query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelIsDeleted", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser", username); + query.setParameter("modelModifyDatetime", getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); + } else { + throw new IllegalArgumentException("弱删除失败：" + propName + ":" + propValues); } } /** * 批量弱删除 + * * @return */ @Override - public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { + public int deleteWeaklyByProperties(String[] propName, Object[] propValue, String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isDeleted = :modelDeleted,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); - appendQL(sb,propName,propValue); + appendQL(sb, propName, propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modelModifyUser",username); - query.setParameter("modelModifyDatetime",getNowTime(true)); - query.setParameter("modelDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser", username); + query.setParameter("modelModifyDatetime", getNowTime(true)); + query.setParameter("modelDeleted", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - setParameter(query,propName,propValue); + setParameter(query, propName, propValue); return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); + } else { + throw new IllegalArgumentException("弱删除失败：" + propName + ":" + propValue); } } @Override - public int updateValidStatusById(ID id,int status,String username) { - return updateValidStatusByProperty("id", id,status,username); + public int updateValidStatusById(ID id, int status, String username) { + return updateValidStatusByProperty("id", id, status, username); } @Override - public int updateValidStatusByIds(Long[] ids,int status,String username) { - return updateValidStatusByPropertyIn("id", ids,status,username); + public int updateValidStatusByIds(Long[] ids, int status, String username) { + return updateValidStatusByPropertyIn("id", ids, status, username); } @Override - public int updateValidStatusByProperty(String propName, Object propValue,int status,String username) { - return updateValidStatusByProperties(new String[] { propName }, new Object[] { propValue },status,username); + public int updateValidStatusByProperty(String propName, Object propValue, int status, String username) { + return updateValidStatusByProperties(new String[]{propName}, new Object[]{propValue}, status, username); } /** * 批量禁用 + * * @return */ @Override - public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username) { - if(propValues != null && propValues.length > 0){ + public int updateValidStatusByPropertyIn(String propName, Object[] propValues, int status, String username) { + if (propValues != null && propValues.length > 0) { String hql = "update " + persistentClass.getName() + " model set model.isValid =:modelIsValid ,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." - + propName + " in(:"+propName+") "; + + propName + " in(:" + propName + ") "; Query query = entityManager.createQuery(hql); - query.setParameter("modelModifyUser",username); - query.setParameter("modelModifyDatetime",getNowTime(true)); - query.setParameter("modelIsValid",status); + query.setParameter("modelModifyUser", username); + query.setParameter("modelModifyDatetime", getNowTime(true)); + query.setParameter("modelIsValid", status); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("修改状态失败："+propName+":" + propValues); + } else { + throw new IllegalArgumentException("修改状态失败：" + propName + ":" + propValues); } } /** * 批量禁用 + * * @return */ @Override - public int updateValidStatusByProperties(String[] propName, Object[] propValue,int status,String username) { + public int updateValidStatusByProperties(String[] propName, Object[] propValue, int status, String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isValid = :modelIsValid,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); - appendQL(sb,propName,propValue); + appendQL(sb, propName, propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modelModifyUser",username); - query.setParameter("modelModifyDatetime",getNowTime(true)); - query.setParameter("modelIsValid",status); + query.setParameter("modelModifyUser", username); + query.setParameter("modelModifyDatetime", getNowTime(true)); + query.setParameter("modelIsValid", status); - setParameter(query,propName,propValue); + setParameter(query, propName, propValue); return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("修改状态失败："+propName+":" + propValue); + } else { + throw new IllegalArgumentException("修改状态失败：" + propName + ":" + propValue); } } @Override public boolean isExitByProperty(String propertyName, Object value) { //大于0，存在 - return findByPropertyCount(propertyName,value) > 0; + return findByPropertyCount(propertyName, value) > 0; } @Override @@ -1384,7 +1388,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) { - return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0; + return findByHqlWhereCount(hqlWhere, propertyNames, values) > 0; } @Override @@ -1414,7 +1418,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + return findSumByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); } @Override @@ -1423,46 +1427,46 @@ public class BaseRepositoryImpl extends SimpleJpaRep StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if(StringUtils.isNotBlank(groupByName)) { + if (StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query,paramName,paramValue); + setParameter(query, paramName, paramValue); return getNumberByResultList(query.getResultList()); - }else{ + } else { throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + return findAvgByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); } @Override public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb,paramName,paramValue); + StringBuffer sb = new StringBuffer("select avg(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); - if(StringUtils.isNotBlank(groupByName)) { + if (StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query,paramName,paramValue); + setParameter(query, paramName, paramValue); return getNumberByResultList(query.getResultList()); - }else{ + } else { throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findMaxByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findMaxByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + return findMaxByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); } @Override @@ -1470,22 +1474,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if(StringUtils.isNotBlank(groupByName)){ + if (StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query,paramName,paramValue); + setParameter(query, paramName, paramValue); return getNumberByResultList(query.getResultList()); - }else{ + } else { throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findMinByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findMinByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + return findMinByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); } @Override @@ -1494,28 +1498,28 @@ public class BaseRepositoryImpl extends SimpleJpaRep StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if(StringUtils.isNotBlank(groupByName)) { + if (StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query,paramName,paramValue); + setParameter(query, paramName, paramValue); return getNumberByResultList(query.getResultList()); - }else{ + } else { throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } //从结果集中获取数字转换 - public double getNumberByResultList(List objList){ + public double getNumberByResultList(List objList) { double num = 0.0; - if(objList != null && objList.size() > 0){ - if(objList.get(0) != null){ + if (objList != null && objList.size() > 0) { + if (objList.get(0) != null) { try { num = Double.parseDouble(objList.get(0).toString()); - }catch(NumberFormatException ne){ - LOGGER.error("数字转换出错!",ne); + } catch (NumberFormatException ne) { + LOGGER.error("数字转换出错!", ne); } } } From a38347d2fbc20eed0105470752c4d764636690ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 23 Aug 2019 14:48:30 +0800 Subject: [PATCH 03/15] revert --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 530 ++++++++++----------- 1 file changed, 263 insertions(+), 267 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 763c4f8..0eb845c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -36,7 +36,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; - public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { + public BaseRepositoryImpl(Class clz, EntityManager em,SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); this.entityManager = em; this.persistentClass = clz; @@ -82,7 +82,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T insert(T item) { - return insert(item, true); + return insert(item,true); } @Override @@ -93,7 +93,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public S save(S entity) { //复写save方法，若id为0或空则新增，不然则修改 - return (S) innerSave(entity, true); + return (S) innerSave(entity,true); } @Override @@ -135,101 +135,100 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteById(ID id) { + public void deleteById(ID id){ deleteByProperty("id", id); } @Override public int deleteByProperty(String propName, Object propValue) { - return deleteByProperties(new String[]{propName}, new Object[]{propValue}); + return deleteByProperties(new String[] { propName }, new Object[] { propValue }); } @Override public int deleteByProperties(String[] propName, Object[] propValue) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb, propName, propValue); + appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); - setParameter(query, propName, propValue); + setParameter(query,propName,propValue); return query.executeUpdate(); - } else { + }else{ throw new IllegalArgumentException("删除错误!propName:" + propName + ",propValue:" + propValue); } } @Override public int deleteByIds(ID[] ids) { - return deleteByPropertyIn("id", ids); + return deleteByPropertyIn("id", ids); } @Override public int deleteByPropertyIn(String propName, Object[] propValues) { if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) { - String hql = "delete from " + persistentClass.getName() + " model where model." + propName + " in(:" + propName + ") "; + String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:"+propName+") "; Query query = entityManager.createQuery(hql); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - } else { - throw new IllegalArgumentException("删除出错：" + propName + ":" + propValues); + }else{ + throw new IllegalArgumentException("删除出错："+propName+":" + propValues); } } @Override public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue) { - return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue}); + return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue }); } @Override public int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue); + return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue); } @Override public int updateByProperties(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) { - return updateByProperties(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue}); + return updateByProperties(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue }); } @Override public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, true); + return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,true); } @Override public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String propertyName, Object propertyValue) { - return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue}); + return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue }); } @Override public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue); + return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue); } @Override public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) { - return updateByPropertiesWithVal(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue}); + return updateByPropertiesWithVal(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue }); } @Override public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) { - return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, false); + return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,false); } /** * 更新参数汇总方法 - * - * @param conditionName 条件属性名 + * @param conditionName 条件属性名 * @param conditionValue 条件属性值 - * @param propertyName 更新属性名 - * @param propertyValue 更新属性值 - * @param valWithSimple 是否简单赋值 - * true为正常eg： price = :price - * false为自身添加eg： price = price + :price + * @param propertyName 更新属性名 + * @param propertyValue 更新属性值 + * @param valWithSimple 是否简单赋值 + * true为正常eg： price = :price + * false为自身添加eg： price = price + :price * @return */ private int updateByPropertiesMain(String[] conditionName, Object[] conditionValue, - String[] propertyName, Object[] propertyValue, boolean valWithSimple) { + String[] propertyName, Object[] propertyValue,boolean valWithSimple) { if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null) && (propertyValue.length > 0) && (propertyName.length == propertyValue.length) && (conditionValue != null) && (conditionValue.length > 0)) { @@ -237,9 +236,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { - if (valWithSimple) { + if(valWithSimple) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); - } else { + }else{ sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ","); } } @@ -261,36 +260,36 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public int updateByProperties(String propertyName, Object propertyValue, DdlPackBean packBean) { - return updateByProperties(new String[]{propertyName}, new Object[]{propertyValue}, packBean); + public int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean) { + return updateByProperties(new String[] { propertyName }, new Object[] { propertyValue },packBean); } @Override - public int updateByProperties(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) { - return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, true); + public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) { + return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,true); } @Override - public int updateByPropertiesWithVal(String propertyName, Object propertyValue, DdlPackBean packBean) { - return updateByPropertiesWithVal(new String[]{propertyName}, new Object[]{propertyValue}, packBean); + public int updateByPropertiesWithVal(String propertyName, Object propertyValue,DdlPackBean packBean) { + return updateByPropertiesWithVal(new String[] { propertyName }, new Object[] { propertyValue },packBean); } @Override - public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) { - return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, false); + public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) { + return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,false); } private int updateByPropertiesDdlPack(String[] propertyName, Object[] propertyValue, - DdlPackBean packBean, boolean valWithSimple) { + DdlPackBean packBean,boolean valWithSimple) { if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null) && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) { StringBuffer sb = new StringBuffer(); sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { - if (valWithSimple) { + if(valWithSimple) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); - } else { + }else{ sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ","); } } @@ -304,7 +303,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } //查询条件 for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.executeUpdate(); @@ -345,9 +344,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getById(long id) { - try { - return entityManager.find(persistentClass, id); - } catch (Exception e) { + try{ + return entityManager.find(persistentClass,id); + }catch (Exception e){ return null; } } @@ -361,12 +360,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { return entityManager.createQuery("from " + persistentClass.getName()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -379,16 +378,16 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPage(DdlPackBean packBean, int offset, int pageSize) { Query query = null; - String ddl = "from " + persistentClass.getName() + " where 1=1 " + packBean.getPackedHql(); + String ddl = "from " + persistentClass.getName() + " where 1=1 " +packBean.getPackedHql(); - if (packBean.isHql()) { + if(packBean.isHql()){ query = entityManager.createQuery(ddl); - } else { + }else{ query = entityManager.createNativeQuery(ddl); } for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(offset) @@ -413,7 +412,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByProperty(String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -425,14 +424,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -448,7 +447,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByProperty(String[] propertyNames, Object[] values, String orderByStuff) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -460,7 +459,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -469,7 +468,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -479,15 +478,16 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - List list = findByHqlWhere(packBean); - if (list.size() == 0) { - LOGGER.error("数据不存在，DdlPackBean：{}", packBean); + + try { + List list = findByHqlWhere(packBean); + return list.size() != 0 ? list.get(0) : null; + }catch(NoResultException ne){ + LOGGER.error("数据不存在，DdlPackBean：{}",packBean); return null; - } else if (list.size() > 1) { - LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean); - throw new RuntimeException("存在多条记录"); - } else { - return list.get(0); + }catch(NonUniqueResultException ex){ + LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); } } @@ -495,19 +495,20 @@ public class BaseRepositoryImpl extends SimpleJpaRep public T getByProperty(String propertyName, Object value) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; try { - return (T) entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult(); - } catch (NoResultException ne) { - LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne); + List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); + return list.size() != 0 ? list.get(0) : null; + }catch(NoResultException ne){ + LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); return null; - } catch (NonUniqueResultException ex) { - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}", propertyName, value, ex); + }catch(NonUniqueResultException ex){ + LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); throw new RuntimeException("存在多条记录：" + ex.getMessage()); } } @Override public T getByProperty(String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -519,56 +520,57 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try { - return (T) queryObject.getSingleResult(); - } catch (NoResultException ne) { - LOGGER.error("数据不存在", ne); + try{ + List list = queryObject.getResultList(); + return list.size() != 0 ? list.get(0) : null; + }catch(NoResultException ne){ + LOGGER.error("数据不存在",ne); return null; - } catch (NonUniqueResultException ex) { - LOGGER.error("查询单条记录，但出现多条。", ex); + }catch(NonUniqueResultException ex){ + LOGGER.error("查询单条记录，但出现多条。",ex); throw new RuntimeException("存在多条记录：" + ex.getMessage()); } } @Override public int listCount() { - try { - Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model", Long.class) + try{ + Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public int findByPropertyCount(String propertyName, Object value) { - try { + try{ String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(propertyName, value) .getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public int findByPropertyCount(String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -580,42 +582,42 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } - Query queryObject = entityManager.createQuery(queryString.toString(), Long.class); + Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try { + try{ Long count = (Long) queryObject.getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(propertyName, value) .getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if (pager.getTotalRows() > 0) { - if (propertyNames.length != values.length) { + if(pager.getTotalRows() > 0){ + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -627,12 +629,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } - if (orderByStuff != null && orderByStuff.length() > 0) { + if(orderByStuff != null && orderByStuff.length() > 0){ queryString.append(orderByStuff); } @@ -642,7 +644,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -672,7 +674,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.getResultList(); @@ -680,7 +682,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values, String orderByStuff) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -693,7 +695,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -702,7 +704,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } @@ -711,7 +713,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(String hqlWhere, String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -723,30 +725,30 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } Query queryObject = entityManager.createQuery(queryString.toString()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - try { - Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); + try{ + Long count = entityManager.createQuery(queryString.toString(),Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if (pager.getTotalRows() > 0) { - if (propertyNames.length != values.length) { + if(pager.getTotalRows() > 0){ + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); @@ -758,7 +760,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep int size = propertyNames.length; for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); } } @@ -766,13 +768,13 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); for (int i = 0; i < size; i++) { - if (values[i] != null) { + if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } return queryObject.getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -780,7 +782,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -792,25 +794,25 @@ public class BaseRepositoryImpl extends SimpleJpaRep .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -824,10 +826,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); } - try { + try{ Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @@ -840,44 +842,44 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } - try { + try{ Long count = (Long) query.getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public int findByHqlCount(String hql) { - try { - Long count = entityManager.createQuery(hql, Long.class).getSingleResult(); + try{ + Long count = entityManager.createQuery(hql,Long.class).getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public int findByHqlCount(String hql, String[] paramName, Object[] paramValue) { - Query queryObject = entityManager.createQuery(hql, Integer.class); - for (int i = 0; i < paramName.length; i++) { - if (paramValue[i] != null) { + Query queryObject = entityManager.createQuery(hql,Integer.class); + for(int i=0;i findByHqlPage(String hqlWhere, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0){ StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -889,32 +891,32 @@ public class BaseRepositoryImpl extends SimpleJpaRep .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findByHqlPage(DdlPackBean packBean, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0){ Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -925,7 +927,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep return queryObject.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -937,29 +939,29 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySql(String sql, Class entity) { - return entityManager.createNativeQuery(sql, entity).getResultList(); + return entityManager.createNativeQuery(sql,entity).getResultList(); } @Override public List findBySqlPage(String sql, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - if (pager.getTotalRows() > 0) { - return entityManager.createNativeQuery(sql, entity) + if(pager.getTotalRows() > 0){ + return entityManager.createNativeQuery(sql,entity) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -971,74 +973,74 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findBySqlCount(String sql) { - try { + try{ Long count = (Long) entityManager - .createNativeQuery("select count(*) from ( " + sql + " ) as usertable", Long.class) + .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public double findBySqlSumDouble(String sql, String columnName) { - try { + try{ return (double) entityManager - .createNativeQuery("select sum(" + columnName + ") from ( " + sql + " ) as usertable", Double.class) + .createNativeQuery("select sum(" + columnName + ") from ( " + sql + " ) as usertable",Double.class) .getSingleResult(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public double findByHqlDouble(String hql) { - try { - Double result = entityManager.createQuery(hql, Double.class).getSingleResult(); + try{ + Double result = entityManager.createQuery(hql,Double.class).getSingleResult(); return result == null ? 0 : result; - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public double findByHqlDouble(DdlPackBean packBean) { - try { - Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class); + try{ + Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } Double result = (Double) query.getSingleResult(); return result == null ? 0 : result; - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @Override public long findByHqlLong(String hql) { - try { - return entityManager.createQuery(hql, Long.class).getSingleResult(); - } catch (NoResultException e) { + try{ + return entityManager.createQuery(hql,Long.class).getSingleResult(); + }catch(NoResultException e){ return 0; } } @Override public long findByHqlLong(DdlPackBean packBean) { - try { + try{ Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql(), Long.class); + + " as model where 1=1 " + packBean.getPackedHql(),Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return (long) query.getSingleResult(); - } catch (NoResultException e) { + }catch(NoResultException e){ return 0; } } @@ -1060,14 +1062,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " as model where 1=1 " + packBean.getPackedHql()); for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); } return query.setFirstResult(0).setMaxResults(topNum).getResultList(); } @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); queryString.append(hql + " as model where 1=1 "); @@ -1082,7 +1084,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -1095,8 +1097,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlObjects(String hql, String[] paramName, Object[] paramValue) { Query queryObject = entityManager.createQuery(hql); - for (int i = 0; i < paramName.length; i++) { - if (paramValue[i] != null) { + for(int i=0;i extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0){ return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - } else { + }else{ return new ArrayList(); } } @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -1124,7 +1126,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); - } else { + }else{ return new ArrayList(); } } @@ -1136,61 +1138,60 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - if (pager.getTotalRows() > 0) { + if(pager.getTotalRows() > 0){ return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); - } else { + }else{ return new ArrayList(); } } /** * 保存对象 - * * @param item 保存对象 * @return */ private T innerSave(T item, boolean initParam) { try { - if (item == null) { + if(item == null) { return null; } Class clazz = item.getClass(); //获取主键 Field idField = clazz.getField("id"); - if (idField == null) { + if(idField == null){ idField = clazz.getField("primaryKey"); } - if (idField == null) { + if(idField == null){ // 遍历所有属性，以@Id声明确认主键 Field[] fields = clazz.getFields(); - for (Field f : fields) { - if (f.getAnnotation(Id.class) != null) { + for(Field f : fields){ + if(f.getAnnotation(Id.class) != null){ idField = f; break; } } } - if (idField != null) { + if(idField != null){ Class type = idField.getType(); Object val = idField.get(item); - if (type == Long.class && (val == null || Long.parseLong(val.toString()) == 0)) { + if(type == Long.class && (val == null || Long.parseLong(val.toString()) == 0)){ // long类型主键，以snowflake为主键 idField.set(item, snowflakeIdMaker.nextId()); - } else if (type == String.class && (val == null || "".equals(val))) { + } else if(type == String.class && (val==null || "".equals(val))){ // String类型主键，以UUID为主键 idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); } } //属性值过滤，避免null值 - if (initParam) { - for (Field checkField : clazz.getFields()) { - if (checkField.get(item) == null) { + if(initParam){ + for(Field checkField : clazz.getFields()){ + if(checkField.get(item) == null){ // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } @@ -1199,9 +1200,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep entityManager.merge(item); entityManager.flush(); - if (idField != null) { + if(idField!=null){ return item; - } else { + }else { return null; } } catch (Exception e) { @@ -1212,22 +1213,21 @@ public class BaseRepositoryImpl extends SimpleJpaRep /** * 对为赋值的属性进行赋值 - * * @param field */ - private void fieldSetInitParam(T item, Field field) { + private void fieldSetInitParam(T item,Field field) { try { if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { field.set(item, 0); - } else if (field.getType() == Long.class) { + } else if(field.getType() == Long.class){ field.set(item, 0L); - } else if (field.getType() == Float.class) { + } else if(field.getType() == Float.class){ field.set(item, 0.0f); - } else if (field.getType() == Double.class) { + } else if(field.getType() == Double.class){ field.set(item, 0.0d); - } else if (field.getType() == Boolean.class) { + } else if(field.getType() == Boolean.class){ field.set(item, false); } } catch (IllegalAccessException e) { @@ -1252,133 +1252,129 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public int deleteWeaklyById(ID id, String username) { - return deleteWeaklyByProperty("id", id, username); + public int deleteWeaklyById(ID id,String username) { + return deleteWeaklyByProperty("id", id,username); } @Override - public int deleteWeaklyByIds(Long[] ids, String username) { - return deleteWeaklyByPropertyIn("id", ids, username); + public int deleteWeaklyByIds(Long[] ids,String username) { + return deleteWeaklyByPropertyIn("id", ids,username); } @Override - public int deleteWeaklyByProperty(String propName, Object propValue, String username) { - return deleteWeaklyByProperties(new String[]{propName}, new Object[]{propValue}, username); + public int deleteWeaklyByProperty(String propName, Object propValue,String username) { + return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue },username); } /** * 批量弱删除 - * * @return */ @Override - public int deleteWeaklyByPropertyIn(String propName, Object[] propValues, String username) { - if (propValues != null && propValues.length > 0) { + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { + if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() + " model set model.isDeleted =:modelIsDeleted,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." - + propName + " in(:" + propName + ") "; + + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("modelIsDeleted", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - query.setParameter("modelModifyUser", username); - query.setParameter("modelModifyDatetime", getNowTime(true)); + query.setParameter("modelIsDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - } else { - throw new IllegalArgumentException("弱删除失败：" + propName + ":" + propValues); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); } } /** * 批量弱删除 - * * @return */ @Override - public int deleteWeaklyByProperties(String[] propName, Object[] propValue, String username) { + public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isDeleted = :modelDeleted,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); - appendQL(sb, propName, propValue); + appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modelModifyUser", username); - query.setParameter("modelModifyDatetime", getNowTime(true)); - query.setParameter("modelDeleted", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - setParameter(query, propName, propValue); + setParameter(query,propName,propValue); return query.executeUpdate(); - } else { - throw new IllegalArgumentException("弱删除失败：" + propName + ":" + propValue); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); } } @Override - public int updateValidStatusById(ID id, int status, String username) { - return updateValidStatusByProperty("id", id, status, username); + public int updateValidStatusById(ID id,int status,String username) { + return updateValidStatusByProperty("id", id,status,username); } @Override - public int updateValidStatusByIds(Long[] ids, int status, String username) { - return updateValidStatusByPropertyIn("id", ids, status, username); + public int updateValidStatusByIds(Long[] ids,int status,String username) { + return updateValidStatusByPropertyIn("id", ids,status,username); } @Override - public int updateValidStatusByProperty(String propName, Object propValue, int status, String username) { - return updateValidStatusByProperties(new String[]{propName}, new Object[]{propValue}, status, username); + public int updateValidStatusByProperty(String propName, Object propValue,int status,String username) { + return updateValidStatusByProperties(new String[] { propName }, new Object[] { propValue },status,username); } /** * 批量禁用 - * * @return */ @Override - public int updateValidStatusByPropertyIn(String propName, Object[] propValues, int status, String username) { - if (propValues != null && propValues.length > 0) { + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username) { + if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() + " model set model.isValid =:modelIsValid ,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." - + propName + " in(:" + propName + ") "; + + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("modelModifyUser", username); - query.setParameter("modelModifyDatetime", getNowTime(true)); - query.setParameter("modelIsValid", status); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelIsValid",status); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); - } else { - throw new IllegalArgumentException("修改状态失败：" + propName + ":" + propValues); + }else{ + throw new IllegalArgumentException("修改状态失败："+propName+":" + propValues); } } /** * 批量禁用 - * * @return */ @Override - public int updateValidStatusByProperties(String[] propName, Object[] propValue, int status, String username) { + public int updateValidStatusByProperties(String[] propName, Object[] propValue,int status,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isValid = :modelIsValid,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); - appendQL(sb, propName, propValue); + appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modelModifyUser", username); - query.setParameter("modelModifyDatetime", getNowTime(true)); - query.setParameter("modelIsValid", status); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelIsValid",status); - setParameter(query, propName, propValue); + setParameter(query,propName,propValue); return query.executeUpdate(); - } else { - throw new IllegalArgumentException("修改状态失败：" + propName + ":" + propValue); + }else{ + throw new IllegalArgumentException("修改状态失败："+propName+":" + propValue); } } @Override public boolean isExitByProperty(String propertyName, Object value) { //大于0，存在 - return findByPropertyCount(propertyName, value) > 0; + return findByPropertyCount(propertyName,value) > 0; } @Override @@ -1388,7 +1384,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) { - return findByHqlWhereCount(hqlWhere, propertyNames, values) > 0; + return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0; } @Override @@ -1418,7 +1414,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findSumByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); + return findSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override @@ -1427,46 +1423,46 @@ public class BaseRepositoryImpl extends SimpleJpaRep StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if (StringUtils.isNotBlank(groupByName)) { + if(StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query, paramName, paramValue); + setParameter(query,paramName,paramValue); return getNumberByResultList(query.getResultList()); - } else { + }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findAvgByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); + return findAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select avg(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); - appendQL(sb, paramName, paramValue); + StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); - if (StringUtils.isNotBlank(groupByName)) { + if(StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query, paramName, paramValue); + setParameter(query,paramName,paramValue); return getNumberByResultList(query.getResultList()); - } else { + }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findMaxByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findMaxByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); + return findMaxByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override @@ -1474,22 +1470,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if (StringUtils.isNotBlank(groupByName)) { + if(StringUtils.isNotBlank(groupByName)){ sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query, paramName, paramValue); + setParameter(query,paramName,paramValue); return getNumberByResultList(query.getResultList()); - } else { + }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } @Override public double findMinByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return findMinByProperties(sumPropertyName, groupByName, new String[]{propertyName}, new Object[]{value}); + return findMinByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override @@ -1498,28 +1494,28 @@ public class BaseRepositoryImpl extends SimpleJpaRep StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - if (StringUtils.isNotBlank(groupByName)) { + if(StringUtils.isNotBlank(groupByName)) { sb.append(" group by model." + groupByName); } Query query = entityManager.createQuery(sb.toString()); - setParameter(query, paramName, paramValue); + setParameter(query,paramName,paramValue); return getNumberByResultList(query.getResultList()); - } else { + }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } //从结果集中获取数字转换 - public double getNumberByResultList(List objList) { + public double getNumberByResultList(List objList){ double num = 0.0; - if (objList != null && objList.size() > 0) { - if (objList.get(0) != null) { + if(objList != null && objList.size() > 0){ + if(objList.get(0) != null){ try { num = Double.parseDouble(objList.get(0).toString()); - } catch (NumberFormatException ne) { - LOGGER.error("数字转换出错!", ne); + }catch(NumberFormatException ne){ + LOGGER.error("数字转换出错!",ne); } } } From b375983304f257d2ea1cb6efa6564ea7cda99217 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 23 Aug 2019 16:54:56 +0800 Subject: [PATCH 04/15] =?UTF-8?q?mes=E6=9D=A1=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99CURD=E5=8F=8Amesbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 2 +- .../mes/repository/MesNumberRuleRepository.java | 17 ++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 26 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index ab0ae70..edbbdeb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean { @Column(name = "PREFIX") @ApiParam("前缀") - private Integer prefix; + private String prefix; @Column(name = "NUMBER_RULE") @ApiParam("编码规则") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java new file mode 100644 index 0000000..5ee49bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description :条码生成规则 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-23 + * @Modify: + **/ +@Repository +public interface MesNumberRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 648be8b..b509989 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1077,4 +1077,30 @@ public class MesHqlPack { } return packBean; } + + + /** + * Mes条码生成规则 + * @param numberRule + * @param organizeCode + * @return + */ + public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode); + if (StringUtils.isNotEmpty(numberRule.getRuleCode())) { + DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean); + } + if (StringUtils.isNotEmpty(numberRule.getNumberRule())) { + DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); + } + if (StringUtils.isNotEmpty(numberRule.getPrefix())) { + DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); + } + if (null != numberRule.getIsCycle()) { + DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); + } + + packBean.setOrderByStr(numberRule.orderBy()); + return packBean; + } } From 3b3ddd581a6de2201e7f6a2eb591bdd8621b6dc1 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 23 Aug 2019 17:58:27 +0800 Subject: [PATCH 05/15] =?UTF-8?q?mest=E6=9D=A1=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9C=80=E5=A4=A7=E5=80=BC=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e140fef..3dbbb91 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes条码生成规则最大值后是否循环 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NUMBER_RULE_ISCYCLE { + + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + NUMBER_RULE_ISCYCLE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 关键件条码规则信息绑定规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 3f5f89bd1b5dc1f84010640aadd6ca2e4b31ccd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 25 Aug 2019 00:13:25 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96ID=E7=9C=9F=E5=AE=9E=E5=80=BC?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E7=BB=84=E4=BB=B6=E7=BC=93=E5=AD=98=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=88=E6=89=8B=E5=B7=A5=E9=A2=86=E6=96=99=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 319e6d5..1ea54c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -75,15 +75,15 @@ public class WmsActionGroup extends BaseBean { private Integer submitStepSeq; public long getInitAmIdVal() { - return this.initAmId == null ? 0 : this.initAmId.intValue(); + return this.initAmId == null ? 0 : this.initAmId.longValue(); } public long getDetailsAmIdVal() { - return this.detailsAmId == null ? 0 : this.detailsAmId.intValue(); + return this.detailsAmId == null ? 0 : this.detailsAmId.longValue(); } public long getEndAmIdVal() { - return this.endAmId == null ? 0 : this.endAmId.intValue(); + return this.endAmId == null ? 0 : this.endAmId.longValue(); } public int getAutoInitVal() { From 12a2a27b18caee4a678812d3b01bc8b96bf0b695 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 26 Aug 2019 10:28:01 +0800 Subject: [PATCH 07/15] =?UTF-8?q?mes=EF=BC=8C=20pcn=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 11 +++-- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 6 +-- .../MesLabelTemplateParamRepository.java | 13 ++---- .../pcn/repository/MesLabelTemplateRepository.java | 13 ++---- .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 52 +++++++++++++++++++++ .../pojo/mes/bean/MesLabelTemplateParam.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 50 ++++++++++++++++++++ .../i3plus/pojo/mes/model/MesPcnStatusModel.java | 15 ++++++ .../MesLabelTemplateParamRepository.java | 14 ++++++ .../mes/repository/MesLabelTemplateRepository.java | 14 ++++++ .../repository/MesPcnSyncErrorLogRepository.java | 16 +++++++ .../model/platform/LabelTemplateAndParamModel.java | 17 +++++++ .../pojo/platform/bean/SysLabelTemplate.java | 5 ++ 13 files changed, 258 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java index 901111a..1f19e69 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -9,12 +9,13 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 打印模板 * @Reference : - * @Author : siliter - * @CreateDate : 2019-03-18 11:00 + * @Author : crish + * @CreateDate : 2019-08-18 11:00 * @Modify: **/ @Data @@ -22,7 +23,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="Mes_LABEL_TEMPLATE") +@Table(name="MES_LABEL_TEMPLATE") @Api(value="打印模板",description = "打印模板") public class MesLabelTemplate extends BaseBean { @@ -44,4 +45,8 @@ public class MesLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") @Transient private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java index bb87217..c93ff80 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -15,8 +15,8 @@ import javax.persistence.*; /** * @Description : 打印模板参数 * @Reference : - * @Author : siliter - * @CreateDate : 2019-03-18 11:00 + * @Author : crish + * @CreateDate : 2019-08-18 11:00 * @Modify: **/ @Data @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="Mes_LABEL_TEMPLATE_PARAM") +@Table(name="MES_LABEL_TEMPLATE_PARAM") @Api(value="打印模板参数",description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java index 6236031..b74b509 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; -import org.springframework.stereotype.Repository; /** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ -@Repository public interface MesLabelTemplateParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java index 8b71fac..1895f29 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; -import org.springframework.stereotype.Repository; /** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ -@Repository public interface MesLabelTemplateRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java new file mode 100644 index 0000000..e0db91a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.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.*; +import java.util.List; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_LABEL_TEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class MesLabelTemplate extends BaseBean { + + private static final long serialVersionUID = 5371856566557305323L; + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Lob + @Column(name="TEMPLATE_CONTENT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..592450e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.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.*; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_LABEL_TEMPLATE_PARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean { + + private static final long serialVersionUID = 6476163540527157643L; + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_PARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java new file mode 100644 index 0000000..f17d4ad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.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: crish + * @CreateDate:2019-08-23-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_SYNC_ERRORLOG") +@Api("MES_PCN同步异常日志") +public class MesPcnSyncErrorLog extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name="OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name="ERROR_SPOT") + @ApiParam("异常位置") + private String errorSpot; + + @Column(name="ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java new file mode 100644 index 0000000..6e605b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +/** + * @Description: PCN连接状态统计Model + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-07-14:56 + * @Modify: + **/ +public class MesPcnStatusModel { + + private int healthNodeNumber; + + private int illNodeNumber; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..132c99d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..55f667a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..c87f581 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncErrorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java new file mode 100644 index 0000000..caa6b4b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 获取打印模板和打印模板参数表的所有信息 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-23-11:38 + * @Modify: + **/ +@Data +class LabelTemplateAndParamModel implements Serializable { + private static final long serialVersionUID = -3612131411549787983L; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 339fb7e..dbfbd1a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; import javax.persistence.*; +import java.util.List; /** * @Description : 打印模板 @@ -45,4 +46,8 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") @Transient private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; } From 1f1a9c39fc2c04e987eeabd14b65fcc060b36f4e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 23 Aug 2019 20:11:49 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 2328a81..a549eee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -209,8 +209,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { - COMMON(1, "通用"),EXCEPTION(2, "异常"), - MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), + COMMON(1, "通用"), + EXCEPTION(2, "异常"), + MODULE(10, "模块"), + METHOD(11, "功能"), + BUTTON(12, "按钮"), WEB(13, "前端"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 82b0e3c..6c2a780 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1022,7 +1022,8 @@ public class ImppEnumUtil { PASSWORD(2, "密码安全策略"), MAIL(3, "邮件配置"), CONTACT(4, "联系人"), - BASIS(5, "基础"); + BASIS(5, "基础"), + CONFIG(6, "系统配置"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index dbfbd1a..457f603 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -43,7 +43,10 @@ public class SysLabelTemplate extends BaseBean { private String templateContent; // 参数拼接，多参数都好分隔，后台在做处理 + @Transient @ApiParam(value ="模板参数拼接") + private String paramsPack; + @Transient private String paramsPack; From cf026d6dee5a8cc5bd364111b3465ed391a42e83 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 26 Aug 2019 11:12:56 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 457f603..63e0250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -48,9 +48,6 @@ public class SysLabelTemplate extends BaseBean { private String paramsPack; @Transient - private String paramsPack; - - @Transient @ApiParam(value ="模板id对应的模板参数") private List labelTemplateParamList; } From 11aff72404483f62924b0a378ffa46c35c9f5d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 26 Aug 2019 15:14:24 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index a01642f..f0201cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -81,4 +81,31 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_CHECK_SN") @ApiParam("是否校验条码") public Integer isCheckSn; + + @Transient + @ApiParam("计划日期") + private String zdate; + + @Transient + @ApiParam("计划时间") + private String ztime; + + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfo(){}; + + public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } From 18eff49e63b3060a8854c863a1003af585251e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 26 Aug 2019 17:05:45 +0800 Subject: [PATCH 11/15] =?UTF-8?q?hql=E8=AF=AD=E5=8F=A5=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4dffc39..8398302 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -45,7 +45,9 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + } return hqlStr; } From 12f6e2c14b19a230422d9e8e4e5c7eba96f058f7 Mon Sep 17 00:00:00 2001 From: wangjie Date: Mon, 26 Aug 2019 19:04:08 +0800 Subject: [PATCH 12/15] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 75 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 75 ++++++++++++++++++++++ .../pojo/mes/repository/MesPcnTaskRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 19 ++++++ 4 files changed, 185 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java new file mode 100644 index 0000000..0ccb531 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java new file mode 100644 index 0000000..27daf23 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..cd51761 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b509989..511125e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1103,4 +1103,23 @@ public class MesHqlPack { packBean.setOrderByStr(numberRule.orderBy()); return packBean; } + + /** + * mes-pcn定时任务清单 + * @param mesPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); + if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + } + if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + } + + packBean.setOrderByStr(mesPcnTask.orderBy()); + return packBean; + } } From 2ef0dd5c3bd42d0a67e17d324160156712365dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 27 Aug 2019 19:15:24 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=91=A8=E6=9C=9F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 6b239f8..eac48cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean { @Column(name = "NOTICE_CHANNEL") @ApiParam(value = "通知渠道") private String noticeChannel; + + public int getTaskPlanStatusVal() { + if(taskPlanStatus != null){ + return taskPlanStatus.intValue(); + } + return taskPlanStatus; + } } From f820c449bb13b536901d968e9cc2dc5eb8b564b2 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 27 Aug 2019 20:29:36 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../pojo/mes/pcn/model/StepPrintSnModel.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java new file mode 100644 index 0000000..bd0498c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("过程条码打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; +} From 592cd15add20850b77c9086d831a130505676ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 27 Aug 2019 20:33:27 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E5=BA=93=E4=BD=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 203bbce..f324149 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1139,8 +1139,7 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"), - TEST(50, "调试"); + HANDLE_ERROR(40, "处理出错"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 4c288f4..4bc52e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库位表 @@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "零件数", example = "-1") private Double partQty; + // 导入用 + @ApiParam(value = "工厂") + @Transient + private String factory; + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); }