From 16daf7c1b9e5d5e89a6f7e1c8effcad3ea5076a5 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 12 Feb 2019 17:46:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- .../i3plus/pojo/base/dynamic/DynamicBean.java | 87 ++++++++++++++++++++ .../i3plus/pojo/base/dynamic/DynamicEntity.java | 93 ++++++++++++++++++++++ modules/i3plus-pojo-form/pom.xml | 6 ++ .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 7 +- 5 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java 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 2284856..68df07e 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 @@ -52,7 +52,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") - private String organizeCode; + public String organizeCode; @Column(name="is_valid") @ApiParam(value = "有效性",example = "1") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java new file mode 100644 index 0000000..577139e --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.base.dynamic; + +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 org.springframework.cglib.beans.BeanGenerator; +import org.springframework.cglib.beans.BeanMap; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Map; + +/** + * @Description : 动态转换对象，用于配合dynamicEntity进行动态属性添加 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-01-23 13:45 + * @Modify: + **/ +public class DynamicBean { + + @ApiParam(value ="目标对象") + private Object target; + + @ApiParam(value ="属性集合") + private BeanMap beanMap; + + public DynamicBean(){ + } + + public DynamicBean(Class superclass, Map propertyMap) { + this.target = generateBean(superclass, propertyMap); + this.beanMap = BeanMap.create(this.target); + } + + + /** + * bean 添加属性和值 + * + * @param property + * @param value + */ + public void setValue(String property, Object value) { + beanMap.put(property, value); + } + + /** + * 获取属性值 + * + * @param property + * @return + */ + public Object getValue(String property) { + return beanMap.get(property); + } + + /** + * 获取对象 + * + * @return + */ + public Object getTarget() { + return this.target; + } + + + /** + * 根据属性生成对象 + * + * @param superclass + * @param propertyMap + * @return + */ + private Object generateBean(Class superclass, Map propertyMap) { + BeanGenerator generator =new BeanGenerator(); + if(null != superclass) { + generator.setSuperclass(superclass); + } + BeanGenerator.addProperties(generator, propertyMap); + return generator.create(); + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java new file mode 100644 index 0000000..2fcee00 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -0,0 +1,93 @@ +package cn.estsh.i3plus.pojo.base.dynamic; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; + +/** + * @Description : 基础动态对象，包含方法、参数等 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-01-24 15:56 + * @Modify: + **/ +public class DynamicEntity extends BaseBean { + + private String method; + private String uri; + private Object[] args; + private Object result; + private String operator; + private String appName; + + /** + * 获取当前对象 + * + * @param method + * @param uri + * @param args + * @param result + * @return + */ + public DynamicEntity get(String method, String uri, Object[] args, Object result, String operator, String appName) { + setMethod(method); + setUri(uri); + setArgs(args); + setResult(result); + setOperator(operator); + setAppName(appName); + return this; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public Object[] getArgs() { + return args; + } + + public void setArgs(Object[] args) { + this.args = args; + } + + public Object getResult() { + return result; + } + + public void setResult(Object result) { + this.result = result; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } +} diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f58676d..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-form jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index fd5393e..d1f885a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -10,10 +10,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -29,7 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_MENU") +@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { From 295d4c9ac9ab6a546a22f7b06ac4ffd013a63e32 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Feb 2019 18:06:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=B8=83=E5=B1=80=20?= =?UTF-8?q?=E8=A1=8C=E9=AB=98,=E5=88=97=E5=AE=BD=E8=AE=BE=E7=BD=AE=20Mongo?= =?UTF-8?q?DB=20id=20=E6=98=A0=E5=B0=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 2284856..b73a8e0 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -50,6 +51,15 @@ public abstract class BaseBean implements Serializable { } } + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") private String organizeCode; From fef135791c7fe3ded904313972ba9348e918f050 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 13 Feb 2019 17:22:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=80=9A=E7=9F=A5=20=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=E7=B1=BB=E5=9E=8B=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20BaseResultBean=20=E6=B7=BB=E5=8A=A0=E9=98=9F?= =?UTF-8?q?=E5=88=97=E7=9B=91=E5=90=AC=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysTaskPlan.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 76e310a..4a3d8de 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 @@ -83,11 +83,31 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value ="任务计划描述" , access ="任务计划描述") private String taskPlanDescription; + // 枚举 CommonEnumUtil.TRUE_OR_FALSE @Column(name="TASK_PLAN_STATUS") - @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="任务状态" , example ="1") private Integer taskPlanStatus; @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; + + // 枚举 CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_NOTICE") + @ApiParam(value = "是否通知", example = "1") + private Integer isNotice; + + // 枚举 CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_INTERNAL_USER") + @ApiParam(value = "是否内部用户", example = "1") + private Integer isInternalUser; + + // 枚举 ImppEnumUtil.MESSAGE_TYPE + @Column(name = "NOTICE_METHOD") + @ApiParam(value = "通知方式", example = "1") + private Integer noticeMethod; + + @Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT") + @ApiParam(value = "通知渠道") + private String noticeChannel; } From db8a4fbe6f7cafecb88a3609a0bb2f9ec398f13f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Feb 2019 10:08:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/AnnoIgnoreLog.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java new file mode 100644 index 0000000..fc3a4ee --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : 忽略生成日志 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-02-14 10:35 + * @Modify: + **/ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoIgnoreLog { +} From d52a17b131a499f04d1ccf126476cb3c577631fa Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 18 Feb 2019 16:44:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index d1f885a..da33264 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -26,7 +26,8 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) +//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) +@Table(name="SYS_MENU") @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { From 23450c02186be64a7a55318cb318c45d721b28fc Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 22 Feb 2019 11:47:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/ListPager.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 3 ++- .../cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ListPager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ListPager.java index 9859eb4..a77ea31 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ListPager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ListPager.java @@ -13,6 +13,9 @@ import java.util.List; **/ public class ListPager { + public ListPager() { + } + public ListPager(List objectList, Pager objectPager) { this.objectList = objectList; this.objectPager = objectPager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index d1f885a..da33264 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -26,7 +26,8 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) +//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) +@Table(name="SYS_MENU") @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 1080a6c..543dac6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -57,6 +57,10 @@ public class SysLogOperate extends BaseBean { @ApiParam(value ="操作信息" , access ="操作信息") private String operateMessage; + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登录用户名称" , access ="登录用户名称") + private String userLoginName; + @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; 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 179f9b2..8f8cab8 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 @@ -592,4 +592,13 @@ public class CoreHqlPack { return result.toString(); } + + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ + StringBuffer result = new StringBuffer(); + + HqlPack.getInPack(StringUtils.join(ids,","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + + return result.toString(); + } } \ No newline at end of file