diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 36b6510..2fdc2ab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -62,6 +62,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") + @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="is_valid") @@ -78,18 +79,22 @@ public abstract class BaseBean implements Serializable { @Column(name="create_user",updatable = false) @ApiParam(value = "创建用户") + @AnnoOutputColumn(hidden = true) public String createUser; @Column(name="create_date",updatable = false) @ApiParam(value = "创建日期") + @AnnoOutputColumn(hidden = true) public String createDatetime; @Column(name="modify_user") @ApiParam(value = "修改人") + @AnnoOutputColumn(hidden = true) public String modifyUser; @Column(name="modify_date") @ApiParam(value = "修改日期") + @AnnoOutputColumn(hidden = true) public String modifyDatetime; @Transient 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 17db269..a01d4cc 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 @@ -194,7 +194,8 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { COMMON(1, "通用"),EXCEPTION(2, "异常"), - MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"); + MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), + WEB(13, "前端"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java index cd67174..f81e238 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java @@ -340,7 +340,7 @@ public class BaseMongoRepositoryImpl extends SimpleM @Override public long deleteByIds(ID[] ids) { - return deleteByPropertyIn("id",ids); + return deleteByPropertyIn("_id",ids); } } 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 e613ca1..3b6f931 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 @@ -365,7 +365,8 @@ 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(); + 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; @@ -402,7 +403,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep } try{ - return (T) queryObject.getSingleResult(); + List list = queryObject.getResultList(); + return list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在",ne); return null; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java index e9daa0f..37c5121 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java @@ -11,23 +11,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; **/ public class TestInfo extends BaseBean { - /** - * 内存信息 - */ - private double ram; /** - * cpu信息 + * 执行耗时 */ - private double cpu; + private long executeTime; - /** - * 线程id - */ - private String threadId; + public TestInfo(){ - /** - * 方法名 - */ - private String method; + } + + public TestInfo(long executeTime){ + this.executeTime = System.currentTimeMillis() - executeTime; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 59f7c19..c4bedb4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -82,4 +82,19 @@ public class CoreBsonPack { return bson; } -} + + /** + * 区间 + * @param colName + * @param min + * @param max + * @return + */ + public static Bson packBsonByInterval(String colName,Object min,Object max){ + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumBiggerPack(min,colName,bson); + bson = BsonPackTool.getNumSmallerPack(max,colName,bson); + + return bson; + }} 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 0041386..93c8c1e 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 @@ -552,6 +552,7 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -602,4 +603,14 @@ public class CoreHqlPack { return result.toString(); } + + + public static String packHqlByInterval(String columnName,Object min,Object max){ + StringBuffer result = new StringBuffer(); + + HqlPack.getNumSmallerPack(max,columnName,result); + HqlPack.getNumBiggerPack(min,columnName,result); + + return result.toString(); + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 8cc144b..88be0d5 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -63,9 +63,13 @@ public class BrLayoutColumn extends BaseBean { private String columnStyle; @Column(name="COLUMN_SEQ") - @ApiParam(value ="排序") + @ApiParam(value ="序列") private Integer columnSeq; + @Column(name="COLUMN_SORT") + @ApiParam(value ="排序，降序") + private Integer columnSort; + @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") @ApiParam(value ="列描述") private String columnDescription; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index ab8d365..a7a82de 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -45,8 +45,10 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行高") private Integer rowHeight; - @Column(name="ROW_SEQ") + @Column(name="ROW_SORT") @ApiParam(value ="排序") + private Integer rowSort; + private Integer rowSeq; @Column(name="ROW_STYLE",columnDefinition = "TEXT") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 4e295e3..ff56863 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -119,12 +119,12 @@ public class ReportHqlPack { * @param rowId * @return */ - public static String packHqlBrLayoutColumnByRowIdSortBySeq(Long rowId){ + public static String packHqlBrLayoutColumnByRowIdSort(Long rowId){ StringBuffer result = new StringBuffer(); // 查询参数封装 HqlPack.getNumEqualPack(rowId,"layoutRowId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSeq","modifyDatetime"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSort","modifyDatetime"},result); return result.toString(); } @@ -134,12 +134,12 @@ public class ReportHqlPack { * @param layoutId * @return */ - public static String packHqlBrLayoutRowByLayoutIdSortBySeq(Long layoutId){ + public static String packHqlBrLayoutRowByLayoutIdSort(Long layoutId){ StringBuffer result = new StringBuffer(); // 查询参数封装 HqlPack.getNumEqualPack(layoutId,"layoutId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSeq","modifyDatetime"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSort","modifyDatetime"},result); return result.toString(); } diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index c0d750c..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-softswitch jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java new file mode 100644 index 0000000..eaa600d --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-02-28 15:48 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="TEST_DATA_BASE") +@Api(value="测试数据 DataBase",description = "数据库操作测试") +public class TestDataBase extends BaseBean { + + @Column(name="NAME") + @ApiParam(value ="名称" ) + private String name; + + @Column(name="TYPE") + @ApiParam(value ="测试类型" ) + private Integer type; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java new file mode 100644 index 0000000..3cf2b11 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-02-28 15:48 + * @Modify: + **/ +public interface TestDataBaseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java new file mode 100644 index 0000000..5f721ec --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.softswitch.sqlpack; + +import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import org.apache.commons.lang3.StringUtils; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-02-28 16:05 + * @Modify: + **/ +public class SoftswitchHqlPack { + + + /** + * In 参数封装 + * @param columnName + * @return + */ + public static String packHqlIds(String columnName,String[] params){ + StringBuffer result = new StringBuffer(); + + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(String.join(",",params),columnName,result); + return result.toString(); + } + + /** + * 目录查询封装 + * @param testDataBase + * @return + */ + public static String packHqlTestDataBase(TestDataBase testDataBase){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getStringLikerPack(testDataBase.getName(),"name",result); + + return result.toString(); + } + +}