获取事件标签关联的工作端用户列表接口 init

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;
+}

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;
+}

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<java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/21 13:47
+     */
+    @GetMapping("eventtagworkuser")
+    public Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(@RequestBody WorkUserEventTagRelationFormDTO formDto) {
+        List<WorkUserEventTagRelationResultDTO> data = roleEventsTagService.eventTagWorkUser(formDto);
+        return new Result<List<WorkUserEventTagRelationResultDTO>>().ok(data);
+    }
+
 }

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<RoleEventsTagEntity> {
      * @since 2021/7/20 15:02
      */
     List<String> selectListEventTagIdByRoleId(Long roleId);
+
+    /**
+     * 获取事件标签关联的工作端用户
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>
+     * @author liuchuang
+     * @since 2021/7/21 13:49
+     */
+    List<WorkUserEventTagRelationResultDTO> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto);
 }

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<RoleEventsTagEntity> {
      * @since 2021/7/20 15:02
      */
     List<String> getEventTagIdList(Long roleId);
+
+    /**
+     * 获取事件标签关联的工作端用户
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>
+     * @author liuchuang
+     * @since 2021/7/21 13:49
+     */
+    List<WorkUserEventTagRelationResultDTO> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto);
 }

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<RoleEventsTagDao,
         return baseDao.selectListEventTagIdByRoleId(roleId);
     }
 
+    @Override
+    public List<WorkUserEventTagRelationResultDTO> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        return baseDao.eventTagWorkUser(formDto);
+    }
+
 }

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}
     </select>
 
+    <select id="eventTagWorkUser" resultType="com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO">
+        SELECT
+            u.id,
+            u.real_name,
+            u.head_url,
+            u.gender,
+            u.mobile,
+            u.position
+        FROM
+            epdc_role_events_tag t
+            LEFT JOIN sys_role_user ru ON ru.role_id = t.ROLE_ID
+            LEFT JOIN sys_user u ON u.id = ru.user_id
+        WHERE
+            t.DEL_FLAG = '0'
+          AND t.EVENT_TAG_ID = #{eventTagId}
+          AND u.del_flag = 0
+          LIMIT #{pageIndex},#{pageSize}
+    </select>
+
 </mapper>

esua-epdc/epdc-gateway/pom.xml

@@ -101,12 +101,12 @@
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
 <!--                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>-->
-                                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+<!--                                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-<!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
                 </gateway.routes.epdc-activiti-server.uri>
-<!--                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
+<!--                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
 <!--                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>-->
@@ -118,8 +118,8 @@
                 <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
                 <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+<!--                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>-->
-                <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
+                                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->

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<String> getScrip(@LoginUser TokenDto userDetail){
         return adminService.getScrip(userDetail);
     }
+
+    /**
+     * 获取事件标签关联的工作端用户
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/21 13:42
+     */
+    @GetMapping("eventtagworkuser")
+    public Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return adminService.eventTagWorkUser(formDto);
+    }
+
 }

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<DeptOption> getAllDeptTree();
+
+    /**
+     * 获取事件标签关联的工作端用户
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/21 13:45
+     */
+    @GetMapping("sys/roleeventstag/eventtagworkuser")
+    Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto);
 }

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<DeptOption> getAllDeptTree() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree");
     }
+
+    @Override
+    public Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "eventTagWorkUser", formDto);
+    }
 }

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<String> getDefaultGridInfo(String dicType);
     /**
-     * @Description  获取临时凭证 
+     * @Description  获取临时凭证
      * @Author songyunpeng
      * @Date  2020/6/22
      * @Param [userDetail]
@@ -78,11 +80,21 @@ public interface AdminService {
      **/
     Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId();
     /**
-     * @Description  获取customId 
+     * @Description  获取customId
      * @Author songyunpeng
      * @Date  2021/1/27
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     Result<String> getCustomId();
+
+    /**
+     * 获取事件标签关联的工作端用户
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/21 13:44
+     */
+    Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto);
 }

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<String> getCustomId() {
         return analysisFeignClient.getCustomId();
     }
+
+    @Override
+    public Result<List<WorkUserEventTagRelationResultDTO>> eventTagWorkUser(WorkUserEventTagRelationFormDTO formDto) {
+        return adminFeignClient.eventTagWorkUser(formDto);
+    }
 }