用户分页反显部门

sys-api-service/src/main/java/com/xy/service/AliSmsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xy.service;
 
+import cn.hutool.json.JSONUtil;
 import com.xy.dto.SmsDTO;
 import com.xy.dto.SmsSendCommonDTO;
 import com.xy.dto.SmsSendDTO;
@@ -10,6 +11,7 @@ import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,7 @@ import java.util.Map;
  * @author 谭斌
  * @date 2023/08/10
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 @Api(tags = "阿里云短信服务")
@@ -72,6 +75,7 @@ public class AliSmsServiceImpl implements AliSmsService {
         Long msgConfigId = smsSendDTO.getMsgConfigId();
         SmsSceneEnum smsSceneEnum = SmsSceneEnum.getCodeByScene(scene);
         if (smsSceneEnum == null) {
+            log.error("通用短信发送发送场景有误");
             throw new CommRuntimeException("发送场景有误！");
         }
         //发短信验证码

sys-api-service/src/main/java/com/xy/service/SmsUtilAliImplService.java

@@ -118,6 +118,7 @@ public class SmsUtilAliImplService implements SmsUtil {
     public void sendSmsCommon(String mobile, Long configId, Map<String, Object> templateParams) {
         MsgConfigDto.Vo msgConfig = R.feignCheckData(msgSendApiService.getMsgConfig(new MsgConfigDto.Vo().setId(configId)));
         List<MsgConfigTestDto.BizParam> bizParams = R.feignCheckData(msgSendApiService.getBizParamByMsgConfig(new MsgConfigTestDto.MsgConfig().setConfigId(configId)));
+        log.info("通用短信发送，bizParams：{}，msgConfig:{}", JSONUtil.toJsonPrettyStr(bizParams), JSONUtil.toJsonPrettyStr(msgConfig));
         if (CollUtil.isNotEmpty(bizParams) && msgConfig != null) {
             List<MsgConfigTestDto.BizData> bizDataList = BeanUtil.copyToList(bizParams, MsgConfigTestDto.BizData.class);
             List<MsgConfigTestDto.BizData> sendList = new ArrayList<>();

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -13,10 +13,7 @@ import com.xy.annotation.Lock;
 import com.xy.config.WebMqttConfig;
 import com.xy.consts.CommConsts;
 import com.xy.consts.SysConstant;
-import com.xy.dto.SysWorkUser.AddDto;
-import com.xy.dto.SysWorkUser.DelDto;
-import com.xy.dto.SysWorkUser.ListByRoleDto;
-import com.xy.dto.SysWorkUser.UpdateDto;
+import com.xy.dto.SysWorkUser.*;
 import com.xy.dto.UserInfoDto;
 import com.xy.entity.UserInfo;
 import com.xy.mapper.UserInfoMapper;
@@ -32,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.xy.utils.Beans.copy;
@@ -122,8 +120,25 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                 .build()
                 .eq(!AuthorizeUtils.authByData(page.getSysId()), UserInfo::getCreateUser, AuthorizeUtils.getLoginId(Long.class))
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), UserInfo::getCreateTime);
+
         IPage<UserInfo> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
-        return R.ok(toPageBean(UserInfoDto.Vo.class, iPage));
+        PageBean<UserInfoDto.Vo> data = toPageBean(UserInfoDto.Vo.class, iPage);
+        List<UserInfoDto.Vo> records = data.getRecords();
+        if (CollUtil.isNotEmpty(records)) {
+            List<Long> authUserIds = records.stream().map(UserInfoDto.Vo::getAuthorizeUserId).distinct().collect(Collectors.toList());
+            List<SysWorkVo> sysWorkVos = R.feignCheckData(sysWorkUserService.list(new ListDto().setSysId(page.getSysId()).setId(authUserIds)));
+            Map<Long, SysWorkVo> sysWorkVoMap = sysWorkVos.stream().collect(Collectors.toMap(SysWorkVo::getId, i -> i));
+            records.forEach(r -> {
+                Long authorizeUserId = r.getAuthorizeUserId();
+                SysWorkVo sysWorkVo = sysWorkVoMap.get(authorizeUserId);
+                if (sysWorkVo != null) {
+                    r.setDeptIds(sysWorkVo.getDeptIds());
+                    r.setDeptNames(sysWorkVo.getDeptNames());
+                }
+            });
+            data.setRecords(records);
+        }
+        return R.ok(data);
     }
 
     @Override

sys-api/src/main/java/com/xy/dto/SmsSendCommonDTO.java

@@ -26,7 +26,7 @@ public class SmsSendCommonDTO {
 
     @ApiModelProperty(value = "用户ID")
     private Long userInfoId;
-    @NotNull(message = "模板业务参数不可为空")
+    @NotNull(message = "业务参数不可为空")
     @ApiModelProperty("模板业务参数(消息中心-消息配置-列表查看)")
     private Map<String, Object> templateParams;
 

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -223,6 +223,12 @@ public class UserInfoDto {
         @JsonSerialize(using = LocalDateTimeSerializer.class)
         private LocalDateTime updateTime;
 
+        @ApiModelProperty("部门id")
+        private List<Long> deptIds;
+
+        @ApiModelProperty("部门名称")
+        private List<String> deptNames;
+
     }
 
     @Data