sunyuchao
4 years ago
21 changed files with 470 additions and 16 deletions
@ -0,0 +1,24 @@ |
|||||
|
package com.epmet.dataaggre.dto.epmetuser.form; |
||||
|
|
||||
|
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 对外接口--【通讯录】姓名检索工作人员-接口入参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ListStaffFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -3381286960911634231L; |
||||
|
/** |
||||
|
* 客户Id |
||||
|
*/ |
||||
|
@NotBlank(message = "姓名不能为空", groups = ListStaffFormDTO.Staff.class) |
||||
|
private String realName; |
||||
|
public interface Staff extends CustomerClientShowGroup {} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,28 @@ |
|||||
|
package com.epmet.dataaggre.dto.epmetuser.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 对外接口--【通讯录】姓名检索工作人员-接口返参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ListStaffResultDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 7129564173128153335L; |
||||
|
|
||||
|
//工作人员用户id
|
||||
|
private String staffId = ""; |
||||
|
//工作人员姓名
|
||||
|
private String staffName = ""; |
||||
|
//手机号
|
||||
|
private String mobile = ""; |
||||
|
//用户所属组织id
|
||||
|
private String agencyId = ""; |
||||
|
//用户所属组织全路径名称
|
||||
|
private String agencyAllName = ""; |
||||
|
//客户Id
|
||||
|
private String customerId = ""; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,31 @@ |
|||||
|
package com.epmet.dataaggre.dto.govorg.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 【通讯录】组织/部门/网格下人员列表-接口入参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class OrgStaffListFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -1974456701949979946L; |
||||
|
@NotBlank(message = "parentAgencyId不能为空",groups = AddUserInternalGroup.class) |
||||
|
private String parentAgencyId; |
||||
|
private String areaCode; |
||||
|
/** |
||||
|
* 社区级：community， |
||||
|
* 乡（镇、街道）级:street, |
||||
|
* 区县级: district, |
||||
|
* 市级: city |
||||
|
* 省级:province |
||||
|
*/ |
||||
|
@NotBlank(message = "level不能为空",groups = AddUserInternalGroup.class) |
||||
|
private String level; |
||||
|
|
||||
|
public interface AddUserInternalGroup { |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,31 @@ |
|||||
|
package com.epmet.dataaggre.dto.govorg.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 【通讯录】人员详情v2-接口返参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class StaffDetailV2FormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -1974456701949979946L; |
||||
|
@NotBlank(message = "parentAgencyId不能为空",groups = AddUserInternalGroup.class) |
||||
|
private String parentAgencyId; |
||||
|
private String areaCode; |
||||
|
/** |
||||
|
* 社区级：community， |
||||
|
* 乡（镇、街道）级:street, |
||||
|
* 区县级: district, |
||||
|
* 市级: city |
||||
|
* 省级:province |
||||
|
*/ |
||||
|
@NotBlank(message = "level不能为空",groups = AddUserInternalGroup.class) |
||||
|
private String level; |
||||
|
|
||||
|
public interface AddUserInternalGroup { |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,39 @@ |
|||||
|
/** |
||||
|
* 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.epmet.dataaggre.dto.govorg.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description 【通讯录】组织/部门/网格下人员列表-接口返参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class OrgStaffListResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 树结构对象 |
||||
|
*/ |
||||
|
private AgencyGridResultDTO agencyGridList; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,39 @@ |
|||||
|
/** |
||||
|
* 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.epmet.dataaggre.dto.govorg.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description 【通讯录】人员详情v2-接口返参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class StaffDetailV2ResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 树结构对象 |
||||
|
*/ |
||||
|
private AgencyGridResultDTO agencyGridList; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,68 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import lombok.NoArgsConstructor; |
||||
|
import org.hibernate.validator.constraints.Length; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import javax.validation.constraints.NotNull; |
||||
|
import javax.validation.constraints.Pattern; |
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author sun |
||||
|
* @dscription |
||||
|
*/ |
||||
|
@NoArgsConstructor |
||||
|
@Data |
||||
|
public class AddStaffV2FromDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 1L; |
||||
|
/** |
||||
|
* 客户ID |
||||
|
*/ |
||||
|
private String customerId; |
||||
|
/** |
||||
|
* 机关ID |
||||
|
*/ |
||||
|
private String agencyId; |
||||
|
/** |
||||
|
* 人员ID |
||||
|
*/ |
||||
|
private String staffId; |
||||
|
/** |
||||
|
* 姓名 |
||||
|
*/ |
||||
|
@NotBlank(message = "姓名不能为空") |
||||
|
@Length(max = 15, message = "姓名仅允许输入15个字符") |
||||
|
private String name; |
||||
|
/** |
||||
|
* 手机 |
||||
|
*/ |
||||
|
@NotBlank(message = "手机号不能为空") |
||||
|
@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "请输入正确的手机号") |
||||
|
private String mobile; |
||||
|
/** |
||||
|
* 性别 |
||||
|
*/ |
||||
|
@NotNull(message = "性别不能为空") |
||||
|
private Integer gender; |
||||
|
/** |
||||
|
* 专兼职 |
||||
|
*/ |
||||
|
@NotBlank(message = "专兼职不能为空") |
||||
|
private String workType; |
||||
|
/** |
||||
|
* 角色id列表 |
||||
|
*/ |
||||
|
@NotNull(message = "角色不能为空") |
||||
|
private List<String> roles; |
||||
|
/** |
||||
|
* 来源app(政府端:gov、居民端:resi、运营端:oper) |
||||
|
*/ |
||||
|
private String app; |
||||
|
/** |
||||
|
* 来源client(PC端:web、微信小程序:wxmp) |
||||
|
*/ |
||||
|
private String client; |
||||
|
} |
||||
@ -0,0 +1,35 @@ |
|||||
|
CREATE TABLE `staff_org_relation` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`PIDS` varchar(1024) NOT NULL COMMENT '所有上级组织机构ID(以英文:隔开)部门/网格得拼上所属组织Id', |
||||
|
`STAFF_ID` varchar(64) NOT NULL COMMENT '工作人员Id', |
||||
|
`ORG_ID` varchar(64) NOT NULL COMMENT '工作人员添加入口Id(agencyId;deptId;gridId)', |
||||
|
`ORG_TYPE` varchar(30) NOT NULL COMMENT '工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)', |
||||
|
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
PRIMARY KEY (`ID`) USING BTREE, |
||||
|
UNIQUE KEY `staffid_orgid` (`STAFF_ID`,`ORG_ID`) USING BTREE COMMENT '联合主键' |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='工作人员注册组织关系表'; |
||||
|
|
||||
|
INSERT INTO staff_org_relation SELECT |
||||
|
MD5(UUID()), |
||||
|
cs.CUSTOMER_ID, |
||||
|
ca.pids, |
||||
|
cs.USER_ID, |
||||
|
ca.id, |
||||
|
'agency', |
||||
|
'0', |
||||
|
'0', |
||||
|
'APP_USER', |
||||
|
NOW(), |
||||
|
'APP_USER', |
||||
|
NOW() |
||||
|
FROM |
||||
|
customer_staff_agency cs |
||||
|
INNER JOIN customer_agency ca ON cs.AGENCY_ID = ca.ID |
||||
|
WHERE cs.DEL_FLAG = '0'; |
||||
|
|
||||
@ -0,0 +1,25 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import lombok.NoArgsConstructor; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import javax.validation.constraints.NotEmpty; |
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author sun |
||||
|
* @dscription 接口入参--【通讯录】工作人员解禁 |
||||
|
*/ |
||||
|
@NoArgsConstructor |
||||
|
@Data |
||||
|
public class EnableStaffFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -5220529162950147825L; |
||||
|
/** |
||||
|
* 徽章名称 |
||||
|
*/ |
||||
|
@NotBlank(message = "徽章名称不能为空") |
||||
|
private String badgeName; |
||||
|
} |
||||
Loading…
Reference in new issue