Merge branch 'master' into feature/yujt_propertyInit

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java

@@ -77,4 +77,14 @@ public class SysRoleDTO implements Serializable {
      * 数据端菜单ID列表
      */
     private List<Long> analysisMenuIdList;
+
+    /**
+     * 项目处理类型授权id列表
+     */
+    private List<String> categoryIdList;
+
+    /**
+     * 吹哨部门id列表
+     */
+    private List<Long> whistleDeptIdList;
 }

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryDTO.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.handlecategory;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 处理类别表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-20
+ */
+@Data
+public class HandleCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 处理类别值
+     */
+	private Integer categoryVal;
+
+    /**
+     * 处理类别显示信息
+     */
+    @NotBlank(message = "处理类别显示信息不能为空")
+	private String categoryLabel;
+
+    /**
+     * 可用状态(0-不可用，1-可用)
+     */
+	private String available;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+	/**
+	 * 处理类型编码
+	 */
+	@NotBlank(message = "处理类型编码不能为空")
+	private String categoryCode;
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryTreeDTO.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.handlecategory;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 角色授权tree返参dto
+ * @Author yinzuomei
+ * @Date 2019/12/24 10:19
+ */
+@Data
+public class HandleCategoryTreeDTO implements Serializable {
+
+	private static final long serialVersionUID = -445779738699117585L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 处理类别显示信息
+	 */
+	private String name;
+
+	private List<HandleCategoryTreeDTO> children= new ArrayList<>();
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/HandleRoleDeptDTO.java

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.handleroledept;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 处理部门角色权限表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-26
+ */
+@Data
+public class HandleRoleDeptDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 角色ID
+     */
+	private String roleId;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名称
+     */
+	private String deptName;
+
+    /**
+     * 部门机构类型
+     */
+	private String deptType;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/form/HandleRoleDeptFormDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.handleroledept.form;
+
+import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 保存角色对应的吹哨机构类型 入参DTO
+ * @Author yinzuomei
+ * @Date 2019/12/26 13:40
+ */
+@Data
+public class HandleRoleDeptFormDTO implements Serializable {
+	private static final long serialVersionUID = -8514999095093073286L;
+	/**
+	 * 角色ID
+	 */
+	private String roleId;
+
+	private List<HandleRoleDeptDTO> handleRoleDeptDTOList;
+
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/result/HandleRoleDeptPermissionDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.handleroledept.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 角色对应吹哨部门
+ * @Author yinzuomei
+ * @Date 2019/12/26 14:59
+ */
+@Data
+public class HandleRoleDeptPermissionDTO implements Serializable {
+	private static final long serialVersionUID = 8183862671970858166L;
+	/**
+	 * 部门ID
+	 */
+	private String deptId;
+
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 部门机构类型
+	 */
+	private String deptType;
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/HandleRoleCategoryDTO.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.rulecategory;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 角色和处理类别关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-20
+ */
+@Data
+public class HandleRoleCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 角色ID
+     */
+	private String roleId;
+
+    /**
+     * 处理类别ID
+     */
+	private String categoryId;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标识 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/form/HandleRoleCategoryFormDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.rulecategory.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 保存或修改 角色和处理类别关系 入参DTO
+ * @Author yinzuomei
+ * @Date 2019/12/24 12:12
+ */
+@Data
+public class HandleRoleCategoryFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -3295948468274114972L;
+
+	/**
+	 * 角色ID
+	 */
+	@NotBlank(message = "角色id不能为空")
+	private Long roleId;
+
+	/**
+	 * 处理类别ID
+	 */
+	private List<String> categoryIdList;
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/result/HandleRoleCategoryPermissionDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.rulecategory.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 角色对应项目处理类别
+ * @Author yinzuomei
+ * @Date 2019/12/26 15:08
+ */
+@Data
+public class HandleRoleCategoryPermissionDTO implements Serializable {
+	private static final long serialVersionUID = 1164343443504365039L;
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 处理类别值
+	 */
+	private Integer categoryVal;
+
+	/**
+	 * 处理类别显示信息
+	 */
+	private String categoryLabel;
+}