From 429f1b90af0c90d91aa3714372888eb6065e15ae Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 15:30:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/RoleEventsTagDTO.java | 81 +++++++++++ .../com/elink/esua/epdc/dto/SysRoleDTO.java | 4 + .../controller/RoleEventsTagController.java | 87 ++++++++++++ .../controller/v2/SysRoleV2Controller.java | 9 +- .../elink/esua/epdc/dao/RoleEventsTagDao.java | 54 ++++++++ .../esua/epdc/entity/RoleEventsTagEntity.java | 51 +++++++ .../epdc/service/RoleEventsTagService.java | 117 ++++++++++++++++ .../impl/RoleEventsTagServiceImpl.java | 126 ++++++++++++++++++ .../epdc/service/impl/SysRoleServiceImpl.java | 6 + .../resources/mapper/RoleEventsTagDao.xml | 14 ++ .../events/controller/EventTagController.java | 18 ++- 11 files changed, 561 insertions(+), 6 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleEventsTagDTO.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/RoleEventsTagEntity.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleEventsTagDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleEventsTagDTO.java new file mode 100644 index 00000000..d8ce34cb --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleEventsTagDTO.java @@ -0,0 +1,81 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +@Data +public class RoleEventsTagDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 事件标签ID + */ + private String eventTagId; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 删除标识 0：未删除，1：已删除 + */ + private String delFlag; + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java index c73087fc..d47fd749 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java @@ -86,4 +86,8 @@ public class SysRoleDTO implements Serializable { * 吹哨部门id列表 */ private List whistleDeptIdList; + /** + * 事件标签授权id列表 + */ + private List eventsTagsIdList; } 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 new file mode 100644 index 00000000..a14695e7 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/RoleEventsTagController.java @@ -0,0 +1,87 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +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.service.RoleEventsTagService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +@RestController +@RequestMapping("roleeventstag") +public class RoleEventsTagController { + + @Autowired + private RoleEventsTagService roleEventsTagService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = roleEventsTagService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + RoleEventsTagDTO data = roleEventsTagService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody RoleEventsTagDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + roleEventsTagService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody RoleEventsTagDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + roleEventsTagService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + roleEventsTagService.delete(ids); + return new Result(); + } + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java index 6aceee10..9bf2e6f8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java @@ -17,10 +17,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.SysRoleDTO; import com.elink.esua.epdc.enums.AppMenuCategoryEnum; -import com.elink.esua.epdc.service.AppRoleMenuService; -import com.elink.esua.epdc.service.SysRoleDataScopeService; -import com.elink.esua.epdc.service.SysRoleMenuService; -import com.elink.esua.epdc.service.SysRoleService; +import com.elink.esua.epdc.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,6 +41,8 @@ public class SysRoleV2Controller { private SysRoleDataScopeService sysRoleDataScopeService; @Autowired private AppRoleMenuService appRoleMenuService; + @Autowired + private RoleEventsTagService roleEventsTagService; @GetMapping("{id}") public Result get(@PathVariable("id") Long id) { @@ -61,6 +60,8 @@ public class SysRoleV2Controller { data.setCategoryIdList(sysRoleService.getCategoryIdList(id)); //查询角色对应的吹哨部门 data.setWhistleDeptIdList(sysRoleService.getWhistleDeptIdList(id)); + // 查询角色对应的事件标签 + data.setEventsTagsIdList(roleEventsTagService.getEventTagIdList(id)); 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 new file mode 100644 index 00000000..571c5341 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/RoleEventsTagDao.java @@ -0,0 +1,54 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.entity.RoleEventsTagEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +@Mapper +public interface RoleEventsTagDao extends BaseDao { + + /** + * 删除角色对应的事件标签关系 + * + * @param roleId + * @return void + * @author liuchuang + * @since 2021/7/20 14:58 + */ + void updateDelFlag(Long roleId); + + /** + * 根据角色获取事件标签 + * + * @param roleId + * @return java.util.List + * @author liuchuang + * @since 2021/7/20 15:02 + */ + List selectListEventTagIdByRoleId(Long roleId); +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/RoleEventsTagEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/RoleEventsTagEntity.java new file mode 100644 index 00000000..a1dc312f --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/RoleEventsTagEntity.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_role_events_tag") +public class RoleEventsTagEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 事件标签ID + */ + private String eventTagId; + +} 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 new file mode 100644 index 00000000..1e90f842 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/RoleEventsTagService.java @@ -0,0 +1,117 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service; + +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.entity.RoleEventsTagEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +public interface RoleEventsTagService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-07-20 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-07-20 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return RoleEventsTagDTO + * @author generator + * @date 2021-07-20 + */ + RoleEventsTagDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-07-20 + */ + void save(RoleEventsTagDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-07-20 + */ + void update(RoleEventsTagDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-07-20 + */ + void delete(String[] ids); + + /** + * 保存角色授权的事件标签 + * + * @param roleId + * @param eventsTagIdList + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2021/7/20 14:49 + */ + Result saveOrUpdateRoleEventTagRelation(Long roleId, List eventsTagIdList); + + /** + * 根据角色获取事件标签 + * + * @param roleId + * @return java.util.List + * @author liuchuang + * @since 2021/7/20 15:02 + */ + List getEventTagIdList(Long roleId); +} 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 new file mode 100644 index 00000000..c7b0baa5 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/RoleEventsTagServiceImpl.java @@ -0,0 +1,126 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service.impl; + +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.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.entity.RoleEventsTagEntity; +import com.elink.esua.epdc.service.RoleEventsTagService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色和事件标签关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-20 + */ +@Service +public class RoleEventsTagServiceImpl extends BaseServiceImpl implements RoleEventsTagService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, RoleEventsTagDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, RoleEventsTagDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public RoleEventsTagDTO get(String id) { + RoleEventsTagEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, RoleEventsTagDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(RoleEventsTagDTO dto) { + RoleEventsTagEntity entity = ConvertUtils.sourceToTarget(dto, RoleEventsTagEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(RoleEventsTagDTO dto) { + RoleEventsTagEntity entity = ConvertUtils.sourceToTarget(dto, RoleEventsTagEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result saveOrUpdateRoleEventTagRelation(Long roleId, List eventsTagIdList) { + if (null != roleId) { + // 删除角色已关联的事件标签 + baseDao.updateDelFlag(roleId); + // 插入新的关联关系 + for (String eventTagId: + eventsTagIdList) { + RoleEventsTagEntity entity = new RoleEventsTagEntity(); + entity.setRoleId(roleId); + entity.setEventTagId(eventTagId); + insert(entity); + } + } + + return new Result(); + } + + @Override + public List getEventTagIdList(Long roleId) { + return baseDao.selectListEventTagIdByRoleId(roleId); + } + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index e5bcbdc3..0ca524af 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -66,6 +66,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -266,6 +269,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl whistleDeptIdList = dto.getWhistleDeptIdList(); //保存角色对应的可吹哨部门权限 this.saveOrUpdateWhistleDeptId(entity.getId(), whistleDeptIdList); + + // 保存角色授权的事件标签 + roleEventsTagService.saveOrUpdateRoleEventTagRelation(entity.getId(), dto.getEventsTagsIdList()); } /** 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 new file mode 100644 index 00000000..59e447b1 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/RoleEventsTagDao.xml @@ -0,0 +1,14 @@ + + + + + + + UPDATE epdc_role_events_tag SET DEL_FLAG = '1' WHERE role_id = #{roleId} + + + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EventTagController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EventTagController.java index ebd1ca27..af0ab873 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EventTagController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EventTagController.java @@ -26,6 +26,7 @@ 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.events.EventTagDTO; +import com.elink.esua.epdc.dto.events.result.EventTagsResultDTO; import com.elink.esua.epdc.modules.events.excel.EventTagExcel; import com.elink.esua.epdc.modules.events.service.EventTagService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +46,7 @@ import java.util.Map; @RestController @RequestMapping("eventtag") public class EventTagController { - + @Autowired private EventTagService eventTagService; @@ -91,4 +92,17 @@ public class EventTagController { ExcelUtils.exportExcelToTarget(response, null, list, EventTagExcel.class); } -} \ No newline at end of file + /** + * 事件标签列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/20 14:23 + */ + @GetMapping("eventstags") + public Result> eventsTags() { + List data = eventTagService.listOfEventTags(); + return new Result>().ok(data); + } + +} From f72dc3abaaed969689b58eab1bf1462151f038b8 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 16:09:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B4=E5=83=8F=E3=80=81=E8=81=8C=E5=8A=A1?= =?UTF-8?q?=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java | 5 +++++ .../main/java/com/elink/esua/epdc/entity/SysUserEntity.java | 5 +++++ .../src/main/resources/mapper/SysUserDao.xml | 1 + 3 files changed, 11 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index 9667eaae..e653e4b6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java @@ -134,4 +134,9 @@ public class SysUserDTO implements Serializable { */ private SysEpmetUserRelationDTO wgyInfo; + /** + * 职务 + */ + private String position; + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java index 335098d2..14e21049 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java @@ -109,4 +109,9 @@ public class SysUserEntity extends BaseEntity { */ private String scrip; + /** + * 职务 + */ + private String position; + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 1ef398ff..ea280daa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -48,6 +48,7 @@ t1.updater, t1.update_date, t1.user_tag_key, + t1.position, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1 where t1.id = #{value} and t1.del_flag = 0 From aa2a5b62af7cba92143dcb92c8a164b3b01f53cf Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 21 Jul 2021 14:04:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=85=B3=E8=81=94=E7=9A=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=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); + } } From 04a463287893cfab6985cddae78d7703ca42cfda Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 21 Jul 2021 14:33:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=85=B3=E8=81=94=E7=9A=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/WorkUserEventsDTO.java | 81 ++++++++++++ .../events/form/EpdcEventSubmitFormDTO.java | 5 + .../controller/WorkUserEventsController.java | 84 +++++++++++++ .../modules/events/dao/WorkUserEventsDao.java | 33 +++++ .../events/entity/WorkUserEventsEntity.java | 51 ++++++++ .../events/service/WorkUserEventsService.java | 107 ++++++++++++++++ .../service/impl/EpdcEventsServiceImpl.java | 21 ++-- .../impl/WorkUserEventsServiceImpl.java | 117 ++++++++++++++++++ .../mapper/events/WorkUserEventsDao.xml | 7 ++ .../src/main/resources/application.yml | 4 +- 10 files changed, 499 insertions(+), 11 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/WorkUserEventsDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/WorkUserEventsController.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/WorkUserEventsDao.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/WorkUserEventsService.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/WorkUserEventsServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/WorkUserEventsDao.xml diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/WorkUserEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/WorkUserEventsDTO.java new file mode 100644 index 00000000..b12933b3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/WorkUserEventsDTO.java @@ -0,0 +1,81 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +@Data +public class WorkUserEventsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 工作人员ID + */ + private Long workUserId; + + /** + * 事件ID + */ + private String eventId; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 删除标识 0：未删除，1：已删除 + */ + private String delFlag; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java index f4379e4f..8cc5a106 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java @@ -173,4 +173,9 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 事件标签 */ private List tagIds; + + /** + * 工作人员ID + */ + private List workUserIds; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/WorkUserEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/WorkUserEventsController.java new file mode 100644 index 00000000..2975aed2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/WorkUserEventsController.java @@ -0,0 +1,84 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.events.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +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.WorkUserEventsDTO; +import com.elink.esua.epdc.modules.events.service.WorkUserEventsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +@RestController +@RequestMapping("workusereventstag") +public class WorkUserEventsController { + + @Autowired + private WorkUserEventsService workUserEventsService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = workUserEventsService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + WorkUserEventsDTO data = workUserEventsService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody WorkUserEventsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + workUserEventsService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody WorkUserEventsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + workUserEventsService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + workUserEventsService.delete(ids); + return new Result(); + } + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/WorkUserEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/WorkUserEventsDao.java new file mode 100644 index 00000000..2d27a671 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/WorkUserEventsDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.events.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.events.entity.WorkUserEventsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +@Mapper +public interface WorkUserEventsDao extends BaseDao { + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java new file mode 100644 index 00000000..83e91095 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.events.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_work_user_events_tag") +public class WorkUserEventsEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 工作人员ID + */ + private Long workUserId; + + /** + * 事件ID + */ + private String eventId; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/WorkUserEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/WorkUserEventsService.java new file mode 100644 index 00000000..6ed89fdf --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/WorkUserEventsService.java @@ -0,0 +1,107 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.events.service; + +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.WorkUserEventsDTO; +import com.elink.esua.epdc.modules.events.entity.WorkUserEventsEntity; + +import java.util.List; +import java.util.Map; + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +public interface WorkUserEventsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-07-21 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-07-21 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WorkUserEventsTagDTO + * @author generator + * @date 2021-07-21 + */ + WorkUserEventsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-07-21 + */ + void save(WorkUserEventsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-07-21 + */ + void update(WorkUserEventsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-07-21 + */ + void delete(String[] ids); + + /** + * 保存事件与工作人员关系 + * + * @param eventId + * @param workUserIds + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2021/7/21 14:28 + */ + Result saveWorkUserRelationEventInfo(String eventId, List workUserIds); +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 83506f9a..d74abb9e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -61,10 +61,7 @@ import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import com.elink.esua.epdc.modules.category.service.CategoryService; import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; -import com.elink.esua.epdc.modules.events.service.EpdcEventsService; -import com.elink.esua.epdc.modules.events.service.EventTagRelationService; -import com.elink.esua.epdc.modules.events.service.EventTagService; -import com.elink.esua.epdc.modules.events.service.ImgService; +import com.elink.esua.epdc.modules.events.service.*; import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.GroupFeignClient; @@ -130,6 +127,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfPendingReviewEvents(Map params) { IPage page = getPage(params); @@ -206,6 +206,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl userMobiles){ // 审核操作发送短信 SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/WorkUserEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/WorkUserEventsServiceImpl.java new file mode 100644 index 00000000..1059ad12 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/WorkUserEventsServiceImpl.java @@ -0,0 +1,117 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.events.service.impl; + +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.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.dto.WorkUserEventsDTO; +import com.elink.esua.epdc.modules.events.dao.WorkUserEventsDao; +import com.elink.esua.epdc.modules.events.entity.WorkUserEventsEntity; +import com.elink.esua.epdc.modules.events.service.WorkUserEventsService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 事件工作人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-07-21 + */ +@Service +public class WorkUserEventsServiceImpl extends BaseServiceImpl implements WorkUserEventsService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WorkUserEventsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WorkUserEventsDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WorkUserEventsDTO get(String id) { + WorkUserEventsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WorkUserEventsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WorkUserEventsDTO dto) { + WorkUserEventsEntity entity = ConvertUtils.sourceToTarget(dto, WorkUserEventsEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WorkUserEventsDTO dto) { + WorkUserEventsEntity entity = ConvertUtils.sourceToTarget(dto, WorkUserEventsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result saveWorkUserRelationEventInfo(String eventId, List workUserIds) { + if (StringUtils.isNotEmpty(eventId) && CollectionUtil.isNotEmpty(workUserIds)) { + for (Long workUserId: + workUserIds) { + WorkUserEventsEntity entity = new WorkUserEventsEntity(); + entity.setWorkUserId(workUserId); + entity.setEventId(eventId); + insert(entity); + } + } + + return new Result(); + } + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/WorkUserEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/WorkUserEventsDao.xml new file mode 100644 index 00000000..d31b0530 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/WorkUserEventsDao.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index bc9edc65..fac37ad4 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_custom?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_events?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: jinshui_epdc_test password: jinshui@833066 #oracle配置 @@ -46,4 +46,4 @@ pagehelper: #指定数据库，可选值有【mysql、oracle、sqlserver、postgresql】 renren: - database: mysql \ No newline at end of file + database: mysql From b35a26ee3a2c86d9af8a34e7a4ae24bcb3b1ee9f Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 21 Jul 2021 16:18:08 +0800 Subject: [PATCH 5/6] =?UTF-8?q?PC=E7=AB=AF=E3=80=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=AF=E4=BA=8B=E4=BB=B6=E5=92=8C=E8=AE=AE=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IssuePendingResponseFormDTO.java | 5 +++ .../dto/issue/form/WorkIssueListFormDTO.java | 5 ++- .../controller/EpdcEventsController.java | 2 - .../service/impl/EpdcEventsServiceImpl.java | 16 ++++++++ .../issue/controller/IssueController.java | 1 - .../issue/service/impl/IssueServiceImpl.java | 11 ++++++ .../resources/mapper/events/EpdcEventsDao.xml | 37 ++++++++++++++----- .../main/resources/mapper/issue/IssueDao.xml | 18 +++++++-- 8 files changed, 77 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java index f3854867..45b44954 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java @@ -41,4 +41,9 @@ public class IssuePendingResponseFormDTO implements Serializable { */ private String timestamp; + /** + * 工作人员ID + */ + private Long workUserId; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java index 58d69343..9cb3eb49 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java @@ -47,6 +47,9 @@ public class WorkIssueListFormDTO implements Serializable { */ private Integer issueState; - + /** + * 工作人员ID + */ + private Long workUserId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 9991727e..9d92dfd3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -57,7 +57,6 @@ public class EpdcEventsController { private EpdcEventsService epdcEventsService; @GetMapping("page") - @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> page(@RequestParam Map params){ PageData page = epdcEventsService.listOfPendingReviewEvents(params); @@ -155,7 +154,6 @@ public class EpdcEventsController { * @Date: 2019/9/6 15:11 */ @GetMapping("rejectEvents") - @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> rejectEvents(@RequestParam Map params){ PageData page = epdcEventsService.listOfRejectEvents(params); return new Result>().ok(page); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index d74abb9e..171fb302 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -132,6 +132,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfPendingReviewEvents(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); IPage page = getPage(params); List list = baseDao.selectListOfPendingReviewEvents(params); return new PageData<>(list, page.getTotal()); @@ -382,6 +390,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfRejectEvents(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); IPage page = getPage(params); List list = baseDao.selectListOfRejectEvents(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java index 550c173c..81499574 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java @@ -66,7 +66,6 @@ public class IssueController { * @Date: 2019/9/5 16:49 */ @GetMapping("page") - @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> waitHandlePage(@RequestParam Map params){ PageData page = issueService.listOfIssues(params); return new Result>().ok(page); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 767f3c7c..eedd2537 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -121,6 +121,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public PageData listOfIssues(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); + IPage page = getPage(params); if (null != params.get("issueCode")) { params.put("issueCode", params.get("issueCode").toString().trim()); @@ -484,6 +493,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp public Result> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); + formDto.setWorkUserId(SecurityUser.getUserId()); return epdcEventsService.listIssuePendingResponse(formDto); } @@ -504,6 +514,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp list = SecurityUser.getUser().getDeptIdList(); } formDto.setDeptIdList(list); + formDto.setWorkUserId(SecurityUser.getUserId()); List data = baseDao.selectWorkIssueListOfNewOrHot(formDto); // 查询最热评论 for (WorkIssueListResultDTO dto : data) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index ac1e336a..1d845155 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -68,8 +68,15 @@ temp.CREATED_TIME AS createdTime FROM epdc_events temp + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0' WHERE temp.DEL_FLAG = '0' + AND (temp.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -97,8 +104,15 @@ temp.EVENT_CONTENT AS eventContent FROM epdc_events temp + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0' WHERE temp.DEL_FLAG = '0' + AND (temp.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -315,18 +329,21 @@ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 711febdb..125bff9f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -17,10 +17,17 @@ issue.ISSUE_CODE FROM epdc_issue issue + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = issue.EVENT_ID AND u.DEL_FLAG = '0' LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID AND e.DEL_FLAG = '0' WHERE issue.DEL_FLAG = '0' + AND (issue.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) and issue.ISSUE_STATE = #{state} AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -539,15 +546,18 @@ t1.id FROM epdc_issue t1 + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = t1.EVENT_ID AND u.DEL_FLAG = '0' LEFT JOIN epdc_events t2 ON t1.EVENT_ID = t2.ID AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' AND t1.ISSUE_STATE = #{issueState} - AND t1.GRID_ID IN - - #{id} - + AND (t1.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) #{timestamp} ORDER BY ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC, From 8128eebdbf88819a620b088f145bdac30b245462 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 22 Jul 2021 09:23:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E6=9C=89?= =?UTF-8?q?=E4=BA=8B=E8=AF=B4=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/events/entity/WorkUserEventsEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java index 83e91095..98857c5a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/WorkUserEventsEntity.java @@ -33,7 +33,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("epdc_work_user_events_tag") +@TableName("epdc_work_user_events") public class WorkUserEventsEntity extends BaseEpdcEntity { private static final long serialVersionUID = 1L;