From 26a15c9d4fdc90c21822d732d2ed529fea632c0a Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Wed, 21 May 2025 10:09:47 +0800 Subject: [PATCH] =?UTF-8?q?import=20=E4=BC=98=E5=8C=96=20+=20pom.xml?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/api/request/SocialRequest.java | 5 ++++ .../service/common/ManagerUserService.java | 23 +++++++++++++++ .../OrganizationMemberService.java | 28 +++++++++++++++++-- src/main/resources/application.yml | 6 ++-- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java b/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java index 7992a2b..d2507be 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java @@ -243,4 +243,9 @@ public class SocialRequest { return om2208; } + + public JSONObject call5102(Map map) { + JSONObject jsonObject = httpUtil.callBackMsgId("5102", "data", map, 10000); + return jsonObject; + } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java index e51ab77..4045a4b 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java @@ -60,4 +60,27 @@ public class ManagerUserService extends BaseService { return managerUserMapper.selectList(queryWrapper); } + + public ManagerUser addManager(ManagerUser user){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("username", user.getUsername()); + queryWrapper.last("limit 1"); + if(managerUserMapper.selectOne(queryWrapper) != null){ + throw new MessageException("用户名已存在"); + } + managerUserMapper.insert(user); + return user; + } + + public ManagerUser updateManager(ManagerUser user){ + ManagerUser dbUser = managerUserMapper.selectById(user.getId()); + if(dbUser == null){ + throw new MessageException("用户不存在"); + } + if (!dbUser.getOrganizationMemberId().equals(user.getOrganizationMemberId())){ + throw new MessageException("当前账号已经绑定了其他成员"); + } + managerUserMapper.updateById(user); + return user; + } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java index 9e23fa8..cc3c191 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.service.organization; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.FileUtil; import com.syjiaer.clinic.server.common.vo.Page; @@ -16,14 +18,14 @@ import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberSectionMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.service.BaseService; +import com.syjiaer.clinic.server.service.common.ManagerUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; +import java.util.*; /** * 组织成员 @@ -40,7 +42,11 @@ public class OrganizationMemberService extends BaseService { @Autowired private FileUtil fileUtil; @Autowired + private ManagerUserService managerUserService; + @Autowired private ManagerUserMapper managerUserMapper; + @Autowired + private SocialRequest socialRequest; /* * 获取成员列表 @@ -125,7 +131,11 @@ public class OrganizationMemberService extends BaseService { ManagerUser user = dto.getUserInfo(); user.setOrganizationMemberId(organizationMember.getId()); user.setName(organizationMember.getName()); - managerUserMapper.insertOrUpdate(user); + if (user.getId() == null) { + managerUserService.addManager(user); + }else { + managerUserService.updateManager(user); + } } @@ -216,4 +226,16 @@ public class OrganizationMemberService extends BaseService { return organizationMemberMapper.selectList(memberWrapper); } + + + /** + * 获取医执人员信息 + */ + public List getMedicalProfessionals(Integer roleType){ + Map map = new HashMap<>(); + map.put("prac_psn_type",roleType); + JSONObject jsonObject = socialRequest.call5102(map); + List list = jsonObject.getJSONArray("feedetail").toJavaList(Map.class); + return list; + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e24630d..4aeb28d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,15 +3,15 @@ spring: name: server data: mongodb: - host: localhost # MongoDB服务器地址 + host: dev.jizhiweb.cn # MongoDB服务器地址 port: 27017 # MongoDB端口 database: syjiaer_clinic # 使用的数据库名称 redis: - host: localhost + host: dev.jizhiweb.cn port: 6379 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/syjiaer_clinic + url: jdbc:mysql://dev.jizhiweb.cn:3306/syjiaer_clinic username: root password: i7L0BS91pADGuy7z config: