From 8457c5ce97190e5a83e120ec1cee0e5a557aeb8f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 4 Jun 2021 17:28:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E5=B1=82=E7=BA=A7=E8=8E=B7=E5=8F=96=E4=BA=BA=E5=91=98?= =?UTF-8?q?=20=E5=8F=8A=20=E5=8C=BA=E5=9F=9F=20=E5=8F=8A=20=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=84=8F=E8=A7=81CID=E6=9D=A1=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utArea/controller/UtAreaController.java | 46 ++++++ .../com/adc/da/slrs/utArea/dao/UtAreaDao.java | 21 +++ .../com/adc/da/slrs/utArea/entity/UtArea.java | 67 +++++++++ .../adc/da/slrs/utArea/page/UtAreaEOPage.java | 38 +++++ .../slrs/utArea/service/IUtAreaService.java | 20 +++ .../service/impl/UtAreaServiceImpl.java | 39 +++++ .../mybatis/mapper/utArea/UtAreaMapper.xml | 80 +++++++++++ .../adc/da/sys/constant/DeleteFlagEnum.java | 26 ++++ .../da/sys/controller/RoleEOController.java | 44 ++++++ .../SarPublicIdeaAllController.java | 15 +- .../java/com/adc/da/sys/dao/UserEODao.java | 6 + .../com/adc/da/sys/page/RoleUserEOPage.java | 41 ++++++ .../sys/service/ISarPublicIdeaAllService.java | 2 +- .../adc/da/sys/service/IUserEOService.java | 4 + .../impl/SarPublicIdeaAllServiceImpl.java | 3 +- .../sys/service/impl/UserEOServiceImpl.java | 54 +++++++ .../com/adc/da/sys/util/RoleGroupUtil.java | 89 ++++++++++++ .../java/com/adc/da/sys/vo/RoleUserVO.java | 23 +++ .../mybatis/mapper/sys/UserEOMapper.xml | 133 ++++++++++++++++++ 19 files changed, 742 insertions(+), 9 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/entity/UtArea.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/page/UtAreaEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/constant/DeleteFlagEnum.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/page/RoleUserEOPage.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/util/RoleGroupUtil.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/RoleUserVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java new file mode 100644 index 00000000..f37d5ea0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java @@ -0,0 +1,46 @@ +package com.adc.da.slrs.utArea.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.utArea.page.UtAreaEOPage; +import com.adc.da.slrs.utArea.service.IUtAreaService; +import com.adc.da.sys.common.SelectionResult; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.utArea.entity.UtArea; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-06-04 +*/ +@RestController +@RequestMapping("/${restPath}/lawssBase/utArea") +@Api(tags = "福田标准法规--标准法规库--区域") +public class UtAreaController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(UtAreaController.class); + + @Autowired + private IUtAreaService utAreaEOService; + + @ApiOperation(value = "|UtAreaEO|下拉框选项格式查询") + @GetMapping("/getAreaList") +// @RequiresPermissions("lawssBase:utArea:list") + public ResponseMessage> getAreaList(UtArea utAreaEO) throws Exception { + return Result.success(utAreaEOService.getAreaSelList(utAreaEO)); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java new file mode 100644 index 00000000..fbdce2ae --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.utArea.dao; + +import com.adc.da.slrs.utArea.entity.UtArea; +import com.adc.da.sys.common.SelectionResult; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-06-04 + */ +public interface UtAreaDao extends BaseMapper { + + List getAreaSelList(UtArea utAreaEO); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/entity/UtArea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/entity/UtArea.java new file mode 100644 index 00000000..8dd5c749 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/entity/UtArea.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.utArea.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-06-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="UtArea对象", description="") +public class UtArea extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "展示区域名称") + @TableField("AREA_NAME") + private String areaName; + + @ApiModelProperty(value = "展示顺序") + @TableField("SHOW_INDEX") + private Integer showIndex; + + @ApiModelProperty(value = "资源类型") + @TableField("SAR_TYPE") + private String sarType; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/page/UtAreaEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/page/UtAreaEOPage.java new file mode 100644 index 00000000..a22dc705 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/page/UtAreaEOPage.java @@ -0,0 +1,38 @@ +package com.adc.da.slrs.utArea.page; + +import com.adc.da.base.page.BasePage; +import lombok.Data; + +/** + * 功能：UT_AREA UtAreaEOPage
+ * 作者：code generator
+ * 日期： 2020-10-16
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ + +@Data +public class UtAreaEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String areaName; + private String areaNameOperator = "="; + private String showIndex; + private String showIndexOperator = "="; + private String sarType; + private String sarTypeOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String notId; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java new file mode 100644 index 00000000..5946dd41 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.utArea.service; + +import com.adc.da.slrs.utArea.entity.UtArea; +import com.adc.da.sys.common.SelectionResult; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-06-04 + */ +public interface IUtAreaService extends IService { + + List getAreaSelList(UtArea utAreaEO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java new file mode 100644 index 00000000..a33f5b8c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java @@ -0,0 +1,39 @@ +package com.adc.da.slrs.utArea.service.impl; + +import com.adc.da.slrs.utArea.entity.UtArea; +import com.adc.da.slrs.utArea.dao.UtAreaDao; +import com.adc.da.slrs.utArea.service.IUtAreaService; +import com.adc.da.sys.common.SelectionResult; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-06-04 + */ +@Service +public class UtAreaServiceImpl extends ServiceImpl implements IUtAreaService { + + private static final Logger logger = LoggerFactory.getLogger(UtAreaServiceImpl.class); + + @Autowired + private UtAreaDao dao; + + public UtAreaDao getDao() { + return dao; + } + + public List getAreaSelList(UtArea utAreaEO){ + return dao.getAreaSelList(utAreaEO); + } + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml new file mode 100644 index 00000000..244b64db --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + id, area_name, show_index, sar_type, creation_user, valid_flag, creation_time, modify_time + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and area_name ${areaNameOperator} #{areaName} + + + and show_index ${showIndexOperator} #{showIndex} + + + and sar_type like concat(concat('%',#{sarType}),'%') + + + and creation_user ${creationUserOperator} #{creationUser} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and id != #{notId} + + + + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/constant/DeleteFlagEnum.java b/adc-da-sys/src/main/java/com/adc/da/sys/constant/DeleteFlagEnum.java new file mode 100644 index 00000000..26cf16a7 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/constant/DeleteFlagEnum.java @@ -0,0 +1,26 @@ +package com.adc.da.sys.constant; + +/** + * Created by Administrator on 2018/11/8 15:47 + */ +public enum DeleteFlagEnum { + + NORMAL(0, "正常"), + DELETE(1, "已删除"); + + private int value; + private String label; + + private DeleteFlagEnum(int value, String label) { + this.value = value; + this.label = label; + } + + public int getValue() { + return this.value; + } + + public String getLabel() { + return this.label; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java index 7a456af7..5f1a731f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java @@ -6,14 +6,18 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.sys.constant.DeleteFlagEnum; import com.adc.da.sys.constant.IsBelongEnum; import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.entity.UserRoleEO; import com.adc.da.sys.page.RoleEOPage; +import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.service.IRoleEOService; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.util.RoleGroupUtil; +import com.adc.da.sys.vo.RoleUserVO; import com.adc.da.sys.vo.RoleVO; import com.adc.da.util.LoginUserUtil; import io.swagger.annotations.Api; @@ -85,6 +89,46 @@ public class RoleEOController extends BaseController { return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|RoleUserVO|根据部门和层级获取人员") + @GetMapping("/getRoleAndUserByOrgIdPage") + public ResponseMessage> getRoleAndUserByOrgIdPage(Integer pageNo, Integer pageSize, String orgId, String roleHierarchyName, String roleName, String roleId, String userName){ + RoleUserEOPage page = new RoleUserEOPage(); + if (pageNo != null) { + page.setPage(pageNo); + } + if (pageSize != null) { + page.setPageSize(pageSize); + } + if (StringUtils.isNotEmpty(userName)) { + page.setUserName("%"+roleName+"%"); + page.setUserNameOperator("LIKE"); + } + if (StringUtils.isNotEmpty(roleName)) { + page.setRoleName("%"+roleName+"%"); + page.setRoleNameOperator("LIKE"); + } + page.setOrgId(roleId); + page.setRoleName(roleName); + page.setUserName(userName); + page.setRoleHierarchyName(String.valueOf(roleHierarchyName != null ? RoleGroupUtil.getId(roleHierarchyName): null)); + page.setOrgId(orgId); + page.setValidFlag(DeleteFlagEnum.NORMAL.getValue()+""); + page.setPager(new Pager()); + page.setOrderBy("modify_time desc"); + List list = userService.getUserByRolePage(page); + return Result.success(getPageInfoNew(page.getPager(), list)); + } + + public PageInfo getPageInfoNew(Pager pager, List rows) { + PageInfo pageInfo = new PageInfo(); + pageInfo.setList(rows); + pageInfo.setCount((long)pager.getRowCount()); + pageInfo.setPageSize(pager.getPageSize()); + pageInfo.setPageCount((long)pager.getPageCount()); + pageInfo.setPageNo(pager.getPageId()); + return pageInfo; + } + @ApiOperation(value = "|RoleEO|详情") @GetMapping("/{id}") // @RequiresPermissions("sys:role:get") diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java index a47dd522..df371b67 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java @@ -3,6 +3,7 @@ package com.adc.da.sys.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.sys.service.ISarPublicIdeaAllService; import com.adc.da.sys.service.impl.SarPublicIdeaAllServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -32,20 +33,20 @@ import java.util.List; public class SarPublicIdeaAllController extends BaseController { @Autowired - private SarPublicIdeaAllServiceImpl sarPublicIdeaAllimpl; + private ISarPublicIdeaAllService iSarPublicIdeaAllService; @ApiOperation(value = "查询全部意见") @GetMapping("/getallStand") - public ResponseMessage getAllStand( @RequestParam(defaultValue="1")Integer page, @RequestParam(defaultValue="10")Integer size){ - IPage Publiclist =sarPublicIdeaAllimpl.SelectAll(page,size); + public ResponseMessage getAllStand( @RequestParam(defaultValue="1")Integer page, @RequestParam(defaultValue="10")Integer size,String cid){ + IPage Publiclist =iSarPublicIdeaAllService.SelectAll(page,size,cid); return Result.success(Publiclist); } @ApiOperation(value = "增加意见") @GetMapping("/inserdallStand") public ResponseMessage addAllStand(SarPublicIdeaAll sar){ - String src=sarPublicIdeaAllimpl.add(sar); + String src=iSarPublicIdeaAllService.add(sar); return Result.success("200",src); } @@ -53,7 +54,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") public ResponseMessage deleteStand(String id){ - String src=sarPublicIdeaAllimpl.delete(id); + String src=iSarPublicIdeaAllService.delete(id); return Result.success("200",src); } @@ -61,7 +62,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "修改意见") @GetMapping("/updateStand") public ResponseMessage updateStand(SarPublicIdeaAll sarPublicIdeaAll){ - String src=sarPublicIdeaAllimpl.updaetById(sarPublicIdeaAll); + String src=iSarPublicIdeaAllService.updaetById(sarPublicIdeaAll); return Result.success("200",src); } @@ -71,7 +72,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "导出全部意见") @GetMapping("/tuallStand") public ResponseMessage getAllStand(HttpServletResponse response){ - String src=sarPublicIdeaAllimpl.stuListExcel(response); + String src=iSarPublicIdeaAllService.stuListExcel(response); return Result.success("200",src); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index 3444cd07..c3388fa1 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -2,7 +2,9 @@ package com.adc.da.sys.dao; import com.adc.da.base.page.BasePage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.vo.RoleUserVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -29,6 +31,10 @@ public interface UserEODao extends BaseMapper { public List getRoleIdListByUserId(Integer usid); + List getUserByRolePage(RoleUserEOPage page); + + int getUserByRolePageCount(RoleUserEOPage page); + public void saveUserRole(@Param("usid") String usid, @Param("roleId") String roleId); public void saveUserOrg(@Param("usid") String usid, @Param("orgId") String orgId); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleUserEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleUserEOPage.java new file mode 100644 index 00000000..5de5faac --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleUserEOPage.java @@ -0,0 +1,41 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; +import lombok.Data; + +import java.util.List; + +@Data +public class RoleUserEOPage extends BasePage { + + private String userId; + private String userName; + private String userNameOperator = "="; + private String roleId; + private String roleName; + private String roleNameOperator = "="; + private String orgId; + private String orgType; + private String orgName; + private String orgNameOperator = "="; + private String pOrgId; + private String pOrgName; + private String email; + + private String departName; + + private String departId; + + private String validFlag; + private String validFlagOperator = "="; + + private String roleHierarchyName; + + private List orgIdList; + private List roleHierarchy; + private List roleNameList; + private List roleIdList; + private List userNameList; + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java index b68ef4c2..f45287c7 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java @@ -18,7 +18,7 @@ import java.util.List; public interface ISarPublicIdeaAllService extends IService { - IPage SelectAll(Integer page,Integer size); + IPage SelectAll(Integer page,Integer size,String cid); String add(SarPublicIdeaAll sarPublicIdeaAll); String delete(String id); String updaetById(SarPublicIdeaAll sarPublicIdeaAll); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 1818f2d0..3aa8e180 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -3,7 +3,9 @@ package com.adc.da.sys.service; import com.adc.da.base.page.BasePage; import com.adc.da.http.ResponseMessage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.vo.RoleUserVO; import com.adc.da.sys.vo.UserVO; import com.baomidou.mybatisplus.extension.service.IService; @@ -23,6 +25,8 @@ public interface IUserEOService extends IService { public int delete(List ids); + List getUserByRolePage(RoleUserEOPage page); + public UserEO getUserWithRoles(String id); public UserEO getUserWithRolesAll(String id); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java index 9565fbbd..4247c760 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java @@ -37,8 +37,9 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl SelectAll(Integer p,Integer size){ + public IPage SelectAll(Integer p,Integer size,String cid){ QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("CID",cid); Page page = new Page<>(p, size); IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index 2de11b97..e95c0432 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -12,10 +12,12 @@ import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.entity.UserInfoEO; import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; import com.adc.da.sys.service.IRoleEOService; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.RoleUserVO; import com.adc.da.sys.vo.UserVO; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.PasswordUtils; @@ -109,6 +111,58 @@ public class UserEOServiceImpl extends ServiceImpl implements return this.baseMapper.getUserEOByAccount(userName,usid); } + public List getUserByRolePage(RoleUserEOPage page){ + List orgIdList = null; + if (page.getOrgId() != null){ + orgIdList = Arrays.asList(page.getOrgId().split(",")); + page.setOrgIdList(orgIdList); + } + List roleNameList = null; + if (page.getRoleName() != null){ + roleNameList = Arrays.asList(page.getRoleName().split(",")); + page.setRoleNameList(roleNameList); + } + List roleIdList = null; + if (page.getRoleId() != null){ + roleIdList = Arrays.asList(page.getRoleId().split(",")); + page.setRoleIdList(roleIdList); + } + List list = this.baseMapper.getUserByRolePage(page); + int rowCount = this.baseMapper.getUserByRolePageCount(page); + page.getPager().setRowCount(rowCount); + //2021年4月19日 此处分页查询的时候直接查询，没有全局查询的BUG + for (RoleUserVO data:list) { + OrgEO departData = getDepartOrgData(data.getOrgId()); + if(departData!=null){ + data.setPOrgId(departData.getId()); + data.setPOrgName(departData.getOrgName()); + data.setDepartId(departData.getId()); + data.setDepartName(departData.getOrgName()); + }else{ + data.setDepartId(null); + data.setDepartName(null); + data.setPOrgId(null); + data.setPOrgName(null); + } + } + + return list; + } + + private OrgEO getDepartOrgData(String orgId){ + if(StringUtils.isNotBlank(orgId)){ + OrgEO orgData = orgEOService.getOrgEOById(orgId); + if(orgData!=null && StringUtils.equals(orgData.getOrgType(),"DEPART")){ + return orgData; + }else if(orgData != null){ + return getDepartOrgData(orgData.getpId()); + } + return null; + }else{ + return null; + } + } + public void updatePassword(String usid, String oldPassword, String newPassword) { this.baseMapper.updatePassword(usid, oldPassword, newPassword); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/util/RoleGroupUtil.java b/adc-da-sys/src/main/java/com/adc/da/sys/util/RoleGroupUtil.java new file mode 100644 index 00000000..4df8b46b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/util/RoleGroupUtil.java @@ -0,0 +1,89 @@ +package com.adc.da.sys.util; + +public class RoleGroupUtil { + + public static String getName(Integer id){ + String name = null; + switch (id){ + case 1: + name = "总监"; + break; + case 2: + name = "助理"; + break; + case 3: + name = "高级经理"; + break; + case 4: + name = "系统经理"; + break; + case 5: + name = "工程师"; + break; + case 6: + name = "FO"; + break; + case 7: + name = "LO"; + break; + case 8: + name = "L1"; + break; + case 9: + name = "技师"; + break; + case 10: + name = "供应商"; + break; + case 11: + name = "VSE"; + break; + case 12: + name = "其他"; + break; + } + return name; + } + public static Integer getId(String name){ + Integer id = null; + switch (name){ + case "总监": + id = 1; + break; + case "助理": + id = 2; + break; + case "高级经理": + id = 3; + break; + case "系统经理": + id = 4; + break; + case "工程师": + id = 5; + break; + case "FO": + id = 6; + break; + case "LO": + id = 7; + break; + case "L1": + id = 8; + break; + case "技师": + id = 9; + break; + case "供应商": + id = 10; + break; + case "VSE": + id = 11; + break; + case "其他": + id = 12; + break; + } + return id; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/RoleUserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/RoleUserVO.java new file mode 100644 index 00000000..231f92ae --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/RoleUserVO.java @@ -0,0 +1,23 @@ +package com.adc.da.sys.vo; + +import lombok.Data; + +@Data +public class RoleUserVO { + + private String userId; + private String userName; + private String roleId; + private String roleName; + private String orgId; + private String orgType; + private String orgName; + private String pOrgId; + private String pOrgName; + private String email; + + private String departName; + + private String departId; + +} diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 1d3a6cec..2ef62938 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -199,6 +199,139 @@ where usid = #{usid} + + + + +