import 优化 + pom.xml修改
This commit is contained in:
parent
397cd4487e
commit
26a15c9d4f
|
|
@ -243,4 +243,9 @@ public class SocialRequest {
|
||||||
return om2208;
|
return om2208;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public JSONObject call5102(Map<String,Object> map) {
|
||||||
|
JSONObject jsonObject = httpUtil.callBackMsgId("5102", "data", map, 10000);
|
||||||
|
return jsonObject;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,4 +60,27 @@ public class ManagerUserService extends BaseService {
|
||||||
return managerUserMapper.selectList(queryWrapper);
|
return managerUserMapper.selectList(queryWrapper);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ManagerUser addManager(ManagerUser user){
|
||||||
|
QueryWrapper<ManagerUser> 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
package com.syjiaer.clinic.server.service.organization;
|
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.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
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.exception.MessageException;
|
||||||
import com.syjiaer.clinic.server.common.util.FileUtil;
|
import com.syjiaer.clinic.server.common.util.FileUtil;
|
||||||
import com.syjiaer.clinic.server.common.vo.Page;
|
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.OrganizationMemberSectionMapper;
|
||||||
import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
|
import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
|
||||||
import com.syjiaer.clinic.server.service.BaseService;
|
import com.syjiaer.clinic.server.service.BaseService;
|
||||||
|
import com.syjiaer.clinic.server.service.common.ManagerUserService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 组织成员
|
* 组织成员
|
||||||
|
|
@ -40,7 +42,11 @@ public class OrganizationMemberService extends BaseService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileUtil fileUtil;
|
private FileUtil fileUtil;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
private ManagerUserService managerUserService;
|
||||||
|
@Autowired
|
||||||
private ManagerUserMapper managerUserMapper;
|
private ManagerUserMapper managerUserMapper;
|
||||||
|
@Autowired
|
||||||
|
private SocialRequest socialRequest;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 获取成员列表
|
* 获取成员列表
|
||||||
|
|
@ -125,7 +131,11 @@ public class OrganizationMemberService extends BaseService {
|
||||||
ManagerUser user = dto.getUserInfo();
|
ManagerUser user = dto.getUserInfo();
|
||||||
user.setOrganizationMemberId(organizationMember.getId());
|
user.setOrganizationMemberId(organizationMember.getId());
|
||||||
user.setName(organizationMember.getName());
|
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);
|
return organizationMemberMapper.selectList(memberWrapper);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取医执人员信息
|
||||||
|
*/
|
||||||
|
public List<Map> getMedicalProfessionals(Integer roleType){
|
||||||
|
Map<String,Object> map = new HashMap<>();
|
||||||
|
map.put("prac_psn_type",roleType);
|
||||||
|
JSONObject jsonObject = socialRequest.call5102(map);
|
||||||
|
List<Map> list = jsonObject.getJSONArray("feedetail").toJavaList(Map.class);
|
||||||
|
return list;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,15 @@ spring:
|
||||||
name: server
|
name: server
|
||||||
data:
|
data:
|
||||||
mongodb:
|
mongodb:
|
||||||
host: localhost # MongoDB服务器地址
|
host: dev.jizhiweb.cn # MongoDB服务器地址
|
||||||
port: 27017 # MongoDB端口
|
port: 27017 # MongoDB端口
|
||||||
database: syjiaer_clinic # 使用的数据库名称
|
database: syjiaer_clinic # 使用的数据库名称
|
||||||
redis:
|
redis:
|
||||||
host: localhost
|
host: dev.jizhiweb.cn
|
||||||
port: 6379
|
port: 6379
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
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
|
username: root
|
||||||
password: i7L0BS91pADGuy7z
|
password: i7L0BS91pADGuy7z
|
||||||
config:
|
config:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue