From f3090d7bdb2d7dc3c247036ae2bc6d06d0f20e25 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 17 Dec 2024 23:50:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/launch/LauncherServiceImpl.java | 2 +- .../org/springblade/system/vo/ContactsVO.java | 50 +++++++++++++++++++ .../springblade/system/SystemApplication.java | 2 +- .../system/controller/ContactsController.java | 33 ++++++++++++ .../springblade/system/mapper/UserMapper.java | 1 + .../springblade/system/mapper/UserMapper.xml | 14 ++++++ .../system/service/IUserService.java | 4 ++ .../system/service/impl/UserServiceImpl.java | 21 ++++++++ 8 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/ContactsVO.java create mode 100644 blade-service/blade-system/src/main/java/org/springblade/system/controller/ContactsController.java diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index c6962399..47ca68b5 100644 --- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -43,7 +43,7 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false"); // 开启elk日志 - PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); +// PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); // seata注册地址 // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile)); diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/ContactsVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/ContactsVO.java new file mode 100644 index 00000000..6e85f960 --- /dev/null +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/ContactsVO.java @@ -0,0 +1,50 @@ +package org.springblade.system.vo; + +import lombok.Data; + +/** + * 通讯录 + */ +@Data +public class ContactsVO { + + /** + * 姓名 + */ + private String name; + /** + * 手机号码 + */ + private String mobile; + /** + * 电子邮件地址 + */ + private String email; + /** + * 家庭或通信地址 + */ + private String address; + + /** + * 部门 + * 逗号分割 拼接在一起 + */ + private String deptNames; + + + /** + * 岗位s + * 逗号分割 拼接在一起 + */ + private String postNames; + + + /** + * 备注信息，记录额外的说明或需要注意的事项 + */ + private String remark; + + + + +} diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java index 7f5baf7f..40c1a3c0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java @@ -28,7 +28,7 @@ import org.springblade.core.launch.constant.AppConstant; public class SystemApplication { public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args); + BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME.concat("-pref"), SystemApplication.class, args); } } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ContactsController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ContactsController.java new file mode 100644 index 00000000..2a88259d --- /dev/null +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ContactsController.java @@ -0,0 +1,33 @@ +package org.springblade.system.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.system.service.IUserService; +import org.springblade.system.vo.ContactsVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +@NonDS +@RestController +@AllArgsConstructor +@RequestMapping("/contacts") +@ApiIgnore +@Api(value = "通讯录", tags = "通讯录") +public class ContactsController extends BladeController { + + private final IUserService userService; + @GetMapping("/list") + public R> list() { + List data =userService.listContacts(); + return R.data(data); + + } + +} diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java index 5308a714..93b27fff 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java @@ -60,4 +60,5 @@ public interface UserMapper extends BaseMapper { */ List exportUser(@Param("ew") Wrapper queryWrapper); + List listContacts( @Param("tenantId") String tenantId); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml index fecb580e..bf4922bd 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml @@ -73,5 +73,19 @@ + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java index cf20fc62..0aed30ef 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java @@ -26,6 +26,7 @@ import org.springblade.system.entity.UserInfo; import org.springblade.system.entity.UserOauth; import org.springblade.system.enums.UserEnum; import org.springblade.system.excel.UserExcel; +import org.springblade.system.vo.ContactsVO; import org.springblade.system.vo.UserVO; import java.util.List; @@ -213,4 +214,7 @@ public interface IUserService extends BaseService { * @return */ User userInfoByPhone(String tenantId, String phone); + + List listContacts(); + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java index 9fd46d65..6de83022 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java @@ -46,6 +46,7 @@ import org.springblade.system.mapper.UserMapper; import org.springblade.system.service.IUserDeptService; import org.springblade.system.service.IUserOauthService; import org.springblade.system.service.IUserService; +import org.springblade.system.vo.ContactsVO; import org.springblade.system.vo.UserVO; import org.springblade.system.wrapper.UserWrapper; import org.springframework.stereotype.Service; @@ -444,4 +445,24 @@ public class UserServiceImpl extends BaseServiceImpl implement return null; } + @Override + public List listContacts() { + + List contactsVOS = new ArrayList<>(); + + List list =baseMapper.listContacts(AuthUtil.getTenantId()); + + for (User user : list) { + ContactsVO contactsVO = new ContactsVO(); + contactsVO.setName(user.getRealName()); + contactsVO.setMobile(user.getPhone()); + contactsVO.setEmail(user.getEmail()); + contactsVO.setDeptNames(StringUtil.join(SysCache.getDeptNames(user.getDeptId()))); + contactsVO.setPostNames(StringUtil.join(SysCache.getPostNames(user.getPostId()))); + + contactsVOS.add(contactsVO); + } + return contactsVOS; + + } }