权限分配调整接口

消息调整添加微服务支持
添加sweb通知处理队列

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -423,12 +423,14 @@ public class ImppEnumUtil {
      * 用户消息类型
      * 1.NOTICE：通知
      * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE {
 
         MAIL(1,"邮件","邮件"),
-        LETTER(2,"站内信","站内信");
+        LETTER(2,"站内信","站内信"),
+        SWEB_NOTICE(3,"SWEB通知","SWEB通知");
 
         private int value;
         private String name;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java

@@ -35,6 +35,10 @@ public class BfMethodDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
+    @Column(name="METHOD_NAME_RDD")
+    @ApiParam(value ="功能名称")
+    private String methodNameRdd;
+
     @Column(name="layout_column_id")
     @ApiParam(value ="布局列id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java

@@ -38,6 +38,10 @@ public class BfRefMethodRole extends BaseBean {
     @ApiParam(value = "表单功能名称")
     private String methodNameRdd;
 
+    @Column(name = "METHOD_LAYOUT_NAME_RDD")
+    @ApiParam(value = "功能布局名称")
+    private String methodLayoutNameRdd;
+
     @Column(name = "ROLE_ID")
     @ApiParam(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -214,4 +214,37 @@ public final class FormHqlPack {
 
         return ddlPackBean;
     }
+
+    /**
+     * 按钮功能关系数据查询条件
+     * @param bfRefButtonMethod 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
+        ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 功能权限数据查询条件
+     * @param bfRefMethodRole 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
+        ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttachment.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 文件附件
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-04-11 16:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_FILE_ATTACH")
+@Api(value="文件附件",description = "文件附件")
+public class SysFileAttachment extends BaseBean {
+
+    @Column(name="ATTACH_SOFT_TYPE")
+    @ApiParam(value ="附件所属模块")
+    private Integer attachSoftType;
+
+    @Column(name="ATTACH_SOURCE")
+    @ApiParam(value ="附件来源")
+    private Integer attachSource;
+
+    @Column(name="REF_ID")
+    @ApiParam(value ="关联id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long refId;
+
+    @Column(name="FILE_ID")
+    @ApiParam(value ="文件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long fileId;
+
+    @Column(name="FILE_NAME_RDD")
+    @ApiParam(value ="文件名称冗余")
+    private String fileNameRdd;
+
+    @Column(name="FILE_PATH_RDD")
+    @ApiParam(value ="文件路径冗余")
+    private String filePathRdd;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,10 +10,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Subselect;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 系统消息
@@ -34,10 +38,22 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "消息标题", access = "消息标题")
     private String messageTitle;
 
+    @Column(name = "MESSAGE_SOFT_TYPE")
+    @ApiParam(value = "消息所属模块")
+    private Integer messageSoftType;
+
     @Column(name = "MESSAGE_TYPE")
     @ApiParam(value = "消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1")
     private Integer messageType;
 
+    public int getMessageTypeValue() {
+        if(this.messageType == null){
+            return ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue();
+        } else {
+            return this.messageType.intValue();
+        }
+    }
+
     @Column(name = "MESSAGE_TYPE_CONTENT")
     @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
     private Integer messageContentType;
@@ -78,4 +94,46 @@ public class SysMessage extends BaseBean {
     @Column(name = "IS_SYSTEM")
     @ApiParam(value = "是否系统邮件")
     private Integer isSystem;
+
+    @Transient
+    @ApiParam(value = "阅读统计")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long readCount;
+
+    public SysMessage() {
+    }
+
+    public SysMessage(
+            Long id, String messageTitle, Integer messageSoftType, Integer messageType, Integer messageContentType,
+            String messageContent, Long messageSenderId, String messageSenderNameRdd, Integer messageReceiverType,
+            String messageReceiversId, String messageReceiversNameRdd, String messageSendTime, Integer isUrgent,
+            Integer isSystem, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
+            String modifyUser, String modifyDatetime, Long readCount) {
+        this.id = id;
+        this.messageTitle = messageTitle;
+        this.messageSoftType = messageSoftType;
+        this.messageType = messageType;
+        this.messageContentType = messageContentType;
+        this.messageContent = messageContent;
+        this.messageSenderId = messageSenderId;
+        this.messageSenderNameRdd = messageSenderNameRdd;
+        this.messageReceiverType = messageReceiverType;
+        this.messageReceiversId = messageReceiversId;
+        this.messageReceiversNameRdd = messageReceiversNameRdd;
+        this.messageSendTime = messageSendTime;
+        this.isUrgent = isUrgent;
+        this.isSystem = isSystem;
+        this.readCount = readCount;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    @Transient
+    @ApiParam(value = "附件集合")
+    private List<SysFileAttachment> sysFileAttachmentList;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -39,6 +40,10 @@ public class SysRefUserMessage extends BaseBean {
     @ApiParam(value ="冗余消息标题")
     private String messageTitleRdd;
 
+    @Column(name="MESSAGE_SOFT_TYPE")
+    @ApiParam(value ="消息所属模块")
+    private Integer messageSoftType;
+
     @Column(name="MESSAGE_TYPE_RDD")
     @ApiParam(value ="冗余消息类型")
     private Integer messageTypeRdd;
@@ -67,4 +72,12 @@ public class SysRefUserMessage extends BaseBean {
     @Column(name="MESSAGE_STATUS")
     @ApiParam(value = "消息状态")
     private Integer messageStatus;
+
+    public int getMessageStatusValue() {
+        if(this.messageStatus == null){
+            return ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue();
+        } else {
+            return messageStatus.intValue();
+        }
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -292,22 +292,26 @@ public class CoreHqlPack {
      * @param message
      * @return
      */
-    public static String packHqlSysMessage(SysMessage message){
+    public static DdlPackBean packHqlSysMessage(SysMessage message){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean ddlPackBean = new DdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(message.getMessageTitle(),"messageTitle",result);
+        DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
-        HqlPack.getStringLikerPack(message.getMessageContent(),"messageContent",result);
+        DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
-        HqlPack.getNumEqualPack(message.getMessageType(),"messageType",result);
+        DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
-        HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
+        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
-        HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
+                ddlPackBean);
-        HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
+        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
-        HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
+                ddlPackBean);
-
+        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
-        // 添加默认排序
+                false, false);
-        HqlPack.getOrderDefault(message);
+        DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(message.orderBy());
 
-        return  result.toString();
+        return  ddlPackBean;
     }
 
     /**