From aa2a5b62af7cba92143dcb92c8a164b3b01f53cf Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 21 Jul 2021 14:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=8B=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=85=B3=E8=81=94=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/WorkUserEventTagRelationFormDTO.java | 32 ++++++++++++++ .../WorkUserEventTagRelationResultDTO.java | 44 +++++++++++++++++++ .../controller/RoleEventsTagController.java | 16 +++++++ .../elink/esua/epdc/dao/RoleEventsTagDao.java | 12 +++++ .../epdc/service/RoleEventsTagService.java | 12 +++++ .../impl/RoleEventsTagServiceImpl.java | 10 +++++ .../resources/mapper/RoleEventsTagDao.xml | 19 ++++++++ esua-epdc/epdc-gateway/pom.xml | 12 ++--- .../epdc/controller/ApiAdminController.java | 20 +++++++++ .../esua/epdc/feign/AdminFeignClient.java | 13 ++++++ .../fallback/AdminFeignClientFallback.java | 7 +++ .../elink/esua/epdc/service/AdminService.java | 16 ++++++- .../epdc/service/impl/AdminServiceImpl.java | 7 +++ 13 files changed, 212 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/WorkUserEventTagRelationFormDTO.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/WorkUserEventTagRelationResultDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/WorkUserEventTagRelationFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/WorkUserEventTagRelationFormDTO.java new file mode 100644 index 00000000..69faf384 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/WorkUserEventTagRelationFormDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/21 13:33 + */ +@Data +public class WorkUserEventTagRelationFormDTO implements Serializable { + private static final long serialVersionUID = -8443508933049274341L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 事件标签ID + */ + private String eventTagId; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/WorkUserEventTagRelationResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/WorkUserEventTagRelationResultDTO.java new file mode 100644 index 00000000..734395d4 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/WorkUserEventTagRelationResultDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/21 13:34 + */ +@Data +public class WorkUserEventTagRelationResultDTO implements Serializable { + private static final long serialVersionUID = -5886159562245131518L; + + /** + * 用户ID + */ + private Long id; + + /** + * 姓名 + */ + private String realName; + + /** + * 头像 + */ + private String headUrl; + + /** + * 性别 1：男 0：女 2：保密 + */ + private Integer gender; + + /** + * 手机号 + */ + private String mobile; + + /** + * 职务 + */ + private String position; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java index a14695e7..0e40fbbe 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java @@ -26,6 +26,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.RoleEventsTagDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.service.RoleEventsTagService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -84,4 +86,18 @@ public class RoleEventsTagController { return new Result(); } + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/21 13:47 + */ + @GetMapping("eventtagworkuser") + public Result> eventTagWorkUser(@RequestBody WorkUserEventTagRelationFormDTO formDto) { + List data = roleEventsTagService.eventTagWorkUser(formDto); + return new Result>().ok(data); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java index 571c5341..f2b6a00e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.entity.RoleEventsTagEntity; import org.apache.ibatis.annotations.Mapper; @@ -51,4 +53,14 @@ public interface RoleEventsTagDao extends BaseDao { * @since 2021/7/20 15:02 */ List selectListEventTagIdByRoleId(Long roleId); + + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return java.util.List + * @author liuchuang + * @since 2021/7/21 13:49 + */ + List eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java index 1e90f842..3b2502e9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java @@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.RoleEventsTagDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.entity.RoleEventsTagEntity; import java.util.List; @@ -114,4 +116,14 @@ public interface RoleEventsTagService extends BaseService { * @since 2021/7/20 15:02 */ List getEventTagIdList(Long roleId); + + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return java.util.List + * @author liuchuang + * @since 2021/7/21 13:49 + */ + List eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java index c7b0baa5..6bdc11ba 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java @@ -21,12 +21,15 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.RoleEventsTagDao; import com.elink.esua.epdc.dto.RoleEventsTagDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.entity.RoleEventsTagEntity; import com.elink.esua.epdc.service.RoleEventsTagService; import org.apache.commons.lang3.StringUtils; @@ -123,4 +126,11 @@ public class RoleEventsTagServiceImpl extends BaseServiceImpl eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + return baseDao.eventTagWorkUser(formDto); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml index 59e447b1..284a2697 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml @@ -11,4 +11,23 @@ SELECT EVENT_TAG_ID FROM epdc_role_events_tag WHERE DEL_FLAG = '0' AND role_id = #{roleId} + + diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index 7cecb02e..7cf88fec 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -101,12 +101,12 @@ lb://epdc-auth-server - lb://epdc-admin-server - + + http://127.0.0.1:9092 lb://epdc-activiti-server - - http://127.0.0.1:9040 + lb://epdc-api-server + lb://epdc-app-server @@ -118,8 +118,8 @@ http://127.0.0.1:9064 lb://epdc-oss-server - lb://epdc-events-server - + + http://127.0.0.1:9066 lb://epdc-services-server diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 500c7c4a..fb9dabe4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -3,6 +3,9 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -10,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 管理端对外接口 * @@ -48,4 +53,19 @@ public class ApiAdminController { public Result getScrip(@LoginUser TokenDto userDetail){ return adminService.getScrip(userDetail); } + + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/21 13:42 + */ + @GetMapping("eventtagworkuser") + public Result> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return adminService.eventTagWorkUser(formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index c060e1c2..8d2ca093 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -5,8 +5,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -198,4 +200,15 @@ public interface AdminFeignClient { **/ @GetMapping("sys/dept/party/getDeptTree") Result getAllDeptTree(); + + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/21 13:45 + */ + @GetMapping("sys/roleeventstag/eventtagworkuser") + Result> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 8a996cd6..ae4877c0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -6,8 +6,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import org.springframework.stereotype.Component; @@ -100,4 +102,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getAllDeptTree() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree"); } + + @Override + public Result> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "eventTagWorkUser", formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java index 27804d82..df6ff3b1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -2,7 +2,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; @@ -36,7 +38,7 @@ public interface AdminService { **/ Result getDefaultGridInfo(String dicType); /** - * @Description 获取临时凭证 + * @Description 获取临时凭证 * @Author songyunpeng * @Date 2020/6/22 * @Param [userDetail] @@ -78,11 +80,21 @@ public interface AdminService { **/ Result getUserDeptOptionByUserId(); /** - * @Description 获取customId + * @Description 获取customId * @Author songyunpeng * @Date 2021/1/27 * @Param [] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getCustomId(); + + /** + * 获取事件标签关联的工作端用户 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/21 13:44 + */ + Result> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index eeacc527..bb531ba0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -11,7 +11,9 @@ import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO; +import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO; +import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -144,4 +146,9 @@ public class AdminServiceImpl implements AdminService { public Result getCustomId() { return analysisFeignClient.getCustomId(); } + + @Override + public Result> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) { + return adminFeignClient.eventTagWorkUser(formDto); + } }