Skip to content

A
amos-boot-zx-biz
Commit 6d8fc62d authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

经销商管理人员添加删除接口

parent fbd64cc4
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 175 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 6d8fc62d
......@@ -100,6 +100,7 @@ public class ControllerAop {
urls.add("/hygf/unit-info/region/tree");
urls.add("/hygf/unit-info/management-unit/tree");
urls.add("/hygf/unit-info/hasExistPhone/.*");
urls.add("/hygf/unit-info/hasExistUserName/.*");
urls.add("/hygf/unit-info/sendTelCode/.*");
urls.add("/hygf/unit-info/verifyTelCode/.*/.*");
urls.add("/hygf/peasant-household/mobile/login");
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java
View file @ 6d8fc62d
......@@ -30,6 +30,17 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
UserUnitInformationDto getMaintenanceUserUnitInformationDto(@Param("userId")String userId);
String selectUserInfo(Long sequenceNbr);
void deletePauByUserId(String userId);
void deletePguByUserId(String userId);
void deleteSubByUserId(String userId);
void deleteHpbByFoundationId(Long sequenceNbr);
void deleteSueByUserId(String userId);
void deleteAliByUserId(String userId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java
View file @ 6d8fc62d
......@@ -29,7 +29,11 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
@UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
List<UnitInfo> getlistUnitInfo();
// @UserEmpower(field ={"hygf_unit_info.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
// UnitInfo selectById( Long unitInfoId);
Integer getUserListHuiCount(String phone, String userName);
Integer getUserListPauCount(String phone, String userName);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPersonnelBusinessService.java
View file @ 6d8fc62d
......@@ -16,4 +16,5 @@ public interface IPersonnelBusinessService {
IPage<CompanyDtoUserDto> getCompanyDtoUserDto( CompanyDtoUserDto dto);
UserDataDto getPersonnelBusinessById(String id);
Object deleteAllBySequenceNbr(Long sequenceNbr);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml
View file @ 6d8fc62d
......@@ -114,4 +114,38 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN
</select>
<select id="selectUserInfo" resultType="String">
SELECT
sub.amos_user_id userId
FROM
std_user_biz sub
WHERE
sub.sequence_nbr =#{sequenceNbr}
</select>
<select id="deletePauByUserId">
DELETE FROM privilege_agency_user WHERE USER_ID=#{userId}
</select>
<select id="deletePguByUserId">
DELETE FROM privilege_group_user WHERE USER_ID=#{userId}
</select>
<select id="deleteSubByUserId">
DELETE FROM std_user_biz WHERE amos_user_id=#{userId}
</select>
<select id="deleteHpbByFoundationId">
DELETE FROM hygf_personnel_business WHERE foundation_id=#{sequenceNbr}
</select>
<select id="deleteSueByUserId">
DELETE FROM std_user_empower WHERE amos_user_id=#{userId}
</select>
<select id="deleteAliByUserId">
DELETE FROM auth_login_info WHERE USER_ID=#{userId}
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml
View file @ 6d8fc62d
......@@ -125,4 +125,29 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
</select>
<select id="getUserListHuiCount" resultType="integer">
select count(*) from hygf_unit_info
<where>
audit_status != 3
<if test="phone != null and phone !=''">
and admin_phone = #{phone}
</if>
<if test="userName != null and userName !=''">
and admin_login_name = #{userName}
</if>
</where>
</select>
<select id="getUserListPauCount" resultType="integer">
select count(*) from privilege_agency_user
<where>
<if test="phone != null and phone !=''">
and MOBILE = #{phone}
</if>
<if test="userName != null and userName !=''">
and USER_NAME = #{userName}
</if>
</where>
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java
View file @ 6d8fc62d
......@@ -95,6 +95,19 @@ public class PersonnelBusinessController extends BaseController {
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/all/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员信息", notes = "根据sequenceNbr删除人员信息")
public ResponseModel<Boolean> deleteAllBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(personnelBusinessServiceImpl.deleteAllBySequenceNbr(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
......@@ -107,6 +120,8 @@ public class PersonnelBusinessController extends BaseController {
return ResponseHelper.buildResponse(personnelBusinessServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 6d8fc62d
......@@ -332,7 +332,21 @@ public class UnitInfoController extends BaseController {
/**
* 判断用户名是否存在
*
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistUserName/{userName}")
@ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在")
public ResponseModel hasExistUserName( @PathVariable(value = "userName") String userName) {
try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName));
} catch (Exception e) {
return CommonResponseNewUtil.failure("该用户名已经注册");
}
}
......@@ -346,7 +360,7 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
try {
return CommonResponseNewUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null));
} catch (Exception e) {
return CommonResponseNewUtil.failure("该手机号已经注册");
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @ 6d8fc62d
......@@ -44,7 +44,7 @@ import java.util.*;
* @date 2023-09-01
*/
@Service
public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessDto,PersonnelBusiness,PersonnelBusinessMapper> implements IPersonnelBusinessService {
public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessDto, PersonnelBusiness, PersonnelBusinessMapper> implements IPersonnelBusinessService {
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
......@@ -66,24 +66,25 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Value("${hygf.user.group.empty}")
private long userGroupempty;
/**
* 分页查询
*/
public Page<PersonnelBusinessDto> queryForPersonnelBusinessPage(Page<PersonnelBusinessDto> page) {
public Page<PersonnelBusinessDto> queryForPersonnelBusinessPage(Page<PersonnelBusinessDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<PersonnelBusinessDto> queryForPersonnelBusinessList() {
return this.queryForList("" , false);
public List<PersonnelBusinessDto> queryForPersonnelBusinessList() {
return this.queryForList("", false);
}
@Override
public IPage<CompanyDtoUserDto> getCompanyDtoUserDto(CompanyDtoUserDto dto) {
Map<String,String> map= personnelBusinessMapper.getorgcode(dto.getAmosUnitId());
Map<String, String> map = personnelBusinessMapper.getorgcode(dto.getAmosUnitId());
dto.setAmosUnitOrgCode(map.get("orgCode"));
IPage<CompanyDtoUserDto> pag = personnelBusinessMapper.getCompanyDtoUserDtopage(dto);
......@@ -91,11 +92,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
@Transactional
public void savePersonnelBusiness(UserDataDto model){
UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult =null;
//新增平台用户
public void savePersonnelBusiness(UserDataDto model) {
UserDataZHDto userDataZHDto = model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null;
//新增平台用户
try {
// 1 创建平台用户
List<RoleModel> userRoleList = new ArrayList<>();
......@@ -112,13 +113,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
// agencyUserModel.setAppCodes(split);
// agencyUserModel.setAppCodes(split);
agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组
userResult = Privilege.agencyUserClient.create(agencyUserModel);
if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+userResult.getDevMessage());
userResult = Privilege.agencyUserClient.create(agencyUserModel);
if (userResult == null || userResult.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + userResult.getDevMessage());
}
List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId());
......@@ -128,7 +129,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
//新增人员基础信息表
PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
PublicAgencyUser publicAgencyUser = new PublicAgencyUser();
publicAgencyUser.setRealName(userDataJBDto.getRealName());
publicAgencyUser.setGender(userDataJBDto.getGender());
publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber());
......@@ -137,35 +138,35 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+companyResult.getDevMessage());
if (companyResult == null || companyResult.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + companyResult.getDevMessage());
}
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
publicAgencyUser.setPosition(userDataJBDto.getPosition() != null ? JSON.toJSONString(userDataJBDto.getPosition()) : null);
publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.insert(publicAgencyUser);
PersonnelBusiness re=new PersonnelBusiness();
PersonnelBusiness re = new PersonnelBusiness();
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+companyResult1.getDevMessage());
if (companyResult1 == null || companyResult1.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + companyResult1.getDevMessage());
}
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
re.setCertificate(model.getUserDataZZDto() != null ? JSON.toJSONString(model.getUserDataZZDto().getCertificate()) : null);
re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
......@@ -174,8 +175,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
personnelBusinessMapper.insert(re);
//增加人员权限
List<String> lisk=new ArrayList<>();
StdUserEmpower stdUserEmpower= new StdUserEmpower();
List<String> lisk = new ArrayList<>();
StdUserEmpower stdUserEmpower = new StdUserEmpower();
lisk.add(re.getRegionalCompaniesCode());
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
......@@ -184,12 +185,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userEmpowerMapper.insert(stdUserEmpower);
}catch (Exception e){
if (userResult != null && userResult.getResult() != null
&& StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
} catch (Exception e) {
if (userResult != null && userResult.getResult() != null && StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
}
log.error(e.getMessage(), e);
......@@ -200,14 +197,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Transactional
public void updatePersonnelBusiness( UserDataDto model ,long id){
public void updatePersonnelBusiness(UserDataDto model, long id) {
PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
PublicAgencyUser publicAgencyUser = publicAgencyUserMapper.selectById(id);
UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult =null;
UserDataZHDto userDataZHDto = model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null;
try {
// 1 修改平台用户
......@@ -229,9 +226,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组
userResult = Privilege.agencyUserClient.update(agencyUserModel,publicAgencyUser.getAmosUserId());
if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+userResult.getDevMessage());
userResult = Privilege.agencyUserClient.update(agencyUserModel, publicAgencyUser.getAmosUserId());
if (userResult == null || userResult.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + userResult.getDevMessage());
}
List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId());
......@@ -249,56 +246,56 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+companyResult.getDevMessage());
if (companyResult == null || companyResult.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + companyResult.getDevMessage());
}
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
publicAgencyUser.setPosition(userDataJBDto.getPosition() != null ? JSON.toJSONString(userDataJBDto.getPosition()) : null);
publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.updateById(publicAgencyUser);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUser.getSequenceNbr());
PersonnelBusiness re=personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUser.getSequenceNbr());
PersonnelBusiness re = personnelBusinessMapper.selectOne(qug);
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+companyResult1.getDevMessage());
if (companyResult1 == null || companyResult1.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + companyResult1.getDevMessage());
}
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
re.setCertificate(model.getUserDataZZDto() != null ? JSON.toJSONString(model.getUserDataZZDto().getCertificate()) : null);
re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
personnelBusinessMapper.updateById(re);
//增加人员权限
List<String> lisk=new ArrayList<>();
LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUser.getAmosUserId());
StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
// lisk.add(publicAgencyUser.getAmosOrgCode());
List<String> lisk = new ArrayList<>();
LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId, publicAgencyUser.getAmosUserId());
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
// lisk.add(publicAgencyUser.getAmosOrgCode());
lisk.add(re.getRegionalCompaniesCode());
if(stdUserEmpower!=null){
if (stdUserEmpower != null) {
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk);
userEmpowerMapper.updateById(stdUserEmpower);
}else{
stdUserEmpower=new StdUserEmpower();
} else {
stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk);
stdUserEmpower.setPermissionType("HYGF");
......@@ -306,11 +303,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
}catch (Exception e){
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new BadRequest(e.getMessage());
......@@ -319,48 +312,40 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
@Transactional
public void replace(String id){
public void replace(String id) {
try {
//获取当前用户
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
personnelBusines.setUserType("2");
personnelBusinessMapper.updateById(personnelBusines);
//获取经销商管理员
LambdaQueryWrapper<UnitInfo> qudg=new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getAmosCompanySeq,personnelBusines.getAmosDealerId());
UnitInfo unitInfo= unitInfoMapper.selectOne(qudg);
LambdaQueryWrapper<PublicAgencyUser> qudx=new LambdaQueryWrapper<>();
qudx.eq(PublicAgencyUser::getAmosUserId,unitInfo.getAdminUserId());
PublicAgencyUser publicAgencyUsex= publicAgencyUserMapper.selectOne(qudx);
LambdaQueryWrapper<PersonnelBusiness> qugf=new LambdaQueryWrapper<>();
qugf.eq(PersonnelBusiness::getFoundationId,publicAgencyUsex.getSequenceNbr());
PersonnelBusiness personnelBusinesx=personnelBusinessMapper.selectOne(qugf);
personnelBusinesx.setUserType("1");
personnelBusinessMapper.updateById(personnelBusinesx);
unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
unitInfo.setAdminUserName(publicAgencyUse.getRealName());
unitInfoMapper.updateById(unitInfo);
//修改管理员
List<Long> roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
//获取当前用户
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
personnelBusines.setUserType("2");
personnelBusinessMapper.updateById(personnelBusines);
//获取经销商管理员
LambdaQueryWrapper<UnitInfo> qudg = new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getAmosCompanySeq, personnelBusines.getAmosDealerId());
UnitInfo unitInfo = unitInfoMapper.selectOne(qudg);
LambdaQueryWrapper<PublicAgencyUser> qudx = new LambdaQueryWrapper<>();
qudx.eq(PublicAgencyUser::getAmosUserId, unitInfo.getAdminUserId());
PublicAgencyUser publicAgencyUsex = publicAgencyUserMapper.selectOne(qudx);
LambdaQueryWrapper<PersonnelBusiness> qugf = new LambdaQueryWrapper<>();
qugf.eq(PersonnelBusiness::getFoundationId, publicAgencyUsex.getSequenceNbr());
PersonnelBusiness personnelBusinesx = personnelBusinessMapper.selectOne(qugf);
personnelBusinesx.setUserType("1");
personnelBusinessMapper.updateById(personnelBusinesx);
unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
unitInfo.setAdminUserName(publicAgencyUse.getRealName());
unitInfoMapper.updateById(unitInfo);
//修改管理员
List<Long> roidx = JSONArray.parseArray(publicAgencyUsex.getRole(), Long.class);
//修改平台用户
......@@ -368,38 +353,37 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userId.add(publicAgencyUse.getAmosUserId());
System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
System.out.println("删除旧管理员===================================:" + publicAgencyUsex.getAmosUserId());
if(roidx!=null&&!roidx.isEmpty()&&roidx.size()==1&&roidx.get(0).longValue()==userGroupId){
//新增空角色防止单位丢失
List<String> userId1 = new ArrayList<>();
userId1.add(publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.create(userGroupempty, userId1);
}
if (roidx != null && !roidx.isEmpty() && roidx.size() == 1 && roidx.get(0).longValue() == userGroupId) {
//新增空角色防止单位丢失
List<String> userId1 = new ArrayList<>();
userId1.add(publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.create(userGroupempty, userId1);
}
//删除旧管理员
Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.deleteGroupUser(userGroupId, publicAgencyUsex.getAmosUserId());
// 1 修改平台用户
Privilege.groupUserClient.create(userGroupId, userId);
System.out.println("新增角色用户===================================:"+userId);
System.out.println("新增角色用户===================================:" + userId);
//修改权限
if(roidx==null){
if (roidx == null) {
publicAgencyUsex.setRole(null);
}else{
} else {
roidx.remove(userGroupId);
publicAgencyUsex.setRole(JSON.toJSONString(roidx));
}
//修改当前用户角色权限
List<Long> roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
if(roid==null){
roid=new ArrayList<>();
List<Long> roid = JSONArray.parseArray(publicAgencyUse.getRole(), Long.class);
if (roid == null) {
roid = new ArrayList<>();
}
roid.add(userGroupId);
publicAgencyUse.setRole(JSON.toJSONString(roid));
......@@ -408,58 +392,51 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUserMapper.updateById(publicAgencyUse);
//旧管理员去除
List<String> li = null;
LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId, publicAgencyUsex.getAmosUserId());
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
li = stdUserEmpower.getAmosOrgCode();
if (stdUserEmpower != null) {
stdUserEmpower.setAmosOrgCode(null);
userEmpowerMapper.updateById(stdUserEmpower);
//旧管理员去除
List<String> li=null;
LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
li=stdUserEmpower.getAmosOrgCode();
if(stdUserEmpower!=null){
stdUserEmpower.setAmosOrgCode(null);
userEmpowerMapper.updateById(stdUserEmpower);
}else{
stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosOrgCode(null);
stdUserEmpower.setPermissionType("HYGF");
stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower);
}
//新管理员新增
LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
StdUserEmpower stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
} else {
stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setAmosOrgCode(null);
stdUserEmpower.setPermissionType("HYGF");
stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower);
}
if(stdUserEmpower1!=null){
stdUserEmpower1.setAmosOrgCode(li);
userEmpowerMapper.updateById(stdUserEmpower1);
//新管理员新增
LambdaQueryWrapper<StdUserEmpower> uo1 = new LambdaQueryWrapper();
uo1.eq(StdUserEmpower::getAmosUserId, publicAgencyUse.getAmosUserId());
StdUserEmpower stdUserEmpower1 = userEmpowerMapper.selectOne(uo1);
}else{
stdUserEmpower1=new StdUserEmpower();
stdUserEmpower1.setAmosOrgCode(li);
stdUserEmpower1.setPermissionType("HYGF");
stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower1);
}
if (stdUserEmpower1 != null) {
stdUserEmpower1.setAmosOrgCode(li);
userEmpowerMapper.updateById(stdUserEmpower1);
} else {
stdUserEmpower1 = new StdUserEmpower();
stdUserEmpower1.setAmosOrgCode(li);
stdUserEmpower1.setPermissionType("HYGF");
stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower1);
}
UserMessage userMessage= new UserMessage( TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr() , publicAgencyUse.getAmosUserId(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode());
UserMessage userMessage = new UserMessage(TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr(), publicAgencyUse.getAmosUserId(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode());
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
throw new BadRequest("设置失败！");
}
......@@ -467,29 +444,54 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Override
public UserDataDto getPersonnelBusinessById(String id){
public UserDataDto getPersonnelBusinessById(String id) {
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
UserDataZHDto userDataZHDto=new UserDataZHDto();
UserDataJBDto userDataJBDto=new UserDataJBDto();
UserDataZZDto userDataZZDto=new UserDataZZDto();
UserDataZHDto userDataZHDto = new UserDataZHDto();
UserDataJBDto userDataJBDto = new UserDataJBDto();
UserDataZZDto userDataZZDto = new UserDataZZDto();
userDataZZDto.setCertificate(personnelBusines.getCertificate()!=null?JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class):null);
userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
userDataZZDto.setCertificate(personnelBusines.getCertificate() != null ? JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class) : null);
userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(), long.class));
userDataZHDto.setUserName(publicAgencyUse.getAmosUserName());
BeanUtils.copyProperties(publicAgencyUse,userDataJBDto);
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
BeanUtils.copyProperties(publicAgencyUse, userDataJBDto);
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(), String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq() != null ? personnelBusines.getRegionalCompaniesSeq().toString() : null);
userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto);
return new UserDataDto(userDataZHDto, userDataJBDto, userDataZZDto);
}
@Override
public Boolean deleteAllBySequenceNbr(Long sequenceNbr) {
try {
// 根据sequenceNbr查询用户userId
String userId = personnelBusinessMapper.selectUserInfo(sequenceNbr);
// 删除privilege_agency_user表中数据
personnelBusinessMapper.deletePauByUserId(userId);
// 删除privilege_group_user表中数据
personnelBusinessMapper.deletePguByUserId(userId);
// 删除std_user_biz表中数据
personnelBusinessMapper.deleteSubByUserId(userId);
// 删除hygf_personnel_business表中数据
personnelBusinessMapper.deleteHpbByFoundationId(sequenceNbr);
// 删除std_user_empower表中数据
personnelBusinessMapper.deleteSueByUserId(userId);
// 删除auth_login_info表中数据
personnelBusinessMapper.deleteAliByUserId(userId);
return null;
} catch (Exception e) {
throw new BadRequest("删除失败！");
}
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 6d8fc62d
......@@ -1056,4 +1056,19 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
pagenew.setRecords(page.getList());
return pagenew;
}
public Boolean hasExistPhoneOrUserName(String phone, String userName) {
Integer userListHuiCount = unitInfoMapper.getUserListHuiCount(phone, userName);
Integer userListPauCount = unitInfoMapper.getUserListPauCount(phone, userName);
if((userListHuiCount != 0 || userListPauCount != 0) && phone != null) {
throw new BadRequest("该手机号已经注册");
}
if((userListHuiCount != 0 || userListPauCount != 0) && userName != null) {
throw new BadRequest("该用户名已经注册");
}
return true;
}
}
\ No newline at end of file
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