From 83ae8a029afd8977d892582163a7a431c949ca43 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 18 Feb 2022 16:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Log/EpcLog.java | 5 ++-- .../src/main/java/com/adc/da/Log/logs.java | 4 +++ .../sarUser/controller/TsUserController.java | 22 +++++++++----- .../adc/da/slrs/sarUser/dao/TsUserDao.java | 8 +++-- .../da/slrs/sarUser/entity/RoleUserDTO.java | 17 +++++++++++ .../mybatis/mapper/sarUser/TsUserMapper.xml | 29 +++++++++++++++++++ 6 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java b/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java index e1977d9f..0ac527eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java @@ -20,10 +20,11 @@ public @interface EpcLog { */ public BusinessType businessType() default BusinessType.其他; - + //描述接口 可以理解为 接口在哪个模块下简单描述 String description(); - + //某些个接口需要特殊的返回语法 所以需要在这注解写死的部分 String speclaiValue() default ""; + //可以给接口一个特殊标志位能够 对数据进行特殊处理 String speclaiFlag() default ""; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java b/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java index 46cf6559..76c32163 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java +++ b/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java @@ -89,6 +89,7 @@ public class logs { log.setSpecial(object.getString("standSort") + " " + object.getString("standNumber") + "-" + object.getString("standYear") + " " + object.getString("standEnName") + " " + speclaiValue); } }else if ("Invaliddownload1".equals(speclaiFlag) || "Invaliddownload2".equals(speclaiFlag) || "2".equals(speclaiFlag)){ + //国内预览 下载 带水印下载 StringBuilder stringBuilder1=new StringBuilder(); for (String s:logParams.keySet()){ if (s.equals("standNumber")) { @@ -100,6 +101,7 @@ public class logs { stringBuilder1.append(" "+speclaiValue); log.setSpecial(stringBuilder1.toString()); }else if ("Foreigndownload1".equals(speclaiFlag) || "Foreigndownload2".equals(speclaiFlag) || "3".equals(speclaiFlag)){ + //海外预览 下载 带水印下载 StringBuilder stringBuilder1=new StringBuilder(); for (String s:logParams.keySet()){ if (s.equals("standNumber")) { @@ -111,11 +113,13 @@ public class logs { stringBuilder1.append(" "+speclaiValue); log.setSpecial(stringBuilder1.toString()); }else if ("5".equals(speclaiFlag)){ + //企标详情 String gson=new Gson().toJson(returnValue); JSONObject jsonObject= JSON.parseObject(gson); JSONObject object= JSON.parseObject(jsonObject.getString("data")); log.setSpecial(object.getString("standCode")+" "+object.getString("standName")+" "+speclaiValue); }else if ("Buss".equals(speclaiFlag)){ + //企标下载 预览 带水印下载 StringBuilder stringBuilder1=new StringBuilder(); for (String s:logParams.keySet()){ if (s.equals("standCode")) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 09e8d111..6ca4d2aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -4,22 +4,17 @@ package com.adc.da.slrs.sarUser.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; -import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; -import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; -import com.adc.da.slrs.sarUser.entity.UpDTO; -import com.adc.da.slrs.sarUser.entity.UserPositionBatchVO; -import com.adc.da.slrs.sarUser.entity.UserPositionVO; +import com.adc.da.slrs.sarUser.entity.*; import com.adc.da.slrs.sarUser.service.ITsUserService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarUser.entity.TsUser; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -107,4 +102,17 @@ public class TsUserController extends BaseController { } + @ApiOperation("根据角色反向查出人员的接口") + @GetMapping("/selectUserByRole") + public ResponseMessage> selectUserByRole(RoleUserDTO roleSelectDTO) throws Exception { + Page page=new Page<>(); + page.setTotal(tsUserDao.selectUserByRole(roleSelectDTO)); + page.setSize(roleSelectDTO.getPageSize()); + page.setCurrent(roleSelectDTO.getPageNumber()); + page.setRecords(tsUserDao.selectUserByRoleByPage(roleSelectDTO)); + return Result.success(page); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 1bef85d0..89c0a4c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -1,6 +1,6 @@ package com.adc.da.slrs.sarUser.dao; -import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarUser.entity.RoleUserDTO; import com.adc.da.slrs.sarUser.entity.TsUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.*; @@ -44,7 +44,7 @@ public interface TsUserDao extends BaseMapper { /** * 通过岗位ID查询用户及其岗位 - * @param institutionId：岗位ID + * @param ：岗位ID * @return List */ List getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser); @@ -62,4 +62,8 @@ public interface TsUserDao extends BaseMapper { List getUserIdsByPositionIds(List positionIds); List selectDeptByDY(@Param("list") List strings); + + Integer selectUserByRole(@Param("role") RoleUserDTO roleSelectDTO); + + List selectUserByRoleByPage(@Param("role") RoleUserDTO roleSelectDTO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java new file mode 100644 index 00000000..106435a3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +@Data +public class RoleUserDTO { +// 用户id + private String userId; +// 用户中文名 + private String userName; +// 要查询的角色 + private String roleId; + + private long pageNumber; + + private long pageSize; +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 0a403363..f3f4697a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -127,4 +127,33 @@ #{msgId} + + +