Skip to content

A
amos-boot-biz
Commit 36c4005d authored by tianyiming's avatar tianyiming
Browse files
Options

修改人员功能

parent 4a86e565
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 17 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsrAgencyUser.java
View file @ 36c4005d
...@@ -60,4 +60,7 @@ public class OrgUsrAgencyUser extends BaseEntity { ...@@ -60,4 +60,7 @@ public class OrgUsrAgencyUser extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private String upPassWord; private String upPassWord;
@TableField(exist = false)
private String upAmosUser;
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrAgencyUserController.java
View file @ 36c4005d
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAgencyUser; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAgencyUser;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrAgencyUserService; import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrAgencyUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
...@@ -39,7 +42,12 @@ public class OrgUsrAgencyUserController extends BaseController { ...@@ -39,7 +42,12 @@ public class OrgUsrAgencyUserController extends BaseController {
@RequestMapping(value = "/{orgUsrId}/detail", method = RequestMethod.POST) @RequestMapping(value = "/{orgUsrId}/detail", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "查询关联的amos账号信息", notes = "查询关联的amos账号信息") @ApiOperation(httpMethod = "POST", value = "查询关联的amos账号信息", notes = "查询关联的amos账号信息")
public ResponseModel<OrgUsrAgencyUser> getAccountDetail(@PathVariable String orgUsrId) { public ResponseModel<OrgUsrAgencyUser> getAccountDetail(@PathVariable String orgUsrId) {
OrgUsrAgencyUser orgUsrAgencyUser = new OrgUsrAgencyUser();
OrgUsrAgencyUser agencyUser = orgUsrAgencyUserService.getAccountDetail(orgUsrId); OrgUsrAgencyUser agencyUser = orgUsrAgencyUserService.getAccountDetail(orgUsrId);
if (ObjectUtils.isEmpty(agencyUser)) {
orgUsrAgencyUser.setUpAmosUser("0");
return ResponseHelper.buildResponse(orgUsrAgencyUser);
}
return ResponseHelper.buildResponse(agencyUser); return ResponseHelper.buildResponse(agencyUser);
} }
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java
View file @ 36c4005d
...@@ -232,29 +232,52 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -232,29 +232,52 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
// 1.动态表单 // 1.动态表单
OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters()); OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
AgencyUserModel agencyUserModel = new AgencyUserModel(); if(!ValidationUtil.isEmpty(peopleInfoDto.getFirefighters().getAmosUserId()) || "1".equals(peopleInfoDto.getOrgUsrAgencyUser().getUpAmosUser())) {
if(!ValidationUtil.isEmpty(peopleInfoDto.getFirefighters().getAmosUserId())) { AgencyUserModel amosUser = null;
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult(); if(!ValidationUtil.isEmpty(peopleInfoDto.getFirefighters().getAmosUserId())){
// OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters()); amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
}
//删除之前所在用户组 //删除之前所在用户组
OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id)); OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
if (!ValidationUtil.isEmpty(orgUsrAgencyUser) && amosUser != null ) {
String groupIds = orgUsrAgencyUser.getGroupIds(); String groupIds = orgUsrAgencyUser.getGroupIds();
if (!"".equals(groupIds) && null != groupIds) { if (!"".equals(groupIds) && null != groupIds) {
String[] ids = groupIds.split(","); String[] ids = groupIds.split(",");
for (String gId : ids) { for (String gId : ids) {
Long groupId = Long.valueOf(gId); Long groupId = Long.valueOf(gId);
Privilege.groupUserClient.deleteGroupUser(groupId,amosUser.getUserId()); Privilege.groupUserClient.deleteGroupUser(groupId,amosUser.getUserId());
// List<Long> result = privilegeFeign.deleteGroupUser(groupId, amosUser.getUserId()).getResult(); }
// System.out.println(result);
} }
} }
//同步更新或者创建平台用户 //同步更新或者创建平台用户
if(ObjectUtils.isEmpty(amosUser)){ if(null == amosUser){
map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"create"); map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"create");
} else { } else {
if("0".equals(peopleInfoDto.getOrgUsrAgencyUser().getUpAmosUser())){
//删除cb_org_usr_agency_user中对应数据
if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
}
//删除cb_org_usr相关字段
OrgUsr orgUsr1 = orgUsrMapper.queryBySequenceNbr(id.toString());
orgUsr1.setAmosOrgId("");
orgUsr1.setAmosOrgCode("");
orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
//删除cb_firefighters相关字段
Firefighters firefighters = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("org_usr_id", id));
firefighters.setAmosUserId("");
firefighters.setAmosName("");
firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
} else {
map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"update"); map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"update");
} }
}
if(amosUser==null){
peopleInfoDto.getFirefighters().setAmosName(peopleInfoDto.getOrgUsrAgencyUser().getUsrName());
}else {
peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName()); peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName());
}
} else { } else {
peopleInfoDto.getFirefighters().setAmosUserId(null); peopleInfoDto.getFirefighters().setAmosUserId(null);
peopleInfoDto.getFirefighters().setAmosName(null); peopleInfoDto.getFirefighters().setAmosName(null);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 36c4005d
...@@ -2994,12 +2994,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2994,12 +2994,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
peopleInfoDto.getPostEduDtoObj().getFirefightersPost().setOrgUsrId(orgUsrDto.getSequenceNbr().toString()); peopleInfoDto.getPostEduDtoObj().getFirefightersPost().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString()); peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString());
} }
Map<String, String> map = new HashMap<>();
if ("1".equals(peopleInfoDto.getOrgUsrAgencyUser().getUpAmosUser())) {
//同步创建平台用户 //同步创建平台用户
Map<String, String> map = savePlatformUser(orgUsr, peopleInfoDto, "create"); map = savePlatformUser(orgUsr, peopleInfoDto, "create");
orgUsr.setAmosOrgId(map.get("orgId")); orgUsr.setAmosOrgId(map.get("orgId"));
orgUsr.setAmosOrgCode(map.get("orgCode")); orgUsr.setAmosOrgCode(map.get("orgCode"));
orgUsrMapper.update(orgUsr,new QueryWrapper<OrgUsr>().eq("sequence_nbr",peopleInfoDto.getFirefighters().getSequenceNbr())); orgUsrMapper.update(orgUsr, new QueryWrapper<OrgUsr>().eq("sequence_nbr", peopleInfoDto.getFirefighters().getSequenceNbr()));
if (peopleInfoDto.getFirefighters() != null && "2".equals(peopleInfoDto.getFirefighters().getPeopleType())) { }
if (peopleInfoDto.getFirefighters() != null && "1601".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
// 3.同步保存cb_firefighters消防人员基础信息 // 3.同步保存cb_firefighters消防人员基础信息
saveFirefighters(peopleInfoDto,map); saveFirefighters(peopleInfoDto,map);
} else { } else {
...@@ -3056,12 +3059,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3056,12 +3059,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if("create".equals(type)){ if("create".equals(type)){
agencyUserModel.setPassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword()); agencyUserModel.setPassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
agencyUserModel.setRePassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword()); agencyUserModel.setRePassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
if("".equals(peopleInfoDto.getFirefighters().getTelephone())){
agencyUserModel.setMobile(null);
}
userResult = Privilege.agencyUserClient.create(agencyUserModel).getResult(); userResult = Privilege.agencyUserClient.create(agencyUserModel).getResult();
} else { } else {
if("true".equals(peopleInfoDto.getOrgUsrAgencyUser().getUpPassWord())){ if("true".equals(peopleInfoDto.getOrgUsrAgencyUser().getUpPassWord())){
agencyUserModel.setPassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword()); agencyUserModel.setPassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
agencyUserModel.setRePassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword()); agencyUserModel.setRePassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
} }
if("".equals(peopleInfoDto.getFirefighters().getTelephone())){
agencyUserModel.setMobile(null);
}
userResult = Privilege.agencyUserClient.update(agencyUserModel, peopleInfoDto.getOrgUsrAgencyUser().getAmosUserId()).getResult(); userResult = Privilege.agencyUserClient.update(agencyUserModel, peopleInfoDto.getOrgUsrAgencyUser().getAmosUserId()).getResult();
} }
//绑定用户组 //绑定用户组
...@@ -3071,8 +3080,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3071,8 +3080,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
String[] ids = groupIds.split(","); String[] ids = groupIds.split(",");
for (String id : ids) { for (String id : ids) {
Long groupId = Long.valueOf(id); Long groupId = Long.valueOf(id);
List<GroupUserModel> groupUserModelList = Privilege.groupUserClient.create(groupId, Arrays.asList(userIds)).getResult(); Privilege.groupUserClient.create(groupId, Arrays.asList(userIds)).getResult();
System.out.println(groupUserModelList);
} }
} }
//cb_org_usr_agency_user添加用户信息 //cb_org_usr_agency_user添加用户信息
...@@ -3083,7 +3091,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3083,7 +3091,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsrAgencyUser.setOrgUsrId(peopleInfoDto.getFirefighters().getSequenceNbr()); orgUsrAgencyUser.setOrgUsrId(peopleInfoDto.getFirefighters().getSequenceNbr());
orgUsrAgencyUser.setAmosUserId(userResult.getUserId()); orgUsrAgencyUser.setAmosUserId(userResult.getUserId());
if("create".equals(type)){ if("create".equals(type)){
// orgUsrAgencyUser.setUserName("测试");
orgUsrAgencyUserMapper.insert(orgUsrAgencyUser); orgUsrAgencyUserMapper.insert(orgUsrAgencyUser);
} else { } else {
orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id",peopleInfoDto.getFirefighters().getSequenceNbr())); orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id",peopleInfoDto.getFirefighters().getSequenceNbr()));
...@@ -3192,8 +3199,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3192,8 +3199,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
firefightersNew.setOfficeTelephone(firefighters.getTelephone()); firefightersNew.setOfficeTelephone(firefighters.getTelephone());
firefightersNew.setEmployeeNumber(firefighters.getPersonNumber()); firefightersNew.setEmployeeNumber(firefighters.getPersonNumber());
firefightersNew.setCertificateNumber(firefighters.getCertificatesNumber()); firefightersNew.setCertificateNumber(firefighters.getCertificatesNumber());
if(!ObjectUtils.isEmpty(map)){
firefightersNew.setAmosName(map.get("orgCode")); firefightersNew.setAmosName(map.get("orgCode"));
firefightersNew.setAmosUserId(map.get("orgId")); firefightersNew.setAmosUserId(map.get("orgId"));
}
firefightersNew.setPersonnelPhotos(firefighters.getPersonImg()); firefightersNew.setPersonnelPhotos(firefighters.getPersonImg());
FirefightersInfoDto firefightersInfoDto = new FirefightersInfoDto(firefightersNew, peopleInfoDto.getFirefightersContacts()); FirefightersInfoDto firefightersInfoDto = new FirefightersInfoDto(firefightersNew, peopleInfoDto.getFirefightersContacts());
...@@ -3341,7 +3350,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3341,7 +3350,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String deletePeopleById(Long id, String type, AgencyUserModel user) { public String deletePeopleById(Long id, String type, AgencyUserModel user) {
if ("2".equals(type)) { if ("1601".equals(type)) {
QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>(); QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0)); Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
Long firefightersSequenceNbr = firefighters.getSequenceNbr(); Long firefightersSequenceNbr = firefighters.getSequenceNbr();
...@@ -3391,7 +3400,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3391,7 +3400,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete",
CommonConstant.IS_DELETE_01)); CommonConstant.IS_DELETE_01));
//删除cb_org_usr_agency_user中对应数据 //删除cb_org_usr_agency_user中对应数据
OrgUsr orgUsr = orgUsrMapper.queryByUserId(id);
OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id)); OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
if (!ObjectUtils.isEmpty(orgUsrAgencyUser)) { if (!ObjectUtils.isEmpty(orgUsrAgencyUser)) {
orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id)); orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
...@@ -3415,7 +3423,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3415,7 +3423,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
deleteFirefightersPost(String.valueOf(id)); deleteFirefightersPost(String.valueOf(id));
// 3.根据type是否删除消防人员 // 3.根据type是否删除消防人员
if ("2".equals(type)) { if ("1601".equals(type)) {
deleteFirefighters(id); deleteFirefighters(id);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java
View file @ 36c4005d
...@@ -437,7 +437,7 @@ public class FirefightersController extends BaseController { ...@@ -437,7 +437,7 @@ public class FirefightersController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情") @ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情")
public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) { public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
try { try {
if ("2".equals(firefighters.getFirefighters().getPeopleType())){ if ("1601".equals(firefighters.getFirefighters().getPeopleType())){
PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters(); PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
Firefighters firefighter = new Firefighters(); Firefighters firefighter = new Firefighters();
BeanUtils.copyProperties(peopleBasicInfoDto, firefighter); BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment